Skip to content

Commit ed476bc

Browse files
committed
feat: support GEO type
Change-Id: Ie3f0bbee0f4dd89ff42d2e7eaca6597887b2c252
1 parent 6657b11 commit ed476bc

File tree

16 files changed

+1916
-966
lines changed

16 files changed

+1916
-966
lines changed

Cargo.lock

Lines changed: 1148 additions & 780 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,17 @@ lance-test-macros = { version = "=0.35.0", path = "./rust/lance-test-macros" }
6060
lance-testing = { version = "=0.35.0", path = "./rust/lance-testing" }
6161
approx = "0.5.1"
6262
# Note that this one does not include pyarrow
63-
arrow = { version = "55.2", optional = false, features = ["prettyprint"] }
64-
arrow-arith = "55.2"
65-
arrow-array = "55.2"
66-
arrow-buffer = "55.2"
67-
arrow-cast = "55.2"
68-
arrow-data = "55.2"
69-
arrow-ipc = { version = "55.2", features = ["zstd"] }
70-
arrow-ord = "55.2"
71-
arrow-row = "55.2"
72-
arrow-schema = "55.2"
73-
arrow-select = "55.2"
63+
arrow = { version = "56.1", optional = false, features = ["prettyprint"] }
64+
arrow-arith = "56.1"
65+
arrow-array = "56.1"
66+
arrow-buffer = "56.1"
67+
arrow-cast = "56.1"
68+
arrow-data = "56.1"
69+
arrow-ipc = { version = "56.1", features = ["zstd"] }
70+
arrow-ord = "56.1"
71+
arrow-row = "56.1"
72+
arrow-schema = "56.1"
73+
arrow-select = "56.1"
7474
async-recursion = "1.0"
7575
async-trait = "0.1"
7676
aws-config = "1.2.0"
@@ -96,7 +96,7 @@ criterion = { version = "0.5", features = [
9696
"html_reports",
9797
] }
9898
crossbeam-queue = "0.3"
99-
datafusion = { version = "49.0.2", default-features = false, features = [
99+
datafusion = { git = "https://github.com/apache/datafusion", rev = "fa1f8c192dd531d3f2fca61885eafa3e9002f0dd", default-features = false, features = [
100100
"nested_expressions",
101101
"regex_expressions",
102102
"unicode_expressions",
@@ -105,22 +105,26 @@ datafusion = { version = "49.0.2", default-features = false, features = [
105105
"datetime_expressions",
106106
"string_expressions",
107107
] }
108-
datafusion-common = "49.0.2"
109-
datafusion-functions = { version = "49.0.2", features = ["regex_expressions"] }
110-
datafusion-sql = "49.0.2"
111-
datafusion-expr = "49.0.2"
112-
datafusion-ffi = "49.0.2"
113-
datafusion-execution = "49.0.2"
114-
datafusion-optimizer = "49.0.2"
115-
datafusion-physical-expr = { version = "49.0.2" }
116-
datafusion-physical-plan = { version = "49.0.2" }
117-
datafusion-substrait = { version = "49.0.2" }
108+
datafusion-common = { git = "https://github.com/apache/datafusion", rev = "fa1f8c192dd531d3f2fca61885eafa3e9002f0dd" }
109+
datafusion-functions = { git = "https://github.com/apache/datafusion", rev = "fa1f8c192dd531d3f2fca61885eafa3e9002f0dd", features = ["regex_expressions"] }
110+
datafusion-sql = { git = "https://github.com/apache/datafusion", rev = "fa1f8c192dd531d3f2fca61885eafa3e9002f0dd" }
111+
datafusion-expr = { git = "https://github.com/apache/datafusion", rev = "fa1f8c192dd531d3f2fca61885eafa3e9002f0dd" }
112+
datafusion-ffi = { git = "https://github.com/apache/datafusion", rev = "fa1f8c192dd531d3f2fca61885eafa3e9002f0dd" }
113+
datafusion-execution = { git = "https://github.com/apache/datafusion", rev = "fa1f8c192dd531d3f2fca61885eafa3e9002f0dd" }
114+
datafusion-optimizer = { git = "https://github.com/apache/datafusion", rev = "fa1f8c192dd531d3f2fca61885eafa3e9002f0dd" }
115+
datafusion-physical-expr = { git = "https://github.com/apache/datafusion", rev = "fa1f8c192dd531d3f2fca61885eafa3e9002f0dd" }
116+
datafusion-physical-plan = { git = "https://github.com/apache/datafusion", rev = "fa1f8c192dd531d3f2fca61885eafa3e9002f0dd" }
117+
datafusion-substrait = { git = "https://github.com/apache/datafusion", rev = "fa1f8c192dd531d3f2fca61885eafa3e9002f0dd" }
118118
deepsize = "0.2.0"
119119
dirs = "6.0.0"
120120
either = "1.0"
121121
fst = { version = "0.4.7", features = ["levenshtein"] }
122122
fsst = { version = "=0.35.0", path = "./rust/compression/fsst" }
123123
futures = "0.3"
124+
geoarrow-array = "0.5.0"
125+
geoarrow-schema = "0.5.0"
126+
geodatafusion = { git = "https://github.com/geoarrow/geoarrow-rs", rev = "6bb9b0e419e67ece4c742fbb070a99d10dbd8f38" }
127+
geo-types = "0.7.16"
124128
http = "1.1.0"
125129
humantime = "2.2.0"
126130
hyperloglogplus = { version = "0.4.1", features = ["const-loop"] }

java/lance-jni/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ lance-index = { path = "../../rust/lance-index" }
2121
lance-io = { path = "../../rust/lance-io" }
2222
lance-core = { path = "../../rust/lance-core" }
2323
lance-file = { path = "../../rust/lance-file" }
24-
arrow = { version = "55.1", features = ["ffi"] }
25-
arrow-schema = "55.1"
24+
arrow = { version = "56.1", features = ["ffi"] }
25+
arrow-schema = "56.1"
2626
object_store = { version = "0.12.2" }
2727
tokio = { version = "1.23", features = [
2828
"rt-multi-thread",

0 commit comments

Comments
 (0)