refactor(query): refactor geometry functions (#16870)

* refactor(query): refactor geometry functions * fix * fix
databendlabs · Nov 20, 2024 · 918b9c2 · 918b9c2
1 parent 4af19cb
commit 918b9c2
Show file tree

Hide file tree

Showing 20 changed files with 1,039 additions and 1,048 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -288,10 +288,8 @@ futures = "0.3.24"
 futures-async-stream = { version = "0.2.7" }
 futures-util = "0.3.24"
 geo = { version = "0.28.0", features = ["use-serde"] }
-geo-types = "0.7.13"
 geohash = "0.13.0"
-geos = { version = "9.0.0", features = ["static", "geo", "geo-types"] }
-geozero = { version = "0.14.0", features = ["default", "with-wkb", "with-geos", "with-geojson"] }
+geozero = { version = "0.14.0", features = ["with-geo", "with-geojson", "with-wkb", "with-wkt"] }
 gimli = "0.31.0"
 globiter = "0.1"
 goldenfile = "1.4"
@@ -320,7 +318,7 @@ jaq-core = "1.5.1"
 jaq-interpret = "1.5.0"
 jaq-parse = "1.0.3"
 jaq-std = "1.6.0"
-jsonb = "0.4.3"
+jsonb = "0.4.4"
 jwt-simple = { version = "0.12.10", default-features = false, features = ["pure-rust"] }
 lenient_semver = "0.4.2"
 levenshtein_automata = "0.2.1"
@@ -379,7 +377,7 @@ openraft = { version = "0.10.0", features = [
 ] }
 opensrv-mysql = { version = "0.7.0", features = ["tls"] }
 orc-rust = "0.5.0"
-ordered-float = { version = "4.1.0", default-features = false }
+ordered-float = { version = "4.5.0", default-features = false }
 ordq = "0.2.0"
 p256 = "0.13"
 parking_lot = "0.12.1"
@@ -393,7 +391,7 @@ pin-project = "1"
 pin-project-lite = "0.2.9"
 poem = { version = "3.0", features = ["openssl-tls", "multipart", "compression", "cookie"] }
 pot = "2.0.0"
-pprof = { version = "0.13.0", features = [
+pprof = { version = "0.14.0", features = [
     "flamegraph",
     "protobuf-codec",
     "protobuf",
@@ -501,7 +499,7 @@ zstd = "0.12.3"
 # AST needed
 cargo-license = "0.6.1"
 cargo_metadata = "0.18"
-fast-float = "0.2.0"
+fast-float2 = "0.2.3"
 gix = "0.63.0"
 indent = "0.1.1"
 logos = "0.12.1"
@@ -620,7 +618,6 @@ backtrace = { git = "https://github.com/rust-lang/backtrace-rs.git", rev = "7226
 color-eyre = { git = "https://github.com/eyre-rs/eyre.git", rev = "e5d92c3" }
 deltalake = { git = "https://github.com/delta-io/delta-rs", rev = "3038c145" }
 ethnum = { git = "https://github.com/datafuse-extras/ethnum-rs", rev = "4cb05f1" }
-jsonb = { git = "https://github.com/databendlabs/jsonb", rev = "ada713c" }
 openai_api_rust = { git = "https://github.com/datafuse-extras/openai-api", rev = "819a0ed" }
 openraft = { git = "https://github.com/databendlabs/openraft", tag = "v0.10.0-alpha.7" }
 orc-rust = { git = "https://github.com/datafusion-contrib/orc-rust", rev = "dfb1ede" }

diff --git a/src/common/exception/Cargo.toml b/src/common/exception/Cargo.toml
@@ -18,7 +18,6 @@ arrow-flight = { workspace = true }
 arrow-schema = { workspace = true }
 backtrace = { workspace = true, features = ["std", "serialize-serde"] }
 bincode = { workspace = true }
-geos = { workspace = true }
 geozero = { workspace = true }
 gimli = { workspace = true }
 http = { workspace = true }
@@ -38,8 +37,5 @@ tantivy = { workspace = true }
 thiserror = { workspace = true }
 tonic = { workspace = true }
 
-[package.metadata.cargo-machete]
-ignored = ["geos"]
-
 [lints]
 workspace = true
diff --git a/src/common/io/Cargo.toml b/src/common/io/Cargo.toml
@@ -22,8 +22,8 @@ enquote = { workspace = true }
 enumflags2 = { workspace = true }
 ethnum = { workspace = true }
 geo = { workspace = true }
-geos = { workspace = true }
 geozero = { workspace = true }
+hex = { workspace = true }
 lexical-core = { workspace = true }
 micromarshal = { workspace = true }
 roaring = { workspace = true, features = ["serde"] }
@@ -36,8 +36,5 @@ aho-corasick = { workspace = true }
 rand = { workspace = true }
 rmp-serde = { workspace = true }
 
-[package.metadata.cargo-machete]
-ignored = ["geos"]
-
 [lints]
 workspace = true