Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: address PR feedback

pull/24376/head
Edd Robinson 2021-05-07 13:48:44 +01:00
parent 4c4bd2f164
commit 8ccc359cab
3 changed files with 105 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

263
Cargo.lock generated
View File

@ -140,7 +140,7 @@ dependencies = [
"arrow 4.0.0-SNAPSHOT",
"bytes",
"futures",
"proc-macro2 1.0.24",
"proc-macro2",
"prost",
"prost-derive",
"tokio",
@ -204,9 +204,9 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db134ba52475c060f3329a8ef0f8786d6b872ed01515d4b79c162e5798da1340"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -215,9 +215,9 @@ version = "0.1.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -346,8 +346,8 @@ dependencies = [
"lazycell",
"log",
"peeking_take_while",
"proc-macro2 1.0.24",
"quote 1.0.9",
"proc-macro2",
"quote",
"regex",
"rustc-hash",
"shlex",
@ -780,7 +780,7 @@ dependencies = [
"regex",
"serde",
"serde_regex",
"snafu 0.6.10",
"snafu",
"test_helpers",
]
@ -951,7 +951,7 @@ dependencies = [
"influxdb_line_protocol",
"internal_types",
"ouroboros",
"snafu 0.6.10",
"snafu",
]
[[package]]
@ -974,9 +974,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f47da3a72ec598d9c8937a7ebca8962a5c7a1f28444e38c2b33c771ba3f55f05"
dependencies = [
"proc-macro-error",
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -995,9 +995,9 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
"synstructure",
]
@ -1141,9 +1141,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b"
dependencies = [
"proc-macro-hack",
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -1478,7 +1478,7 @@ dependencies = [
"reqwest",
"serde",
"serde_json",
"snafu 0.6.10",
"snafu",
"test_helpers",
"tokio",
"url",
@ -1542,7 +1542,7 @@ dependencies = [
"serde_json",
"serde_urlencoded 0.7.0",
"server",
"snafu 0.6.10",
"snafu",
"structopt",
"tempfile",
"test_helpers",
@ -1586,7 +1586,7 @@ dependencies = [
"nom",
"observability_deps",
"smallvec",
"snafu 0.6.10",
"snafu",
"test_helpers",
]
@ -1599,7 +1599,7 @@ dependencies = [
"integer-encoding",
"observability_deps",
"rand 0.8.3",
"snafu 0.6.10",
"snafu",
"snap",
"test_helpers",
]
@ -1617,7 +1617,7 @@ dependencies = [
"packers",
"parking_lot",
"parquet 0.1.0",
"snafu 0.6.10",
"snafu",
"test_helpers",
]
@ -1643,7 +1643,7 @@ dependencies = [
"arrow 0.1.0",
"arrow_util",
"observability_deps",
"snafu 0.6.10",
"snafu",
]
[[package]]
@ -1838,7 +1838,7 @@ dependencies = [
"observability_deps",
"packers",
"parquet 0.1.0",
"snafu 0.6.10",
"snafu",
]
[[package]]
@ -1864,7 +1864,7 @@ dependencies = [
"observability_deps",
"opentelemetry-prometheus",
"prometheus",
"snafu 0.6.10",
"snafu",
]
[[package]]
@ -1944,9 +1944,9 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8a3e2bde382ebf960c1f3e79689fa5941625fe9bf694a1cb64af3e85faff3af"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -1967,7 +1967,7 @@ dependencies = [
"observability_deps",
"parking_lot",
"rand 0.8.3",
"snafu 0.6.10",
"snafu",
"test_helpers",
"tokio",
"tracker",
@ -2179,7 +2179,7 @@ dependencies = [
"rusoto_core",
"rusoto_credential",
"rusoto_s3",
"snafu 0.6.10",
"snafu",
"tempfile",
"tokio",
"tokio-util",
@ -2346,9 +2346,9 @@ checksum = "129943a960e6a08c7e70ca5a09f113c273fe7f10ae8420992c78293e3dffdf65"
dependencies = [
"Inflector",
"proc-macro-error",
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -2362,7 +2362,7 @@ dependencies = [
"observability_deps",
"parquet 0.1.0",
"rand 0.8.3",
"snafu 0.6.10",
"snafu",
"test_helpers",
]
@ -2454,7 +2454,7 @@ dependencies = [
"prost",
"prost-types",
"query",
"snafu 0.6.10",
"snafu",
"thrift",
"tokio",
"tokio-stream",
@ -2550,9 +2550,9 @@ version = "0.4.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -2561,9 +2561,9 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -2668,9 +2668,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
"version_check",
]
@ -2680,8 +2680,8 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"proc-macro2",
"quote",
"version_check",
]
@ -2697,22 +2697,13 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
[[package]]
name = "proc-macro2"
version = "0.4.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
dependencies = [
"unicode-xid 0.1.0",
]
[[package]]
name = "proc-macro2"
version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
dependencies = [
"unicode-xid 0.2.2",
"unicode-xid",
]
[[package]]
@ -2766,9 +2757,9 @@ checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4"
dependencies = [
"anyhow",
"itertools 0.9.0",
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -2807,7 +2798,7 @@ dependencies = [
"observability_deps",
"parking_lot",
"regex",
"snafu 0.4.4",
"snafu",
"sqlparser 0.8.0",
"test_helpers",
"tokio",
@ -2820,22 +2811,13 @@ version = "1.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]]
name = "quote"
version = "0.6.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
dependencies = [
"proc-macro2 0.4.30",
]
[[package]]
name = "quote"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
dependencies = [
"proc-macro2 1.0.24",
"proc-macro2",
]
[[package]]
@ -2983,7 +2965,7 @@ dependencies = [
"permutation",
"rand 0.8.3",
"rand_distr",
"snafu 0.6.10",
"snafu",
"test_helpers",
"tracker",
]
@ -3405,9 +3387,9 @@ version = "1.0.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -3493,7 +3475,7 @@ dependencies = [
"read_buffer",
"serde",
"serde_json",
"snafu 0.6.10",
"snafu",
"snap",
"tempfile",
"test_helpers",
@ -3573,17 +3555,6 @@ dependencies = [
"serde",
]
[[package]]
name = "snafu"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b028158eb06caa8345bee10cccfb25fa632beccf0ef5308832b4fd4b78a7db48"
dependencies = [
"backtrace",
"doc-comment",
"snafu-derive 0.4.4",
]
[[package]]
name = "snafu"
version = "0.6.10"
@ -3593,18 +3564,7 @@ dependencies = [
"doc-comment",
"futures-core",
"pin-project 0.4.28",
"snafu-derive 0.6.10",
]
[[package]]
name = "snafu-derive"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf50aaef500c248a590e2696e8bf8c7620ca2235b9bb90a70363d82dd1abec6a"
dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.13",
"syn 0.15.44",
"snafu-derive",
]
[[package]]
@ -3613,9 +3573,9 @@ version = "0.6.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -3699,11 +3659,11 @@ version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"proc-macro2",
"quote",
"serde",
"serde_derive",
"syn 1.0.67",
"syn",
]
[[package]]
@ -3713,13 +3673,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
dependencies = [
"base-x",
"proc-macro2 1.0.24",
"quote 1.0.9",
"proc-macro2",
"quote",
"serde",
"serde_derive",
"serde_json",
"sha1",
"syn 1.0.67",
"syn",
]
[[package]]
@ -3753,9 +3713,9 @@ checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90"
dependencies = [
"heck",
"proc-macro-error",
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -3764,26 +3724,15 @@ version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
[[package]]
name = "syn"
version = "0.15.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.13",
"unicode-xid 0.1.0",
]
[[package]]
name = "syn"
version = "1.0.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"unicode-xid 0.2.2",
"proc-macro2",
"quote",
"unicode-xid",
]
[[package]]
@ -3792,10 +3741,10 @@ version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"unicode-xid 0.2.2",
"proc-macro2",
"quote",
"syn",
"unicode-xid",
]
[[package]]
@ -3866,9 +3815,9 @@ version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -3976,10 +3925,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa"
dependencies = [
"proc-macro-hack",
"proc-macro2 1.0.24",
"quote 1.0.9",
"proc-macro2",
"quote",
"standback",
"syn 1.0.67",
"syn",
]
[[package]]
@ -4033,9 +3982,9 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -4119,10 +4068,10 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c695de27302f4697191dda1c7178131a8cb805463dda02864acb80fe1322fdcf"
dependencies = [
"proc-macro2 1.0.24",
"proc-macro2",
"prost-build",
"quote 1.0.9",
"syn 1.0.67",
"quote",
"syn",
]
[[package]]
@ -4206,9 +4155,9 @@ version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
]
[[package]]
@ -4336,12 +4285,6 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
[[package]]
name = "unicode-xid"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
[[package]]
name = "unicode-xid"
version = "0.2.2"
@ -4464,9 +4407,9 @@ dependencies = [
"bumpalo",
"lazy_static",
"log",
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
"wasm-bindgen-shared",
]
@ -4488,7 +4431,7 @@ version = "0.2.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f"
dependencies = [
"quote 1.0.9",
"quote",
"wasm-bindgen-macro-support",
]
@ -4498,9 +4441,9 @@ version = "0.2.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
"syn 1.0.67",
"proc-macro2",
"quote",
"syn",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -4612,7 +4555,7 @@ dependencies = [
"regex",
"serde",
"serde_json",
"snafu 0.6.10",
"snafu",
"snap",
"test_helpers",
"tokio",

2
query/Cargo.toml
View File

@ -28,7 +28,7 @@ internal_types = { path = "../internal_types" }
metrics = { path = "../metrics" }
parking_lot = "0.11.1"
regex = "1"
snafu = "0.4.3"
snafu = "0.6.3"
sqlparser = "0.8.0"
tokio = { version = "1.0", features = ["macros"] }
tokio-stream = "0.1.2"

2
query/src/func/regex.rs
View File

@ -12,7 +12,7 @@ use datafusion::{
/// The name of the regex_match UDF given to DataFusion.
pub const REGEX_MATCH_UDF_NAME: &str = "RegexMatch";
pub const REGEX_NOT_MATCH_UDF_NAME: &str = "RegexMatch";
pub const REGEX_NOT_MATCH_UDF_NAME: &str = "RegexNotMatch";
/// Given a column containing string values and a single regex pattern,
/// `regex_match_expr` determines which values satisfy the pattern and which do