Skip to content

Commit 1403394

Browse files
committed
Merge remote-tracking branch 'apache/main' into improve-string-benchmarks
2 parents b471c32 + 937619f commit 1403394

File tree

11 files changed

+759
-110
lines changed

11 files changed

+759
-110
lines changed

.github/actions/rust-test/action.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,7 @@ runs:
7070
shell: bash
7171
run: |
7272
cd native
73+
# Set LD_LIBRARY_PATH to include JVM library path for tests that use JNI
74+
export LD_LIBRARY_PATH=${JAVA_HOME}/lib/server:${LD_LIBRARY_PATH}
7375
RUST_BACKTRACE=1 cargo nextest run
7476

native/Cargo.lock

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

native/core/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ zstd = "0.13.3"
5656
rand = { workspace = true }
5757
num = { workspace = true }
5858
bytes = { workspace = true }
59-
tempfile = "3.8.0"
59+
tempfile = "3.24.0"
6060
itertools = "0.14.0"
6161
paste = "1.0.14"
6262
datafusion = { workspace = true, features = ["parquet_encryption", "sql"] }
@@ -99,7 +99,7 @@ datafusion-functions-nested = { version = "51.0.0" }
9999

100100
[features]
101101
backtrace = ["datafusion/backtrace"]
102-
default = []
102+
default = ["hdfs-opendal"]
103103
hdfs = ["datafusion-comet-objectstore-hdfs"]
104104
hdfs-opendal = ["opendal", "object_store_opendal", "hdfs-sys"]
105105
jemalloc = ["tikv-jemallocator", "tikv-jemalloc-ctl"]

0 commit comments

Comments
 (0)