This is an automated email from the ASF dual-hosted git repository.
agrove pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion-comet.git
The following commit(s) were added to refs/heads/main by this push:
new a8433b5f chore: Convert Rust project into a workspace (#637)
a8433b5f is described below
commit a8433b5f359f2abe1ebdc57a98457991e9303402
Author: Andy Grove <[email protected]>
AuthorDate: Mon Jul 8 09:42:34 2024 -0600
chore: Convert Rust project into a workspace (#637)
* convert into workspace project
* update GitHub actions
* update Makefile
* fix regression
* update target path
* update protobuf path in pom.xml
* update more paths
---
.github/actions/java-test/action.yaml | 2 +-
.github/actions/rust-test/action.yaml | 8 +-
.github/workflows/benchmark-tpch.yml | 6 +-
.github/workflows/benchmark.yml | 6 +-
.gitignore | 2 +-
Makefile | 36 ++--
common/pom.xml | 4 +-
{core => native}/Cargo.lock | 220 ++++++++++-----------
core/rustfmt.toml => native/Cargo.toml | 15 +-
{core => native/core}/Cargo.lock | 0
{core => native/core}/Cargo.toml | 0
{core => native/core}/benches/bit_util.rs | 0
{core => native/core}/benches/cast_from_string.rs | 0
{core => native/core}/benches/cast_numeric.rs | 0
{core => native/core}/benches/common.rs | 0
{core => native/core}/benches/hash.rs | 0
{core => native/core}/benches/parquet_decode.rs | 0
{core => native/core}/benches/parquet_read.rs | 0
{core => native/core}/benches/perf.rs | 0
{core => native/core}/benches/row_columnar.rs | 0
{core => native/core}/benches/shuffle_writer.rs | 0
{core => native/core}/build.rs | 0
{core => native/core}/rustfmt.toml | 0
{core => native/core}/src/common/bit.rs | 0
{core => native/core}/src/common/buffer.rs | 0
{core => native/core}/src/common/mod.rs | 0
{core => native/core}/src/data_type.rs | 0
{core => native/core}/src/errors.rs | 2 +-
.../src/execution/datafusion/expressions/abs.rs | 0
.../src/execution/datafusion/expressions/avg.rs | 0
.../datafusion/expressions/avg_decimal.rs | 0
.../datafusion/expressions/bitwise_not.rs | 0
.../expressions/bloom_filter_might_contain.rs | 0
.../src/execution/datafusion/expressions/cast.rs | 0
.../datafusion/expressions/checkoverflow.rs | 0
.../datafusion/expressions/correlation.rs | 0
.../execution/datafusion/expressions/covariance.rs | 0
.../datafusion/expressions/create_named_struct.rs | 0
.../execution/datafusion/expressions/if_expr.rs | 0
.../src/execution/datafusion/expressions/mod.rs | 0
.../execution/datafusion/expressions/negative.rs | 0
.../datafusion/expressions/normalize_nan.rs | 0
.../datafusion/expressions/scalar_funcs.rs | 0
.../datafusion/expressions/scalar_funcs/chr.rs | 0
.../expressions/scalar_funcs/hash_expressions.rs | 0
.../datafusion/expressions/scalar_funcs/hex.rs | 0
.../datafusion/expressions/scalar_funcs/unhex.rs | 0
.../src/execution/datafusion/expressions/stats.rs | 0
.../src/execution/datafusion/expressions/stddev.rs | 0
.../execution/datafusion/expressions/strings.rs | 0
.../execution/datafusion/expressions/subquery.rs | 0
.../datafusion/expressions/sum_decimal.rs | 0
.../execution/datafusion/expressions/temporal.rs | 0
.../execution/datafusion/expressions/unbound.rs | 0
.../src/execution/datafusion/expressions/utils.rs | 0
.../execution/datafusion/expressions/variance.rs | 0
.../execution/datafusion/expressions/xxhash64.rs | 0
.../core}/src/execution/datafusion/mod.rs | 0
.../src/execution/datafusion/operators/expand.rs | 0
.../src/execution/datafusion/operators/mod.rs | 0
.../core}/src/execution/datafusion/planner.rs | 0
.../src/execution/datafusion/shuffle_writer.rs | 0
.../core}/src/execution/datafusion/spark_hash.rs | 0
.../core}/src/execution/datafusion/util/mod.rs | 0
.../execution/datafusion/util/spark_bit_array.rs | 0
.../datafusion/util/spark_bloom_filter.rs | 0
{core => native/core}/src/execution/jni_api.rs | 0
.../core}/src/execution/kernels/hash.rs | 0
{core => native/core}/src/execution/kernels/mod.rs | 0
.../core}/src/execution/kernels/strings.rs | 0
.../core}/src/execution/kernels/temporal.rs | 0
{core => native/core}/src/execution/memory_pool.rs | 0
{core => native/core}/src/execution/metrics/mod.rs | 0
.../core}/src/execution/metrics/utils.rs | 0
{core => native/core}/src/execution/mod.rs | 0
.../core}/src/execution/operators/copy.rs | 0
.../core}/src/execution/operators/mod.rs | 0
.../core}/src/execution/operators/scan.rs | 0
.../core}/src/execution/proto/expr.proto | 0
.../core}/src/execution/proto/operator.proto | 0
.../core}/src/execution/proto/partitioning.proto | 0
{core => native/core}/src/execution/serde.rs | 0
.../core}/src/execution/shuffle/list.rs | 0
{core => native/core}/src/execution/shuffle/map.rs | 0
{core => native/core}/src/execution/shuffle/mod.rs | 0
{core => native/core}/src/execution/shuffle/row.rs | 0
{core => native/core}/src/execution/sort.rs | 0
{core => native/core}/src/execution/timezone.rs | 0
{core => native/core}/src/execution/utils.rs | 0
.../core}/src/jvm_bridge/batch_iterator.rs | 0
{core => native/core}/src/jvm_bridge/comet_exec.rs | 0
.../core}/src/jvm_bridge/comet_metric_node.rs | 0
.../src/jvm_bridge/comet_task_memory_manager.rs | 0
{core => native/core}/src/jvm_bridge/mod.rs | 0
{core => native/core}/src/lib.rs | 0
{core => native/core}/src/parquet/compression.rs | 0
{core => native/core}/src/parquet/data_type.rs | 0
{core => native/core}/src/parquet/mod.rs | 0
.../core}/src/parquet/mutable_vector.rs | 0
{core => native/core}/src/parquet/read/column.rs | 0
{core => native/core}/src/parquet/read/levels.rs | 0
{core => native/core}/src/parquet/read/mod.rs | 0
{core => native/core}/src/parquet/read/values.rs | 0
.../core}/src/parquet/util/bit_packing.rs | 0
{core => native/core}/src/parquet/util/buffer.rs | 0
{core => native/core}/src/parquet/util/jni.rs | 0
.../core}/src/parquet/util/jni_buffer.rs | 0
{core => native/core}/src/parquet/util/memory.rs | 0
{core => native/core}/src/parquet/util/mod.rs | 0
.../src/parquet/util/test_common/file_util.rs | 0
.../core}/src/parquet/util/test_common/mod.rs | 0
.../src/parquet/util/test_common/page_util.rs | 0
.../core}/src/parquet/util/test_common/rand_gen.rs | 0
{core => native/core}/testdata/backtrace.txt | 0
{core => native/core}/testdata/stacktrace.txt | 0
pom.xml | 4 +-
spark/pom.xml | 2 +-
117 files changed, 160 insertions(+), 147 deletions(-)
diff --git a/.github/actions/java-test/action.yaml
b/.github/actions/java-test/action.yaml
index e1efd9fc..caf3f6bb 100644
--- a/.github/actions/java-test/action.yaml
+++ b/.github/actions/java-test/action.yaml
@@ -33,7 +33,7 @@ runs:
- name: Run Cargo build
shell: bash
run: |
- cd core
+ cd native
cargo build
- name: Cache Maven dependencies
diff --git a/.github/actions/rust-test/action.yaml
b/.github/actions/rust-test/action.yaml
index bf0d0ba1..b543bcf0 100644
--- a/.github/actions/rust-test/action.yaml
+++ b/.github/actions/rust-test/action.yaml
@@ -22,19 +22,19 @@ runs:
- name: Check Cargo fmt
shell: bash
run: |
- cd core
+ cd native
cargo fmt --all -- --check --color=never
- name: Check Cargo clippy
shell: bash
run: |
- cd core
+ cd native
cargo clippy --color=never -- -D warnings
- name: Check compilation
shell: bash
run: |
- cd core
+ cd native
cargo check --benches
- name: Cache Maven dependencies
@@ -56,5 +56,5 @@ runs:
- name: Run Cargo test
shell: bash
run: |
- cd core
+ cd native
RUST_BACKTRACE=1 cargo test
diff --git a/.github/workflows/benchmark-tpch.yml
b/.github/workflows/benchmark-tpch.yml
index f4c547a8..3d4fbb75 100644
--- a/.github/workflows/benchmark-tpch.yml
+++ b/.github/workflows/benchmark-tpch.yml
@@ -76,8 +76,8 @@ jobs:
with:
name: libcomet-${{ github.run_id }}
path: |
- core/target/release/libcomet.so
- core/target/release/libcomet.dylib
+ native/target/release/libcomet.so
+ native/target/release/libcomet.dylib
retention-days: 1 # remove the artifact after 1 day, only valid for
this workflow
overwrite: true
- name: Generate TPC-H (SF=1) table data
@@ -119,7 +119,7 @@ jobs:
uses: actions/download-artifact@v4
with:
name: libcomet-${{ github.run_id }}
- path: core/target/release
+ path: native/target/release
- name: Run TPC-H queries
run: |
SPARK_HOME=`pwd` SPARK_TPCH_DATA=`pwd`/tpch/sf1_parquet ./mvnw -B
-Prelease -Dsuites=org.apache.spark.sql.CometTPCHQuerySuite test
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 023b6a68..de1ad577 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -83,8 +83,8 @@ jobs:
with:
name: libcomet-${{ github.run_id }}
path: |
- core/target/release/libcomet.so
- core/target/release/libcomet.dylib
+ native/target/release/libcomet.so
+ native/target/release/libcomet.dylib
retention-days: 1 # remove the artifact after 1 day, only valid for
this workflow
overwrite: true
- name: Build tpcds-kit
@@ -134,7 +134,7 @@ jobs:
uses: actions/download-artifact@v4
with:
name: libcomet-${{ github.run_id }}
- path: core/target/release
+ path: native/target/release
- name: Run TPC-DS queries (Sort merge join)
if: matrix.join == 'sort_merge'
run: |
diff --git a/.gitignore b/.gitignore
index 1c247dd9..8bdcd51d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@ derby.log
metastore_db/
spark-warehouse/
dependency-reduced-pom.xml
-core/src/execution/generated
+native/core/src/execution/generated
prebuild
.flattened-pom.xml
rat.txt
diff --git a/Makefile b/Makefile
index 573a7f95..a5252451 100644
--- a/Makefile
+++ b/Makefile
@@ -20,11 +20,11 @@
all: core jvm
core:
- cd core && cargo build
+ cd native && cargo build
test-rust:
# We need to compile CometException so that the cargo test can pass
./mvnw compile -pl common -DskipTests $(PROFILES)
- cd core && cargo build && \
+ cd native && cargo build && \
RUST_BACKTRACE=1 cargo test
jvm:
./mvnw clean package -DskipTests $(PROFILES)
@@ -32,24 +32,24 @@ test-jvm: core
SPARK_HOME=`pwd` COMET_CONF_DIR=$(shell pwd)/conf RUST_BACKTRACE=1
./mvnw verify $(PROFILES)
test: test-rust test-jvm
clean:
- cd core && cargo clean
+ cd native && cargo clean
./mvnw clean $(PROFILES)
rm -rf .dist
bench:
- cd core && RUSTFLAGS="-Ctarget-cpu=native" cargo bench $(filter-out
$@,$(MAKECMDGOALS))
+ cd native && RUSTFLAGS="-Ctarget-cpu=native" cargo bench $(filter-out
$@,$(MAKECMDGOALS))
format:
- cd core && cargo fmt
+ cd native && cargo fmt
./mvnw compile test-compile scalafix:scalafix -Psemanticdb $(PROFILES)
./mvnw spotless:apply $(PROFILES)
core-amd64:
rustup target add x86_64-apple-darwin
- cd core && RUSTFLAGS="-Ctarget-cpu=skylake
-Ctarget-feature=-prefer-256-bit" CC=o64-clang CXX=o64-clang++ cargo build
--target x86_64-apple-darwin --release
+ cd native && RUSTFLAGS="-Ctarget-cpu=skylake
-Ctarget-feature=-prefer-256-bit" CC=o64-clang CXX=o64-clang++ cargo build
--target x86_64-apple-darwin --release
mkdir -p common/target/classes/org/apache/comet/darwin/x86_64
- cp core/target/x86_64-apple-darwin/release/libcomet.dylib
common/target/classes/org/apache/comet/darwin/x86_64
- cd core && RUSTFLAGS="-Ctarget-cpu=haswell
-Ctarget-feature=-prefer-256-bit" cargo build --release
+ cp native/target/x86_64-apple-darwin/release/libcomet.dylib
common/target/classes/org/apache/comet/darwin/x86_64
+ cd native && RUSTFLAGS="-Ctarget-cpu=haswell
-Ctarget-feature=-prefer-256-bit" cargo build --release
mkdir -p common/target/classes/org/apache/comet/linux/amd64
- cp core/target/release/libcomet.so
common/target/classes/org/apache/comet/linux/amd64
+ cp native/target/release/libcomet.so
common/target/classes/org/apache/comet/linux/amd64
jar -cf common/target/comet-native-x86_64.jar \
-C common/target/classes/org/apache/comet darwin \
-C common/target/classes/org/apache/comet linux
@@ -57,12 +57,12 @@ core-amd64:
core-arm64:
rustup target add aarch64-apple-darwin
- cd core && RUSTFLAGS="-Ctarget-cpu=apple-m1"
CC=arm64-apple-darwin21.4-clang CXX=arm64-apple-darwin21.4-clang++
CARGO_FEATURE_NEON=1 cargo build --target aarch64-apple-darwin --release
+ cd native && RUSTFLAGS="-Ctarget-cpu=apple-m1"
CC=arm64-apple-darwin21.4-clang CXX=arm64-apple-darwin21.4-clang++
CARGO_FEATURE_NEON=1 cargo build --target aarch64-apple-darwin --release
mkdir -p common/target/classes/org/apache/comet/darwin/aarch64
- cp core/target/aarch64-apple-darwin/release/libcomet.dylib
common/target/classes/org/apache/comet/darwin/aarch64
- cd core && RUSTFLAGS="-Ctarget-cpu=native" cargo build --release
+ cp native/target/aarch64-apple-darwin/release/libcomet.dylib
common/target/classes/org/apache/comet/darwin/aarch64
+ cd native && RUSTFLAGS="-Ctarget-cpu=native" cargo build --release
mkdir -p common/target/classes/org/apache/comet/linux/aarch64
- cp core/target/release/libcomet.so
common/target/classes/org/apache/comet/linux/aarch64
+ cp native/target/release/libcomet.so
common/target/classes/org/apache/comet/linux/aarch64
jar -cf common/target/comet-native-aarch64.jar \
-C common/target/classes/org/apache/comet darwin \
-C common/target/classes/org/apache/comet linux
@@ -70,15 +70,15 @@ core-arm64:
release-linux: clean
rustup target add aarch64-apple-darwin x86_64-apple-darwin
- cd core && RUSTFLAGS="-Ctarget-cpu=apple-m1"
CC=arm64-apple-darwin21.4-clang CXX=arm64-apple-darwin21.4-clang++
CARGO_FEATURE_NEON=1 cargo build --target aarch64-apple-darwin --release
- cd core && RUSTFLAGS="-Ctarget-cpu=skylake
-Ctarget-feature=-prefer-256-bit" CC=o64-clang CXX=o64-clang++ cargo build
--target x86_64-apple-darwin --release
- cd core && RUSTFLAGS="-Ctarget-cpu=native
-Ctarget-feature=-prefer-256-bit" cargo build --release
+ cd native && RUSTFLAGS="-Ctarget-cpu=apple-m1"
CC=arm64-apple-darwin21.4-clang CXX=arm64-apple-darwin21.4-clang++
CARGO_FEATURE_NEON=1 cargo build --target aarch64-apple-darwin --release
+ cd native && RUSTFLAGS="-Ctarget-cpu=skylake
-Ctarget-feature=-prefer-256-bit" CC=o64-clang CXX=o64-clang++ cargo build
--target x86_64-apple-darwin --release
+ cd native && RUSTFLAGS="-Ctarget-cpu=native
-Ctarget-feature=-prefer-256-bit" cargo build --release
./mvnw install -Prelease -DskipTests $(PROFILES)
release:
- cd core && RUSTFLAGS="-Ctarget-cpu=native" cargo build --release
+ cd native && RUSTFLAGS="-Ctarget-cpu=native" cargo build --release
./mvnw install -Prelease -DskipTests $(PROFILES)
release-nogit:
- cd core && RUSTFLAGS="-Ctarget-cpu=native" cargo build --features
nightly --release
+ cd native && RUSTFLAGS="-Ctarget-cpu=native" cargo build --features
nightly --release
./mvnw install -Prelease -DskipTests $(PROFILES)
-Dmaven.gitcommitid.skip=true
benchmark-%: clean release
cd spark && COMET_CONF_DIR=$(shell pwd)/conf MAVEN_OPTS='-Xmx20g'
../mvnw exec:java -Dexec.mainClass="$*" -Dexec.classpathScope="test"
-Dexec.cleanupDaemonThreads="false" -Dexec.args="$(filter-out
$@,$(MAKECMDGOALS))" $(PROFILES)
diff --git a/common/pom.xml b/common/pom.xml
index b59d7b18..b912e8bd 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -193,14 +193,14 @@ under the License.
<directory>${project.basedir}/src/main/resources</directory>
</resource>
<resource>
-
<directory>${project.basedir}/../core/target/x86_64-apple-darwin/release</directory>
+
<directory>${project.basedir}/../native/target/x86_64-apple-darwin/release</directory>
<includes>
<include>libcomet.dylib</include>
</includes>
<targetPath>org/apache/comet/darwin/x86_64</targetPath>
</resource>
<resource>
-
<directory>${project.basedir}/../core/target/aarch64-apple-darwin/release</directory>
+
<directory>${project.basedir}/../native/target/aarch64-apple-darwin/release</directory>
<includes>
<include>libcomet.dylib</include>
</includes>
diff --git a/core/Cargo.lock b/native/Cargo.lock
similarity index 94%
copy from core/Cargo.lock
copy to native/Cargo.lock
index 71fe6eb2..ccb6433d 100644
--- a/core/Cargo.lock
+++ b/native/Cargo.lock
@@ -287,7 +287,7 @@ name = "arrow-schema"
version = "52.0.0"
source =
"git+https://github.com/apache/arrow-rs.git?rev=0a4d8a1#0a4d8a14b58e45ef92e31541f0b51a5b25de5f10";
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
]
[[package]]
@@ -333,7 +333,7 @@ checksum =
"c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.68",
]
[[package]]
@@ -353,9 +353,9 @@ checksum =
"0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
[[package]]
name = "backtrace"
-version = "0.3.72"
+version = "0.3.73"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
dependencies = [
"addr2line",
"cc",
@@ -380,9 +380,9 @@ checksum =
"bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
[[package]]
name = "blake2"
@@ -444,9 +444,9 @@ checksum =
"79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
name = "bytemuck"
-version = "1.16.0"
+version = "1.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
+checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
[[package]]
name = "byteorder"
@@ -468,9 +468,9 @@ checksum =
"37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
-version = "1.0.99"
+version = "1.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490"
dependencies = [
"jobserver",
"libc",
@@ -498,7 +498,7 @@ dependencies = [
"android-tzdata",
"iana-time-zone",
"num-traits",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -574,18 +574,18 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.6"
+version = "4.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a9689a29b593160de5bc4aacab7b5d54fb52231de70122626c178e6a368994c7"
+checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d"
dependencies = [
"clap_builder",
]
[[package]]
name = "clap_builder"
-version = "4.5.6"
+version = "4.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2e5387378c84f6faa26890ebf9f0a92989f8873d4d380467bcd0d8d8620424df"
+checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708"
dependencies = [
"anstyle",
"clap_lex",
@@ -1157,9 +1157,9 @@ checksum =
"fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
[[package]]
name = "either"
-version = "1.12.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]]
name = "equivalent"
@@ -1292,7 +1292,7 @@ checksum =
"87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.68",
]
[[package]]
@@ -1610,9 +1610,9 @@ dependencies = [
[[package]]
name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "lexical-core"
@@ -1702,9 +1702,9 @@ checksum =
"4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
[[package]]
name = "libmimalloc-sys"
-version = "0.1.38"
+version = "0.1.39"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0e7bb23d733dfcc8af652a78b7bf232f0e967710d044732185e561e47c0336b6"
+checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44"
dependencies = [
"cc",
"libc",
@@ -1728,9 +1728,9 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.21"
+version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
dependencies = [
"serde",
]
@@ -1771,9 +1771,9 @@ dependencies = [
[[package]]
name = "lz4"
-version = "1.24.0"
+version = "1.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1"
+checksum = "d6eab492fe7f8651add23237ea56dbf11b3c4ff762ab83d40a47f11433421f91"
dependencies = [
"libc",
"lz4-sys",
@@ -1781,9 +1781,9 @@ dependencies = [
[[package]]
name = "lz4-sys"
-version = "1.9.4"
+version = "1.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
+checksum = "e9764018d143cc854c9f17f0b907de70f14393b1f502da6375dce70f00514eb3"
dependencies = [
"cc",
"libc",
@@ -1810,9 +1810,9 @@ dependencies = [
[[package]]
name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memmap2"
@@ -1825,18 +1825,18 @@ dependencies = [
[[package]]
name = "mimalloc"
-version = "0.1.42"
+version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e9186d86b79b52f4a77af65604b51225e8db1d6ee7e3f41aec1e40829c71a176"
+checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633"
dependencies = [
"libmimalloc-sys",
]
[[package]]
name = "miniz_oxide"
-version = "0.7.3"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
dependencies = [
"adler",
]
@@ -1874,9 +1874,9 @@ dependencies = [
[[package]]
name = "num-bigint"
-version = "0.4.5"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
dependencies = [
"num-integer",
"num-traits",
@@ -1954,9 +1954,9 @@ dependencies = [
[[package]]
name = "object"
-version = "0.35.0"
+version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
+checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce"
dependencies = [
"memchr",
]
@@ -2032,7 +2032,7 @@ dependencies = [
"libc",
"redox_syscall",
"smallvec",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -2206,9 +2206,9 @@ checksum =
"5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]]
name = "proc-macro2"
-version = "1.0.85"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [
"unicode-ident",
]
@@ -2276,7 +2276,7 @@ dependencies = [
"itertools 0.12.1",
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.68",
]
[[package]]
@@ -2359,18 +2359,18 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
]
[[package]]
name = "regex"
-version = "1.10.4"
+version = "1.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
dependencies = [
"aho-corasick",
"memchr",
@@ -2380,9 +2380,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
dependencies = [
"aho-corasick",
"memchr",
@@ -2391,15 +2391,15 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
[[package]]
name = "rgb"
-version = "0.8.37"
+version = "0.8.40"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8"
+checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741"
dependencies = [
"bytemuck",
]
@@ -2425,7 +2425,7 @@ version = "0.38.34"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"errno",
"libc",
"linux-raw-sys",
@@ -2498,14 +2498,14 @@ checksum =
"500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.68",
]
[[package]]
name = "serde_json"
-version = "1.0.117"
+version = "1.0.120"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
dependencies = [
"itoa",
"ryu",
@@ -2609,7 +2609,7 @@ checksum =
"01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.68",
]
[[package]]
@@ -2632,9 +2632,9 @@ checksum =
"9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb"
[[package]]
name = "strum"
-version = "0.26.2"
+version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
dependencies = [
"strum_macros",
]
@@ -2649,14 +2649,14 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.66",
+ "syn 2.0.68",
]
[[package]]
name = "subtle"
-version = "2.5.0"
+version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "symbolic-common"
@@ -2694,9 +2694,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.66"
+version = "2.0.68"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
dependencies = [
"proc-macro2",
"quote",
@@ -2732,7 +2732,7 @@ checksum =
"46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.68",
]
[[package]]
@@ -2801,9 +2801,9 @@ dependencies = [
[[package]]
name = "tinyvec"
-version = "1.6.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "ce6b6a2fb3a985e99cebfaefa9faa3024743da73304ca1c683a36429613d3d22"
dependencies = [
"tinyvec_macros",
]
@@ -2835,7 +2835,7 @@ checksum =
"5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.68",
]
[[package]]
@@ -2868,7 +2868,7 @@ checksum =
"34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.68",
]
[[package]]
@@ -2956,9 +2956,9 @@ checksum =
"673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
[[package]]
name = "url"
-version = "2.5.0"
+version = "2.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
dependencies = [
"form_urlencoded",
"idna",
@@ -2967,9 +2967,9 @@ dependencies = [
[[package]]
name = "uuid"
-version = "1.8.0"
+version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439"
dependencies = [
"getrandom",
]
@@ -3017,7 +3017,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.68",
"wasm-bindgen-shared",
]
@@ -3039,7 +3039,7 @@ checksum =
"e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.68",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -3109,7 +3109,7 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -3127,7 +3127,7 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -3147,18 +3147,18 @@ dependencies = [
[[package]]
name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
"windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
]
[[package]]
@@ -3169,9 +3169,9 @@ checksum =
"597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
@@ -3181,9 +3181,9 @@ checksum =
"e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
@@ -3193,15 +3193,15 @@ checksum =
"c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
@@ -3211,9 +3211,9 @@ checksum =
"44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
@@ -3223,9 +3223,9 @@ checksum =
"8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
@@ -3235,9 +3235,9 @@ checksum =
"26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
@@ -3247,28 +3247,28 @@ checksum =
"9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "zerocopy"
-version = "0.7.34"
+version = "0.7.35"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
-version = "0.7.34"
+version = "0.7.35"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.68",
]
[[package]]
@@ -3292,9 +3292,9 @@ dependencies = [
[[package]]
name = "zstd-sys"
-version = "2.0.10+zstd.1.5.6"
+version = "2.0.12+zstd.1.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
+checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13"
dependencies = [
"cc",
"pkg-config",
diff --git a/core/rustfmt.toml b/native/Cargo.toml
similarity index 64%
copy from core/rustfmt.toml
copy to native/Cargo.toml
index 3463af61..79d393fd 100644
--- a/core/rustfmt.toml
+++ b/native/Cargo.toml
@@ -15,5 +15,18 @@
# specific language governing permissions and limitations
# under the License.
+[workspace]
+members = ["core"]
+
+[workspace.package]
+version = "0.1.0"
+homepage = "https://datafusion.apache.org/comet";
+repository = "https://github.com/apache/datafusion-comet";
+authors = ["Apache DataFusion <[email protected]>"]
+description = "Apache DataFusion Comet: High performance accelerator for
Apache Spark"
+readme = "README.md"
+license = "Apache-2.0"
edition = "2021"
-max_width = 100
+
+# Comet uses the same minimum Rust version as DataFusion
+rust-version = "1.75"
diff --git a/core/Cargo.lock b/native/core/Cargo.lock
similarity index 100%
rename from core/Cargo.lock
rename to native/core/Cargo.lock
diff --git a/core/Cargo.toml b/native/core/Cargo.toml
similarity index 100%
rename from core/Cargo.toml
rename to native/core/Cargo.toml
diff --git a/core/benches/bit_util.rs b/native/core/benches/bit_util.rs
similarity index 100%
rename from core/benches/bit_util.rs
rename to native/core/benches/bit_util.rs
diff --git a/core/benches/cast_from_string.rs
b/native/core/benches/cast_from_string.rs
similarity index 100%
rename from core/benches/cast_from_string.rs
rename to native/core/benches/cast_from_string.rs
diff --git a/core/benches/cast_numeric.rs b/native/core/benches/cast_numeric.rs
similarity index 100%
rename from core/benches/cast_numeric.rs
rename to native/core/benches/cast_numeric.rs
diff --git a/core/benches/common.rs b/native/core/benches/common.rs
similarity index 100%
rename from core/benches/common.rs
rename to native/core/benches/common.rs
diff --git a/core/benches/hash.rs b/native/core/benches/hash.rs
similarity index 100%
rename from core/benches/hash.rs
rename to native/core/benches/hash.rs
diff --git a/core/benches/parquet_decode.rs
b/native/core/benches/parquet_decode.rs
similarity index 100%
rename from core/benches/parquet_decode.rs
rename to native/core/benches/parquet_decode.rs
diff --git a/core/benches/parquet_read.rs b/native/core/benches/parquet_read.rs
similarity index 100%
rename from core/benches/parquet_read.rs
rename to native/core/benches/parquet_read.rs
diff --git a/core/benches/perf.rs b/native/core/benches/perf.rs
similarity index 100%
rename from core/benches/perf.rs
rename to native/core/benches/perf.rs
diff --git a/core/benches/row_columnar.rs b/native/core/benches/row_columnar.rs
similarity index 100%
rename from core/benches/row_columnar.rs
rename to native/core/benches/row_columnar.rs
diff --git a/core/benches/shuffle_writer.rs
b/native/core/benches/shuffle_writer.rs
similarity index 100%
rename from core/benches/shuffle_writer.rs
rename to native/core/benches/shuffle_writer.rs
diff --git a/core/build.rs b/native/core/build.rs
similarity index 100%
rename from core/build.rs
rename to native/core/build.rs
diff --git a/core/rustfmt.toml b/native/core/rustfmt.toml
similarity index 100%
rename from core/rustfmt.toml
rename to native/core/rustfmt.toml
diff --git a/core/src/common/bit.rs b/native/core/src/common/bit.rs
similarity index 100%
rename from core/src/common/bit.rs
rename to native/core/src/common/bit.rs
diff --git a/core/src/common/buffer.rs b/native/core/src/common/buffer.rs
similarity index 100%
rename from core/src/common/buffer.rs
rename to native/core/src/common/buffer.rs
diff --git a/core/src/common/mod.rs b/native/core/src/common/mod.rs
similarity index 100%
rename from core/src/common/mod.rs
rename to native/core/src/common/mod.rs
diff --git a/core/src/data_type.rs b/native/core/src/data_type.rs
similarity index 100%
rename from core/src/data_type.rs
rename to native/core/src/data_type.rs
diff --git a/core/src/errors.rs b/native/core/src/errors.rs
similarity index 99%
rename from core/src/errors.rs
rename to native/core/src/errors.rs
index b6f4d088..7b0b5744 100644
--- a/core/src/errors.rs
+++ b/native/core/src/errors.rs
@@ -551,7 +551,7 @@ mod tests {
INIT.call_once(|| {
// Add common classes to the classpath in so that we can find
CometException
let mut common_classes = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
- common_classes.push("../common/target/classes");
+ common_classes.push("../../common/target/classes");
let mut class_path = common_classes
.as_path()
.to_str()
diff --git a/core/src/execution/datafusion/expressions/abs.rs
b/native/core/src/execution/datafusion/expressions/abs.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/abs.rs
rename to native/core/src/execution/datafusion/expressions/abs.rs
diff --git a/core/src/execution/datafusion/expressions/avg.rs
b/native/core/src/execution/datafusion/expressions/avg.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/avg.rs
rename to native/core/src/execution/datafusion/expressions/avg.rs
diff --git a/core/src/execution/datafusion/expressions/avg_decimal.rs
b/native/core/src/execution/datafusion/expressions/avg_decimal.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/avg_decimal.rs
rename to native/core/src/execution/datafusion/expressions/avg_decimal.rs
diff --git a/core/src/execution/datafusion/expressions/bitwise_not.rs
b/native/core/src/execution/datafusion/expressions/bitwise_not.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/bitwise_not.rs
rename to native/core/src/execution/datafusion/expressions/bitwise_not.rs
diff --git
a/core/src/execution/datafusion/expressions/bloom_filter_might_contain.rs
b/native/core/src/execution/datafusion/expressions/bloom_filter_might_contain.rs
similarity index 100%
rename from
core/src/execution/datafusion/expressions/bloom_filter_might_contain.rs
rename to
native/core/src/execution/datafusion/expressions/bloom_filter_might_contain.rs
diff --git a/core/src/execution/datafusion/expressions/cast.rs
b/native/core/src/execution/datafusion/expressions/cast.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/cast.rs
rename to native/core/src/execution/datafusion/expressions/cast.rs
diff --git a/core/src/execution/datafusion/expressions/checkoverflow.rs
b/native/core/src/execution/datafusion/expressions/checkoverflow.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/checkoverflow.rs
rename to native/core/src/execution/datafusion/expressions/checkoverflow.rs
diff --git a/core/src/execution/datafusion/expressions/correlation.rs
b/native/core/src/execution/datafusion/expressions/correlation.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/correlation.rs
rename to native/core/src/execution/datafusion/expressions/correlation.rs
diff --git a/core/src/execution/datafusion/expressions/covariance.rs
b/native/core/src/execution/datafusion/expressions/covariance.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/covariance.rs
rename to native/core/src/execution/datafusion/expressions/covariance.rs
diff --git a/core/src/execution/datafusion/expressions/create_named_struct.rs
b/native/core/src/execution/datafusion/expressions/create_named_struct.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/create_named_struct.rs
rename to
native/core/src/execution/datafusion/expressions/create_named_struct.rs
diff --git a/core/src/execution/datafusion/expressions/if_expr.rs
b/native/core/src/execution/datafusion/expressions/if_expr.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/if_expr.rs
rename to native/core/src/execution/datafusion/expressions/if_expr.rs
diff --git a/core/src/execution/datafusion/expressions/mod.rs
b/native/core/src/execution/datafusion/expressions/mod.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/mod.rs
rename to native/core/src/execution/datafusion/expressions/mod.rs
diff --git a/core/src/execution/datafusion/expressions/negative.rs
b/native/core/src/execution/datafusion/expressions/negative.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/negative.rs
rename to native/core/src/execution/datafusion/expressions/negative.rs
diff --git a/core/src/execution/datafusion/expressions/normalize_nan.rs
b/native/core/src/execution/datafusion/expressions/normalize_nan.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/normalize_nan.rs
rename to native/core/src/execution/datafusion/expressions/normalize_nan.rs
diff --git a/core/src/execution/datafusion/expressions/scalar_funcs.rs
b/native/core/src/execution/datafusion/expressions/scalar_funcs.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/scalar_funcs.rs
rename to native/core/src/execution/datafusion/expressions/scalar_funcs.rs
diff --git a/core/src/execution/datafusion/expressions/scalar_funcs/chr.rs
b/native/core/src/execution/datafusion/expressions/scalar_funcs/chr.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/scalar_funcs/chr.rs
rename to native/core/src/execution/datafusion/expressions/scalar_funcs/chr.rs
diff --git
a/core/src/execution/datafusion/expressions/scalar_funcs/hash_expressions.rs
b/native/core/src/execution/datafusion/expressions/scalar_funcs/hash_expressions.rs
similarity index 100%
rename from
core/src/execution/datafusion/expressions/scalar_funcs/hash_expressions.rs
rename to
native/core/src/execution/datafusion/expressions/scalar_funcs/hash_expressions.rs
diff --git a/core/src/execution/datafusion/expressions/scalar_funcs/hex.rs
b/native/core/src/execution/datafusion/expressions/scalar_funcs/hex.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/scalar_funcs/hex.rs
rename to native/core/src/execution/datafusion/expressions/scalar_funcs/hex.rs
diff --git a/core/src/execution/datafusion/expressions/scalar_funcs/unhex.rs
b/native/core/src/execution/datafusion/expressions/scalar_funcs/unhex.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/scalar_funcs/unhex.rs
rename to native/core/src/execution/datafusion/expressions/scalar_funcs/unhex.rs
diff --git a/core/src/execution/datafusion/expressions/stats.rs
b/native/core/src/execution/datafusion/expressions/stats.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/stats.rs
rename to native/core/src/execution/datafusion/expressions/stats.rs
diff --git a/core/src/execution/datafusion/expressions/stddev.rs
b/native/core/src/execution/datafusion/expressions/stddev.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/stddev.rs
rename to native/core/src/execution/datafusion/expressions/stddev.rs
diff --git a/core/src/execution/datafusion/expressions/strings.rs
b/native/core/src/execution/datafusion/expressions/strings.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/strings.rs
rename to native/core/src/execution/datafusion/expressions/strings.rs
diff --git a/core/src/execution/datafusion/expressions/subquery.rs
b/native/core/src/execution/datafusion/expressions/subquery.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/subquery.rs
rename to native/core/src/execution/datafusion/expressions/subquery.rs
diff --git a/core/src/execution/datafusion/expressions/sum_decimal.rs
b/native/core/src/execution/datafusion/expressions/sum_decimal.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/sum_decimal.rs
rename to native/core/src/execution/datafusion/expressions/sum_decimal.rs
diff --git a/core/src/execution/datafusion/expressions/temporal.rs
b/native/core/src/execution/datafusion/expressions/temporal.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/temporal.rs
rename to native/core/src/execution/datafusion/expressions/temporal.rs
diff --git a/core/src/execution/datafusion/expressions/unbound.rs
b/native/core/src/execution/datafusion/expressions/unbound.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/unbound.rs
rename to native/core/src/execution/datafusion/expressions/unbound.rs
diff --git a/core/src/execution/datafusion/expressions/utils.rs
b/native/core/src/execution/datafusion/expressions/utils.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/utils.rs
rename to native/core/src/execution/datafusion/expressions/utils.rs
diff --git a/core/src/execution/datafusion/expressions/variance.rs
b/native/core/src/execution/datafusion/expressions/variance.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/variance.rs
rename to native/core/src/execution/datafusion/expressions/variance.rs
diff --git a/core/src/execution/datafusion/expressions/xxhash64.rs
b/native/core/src/execution/datafusion/expressions/xxhash64.rs
similarity index 100%
rename from core/src/execution/datafusion/expressions/xxhash64.rs
rename to native/core/src/execution/datafusion/expressions/xxhash64.rs
diff --git a/core/src/execution/datafusion/mod.rs
b/native/core/src/execution/datafusion/mod.rs
similarity index 100%
rename from core/src/execution/datafusion/mod.rs
rename to native/core/src/execution/datafusion/mod.rs
diff --git a/core/src/execution/datafusion/operators/expand.rs
b/native/core/src/execution/datafusion/operators/expand.rs
similarity index 100%
rename from core/src/execution/datafusion/operators/expand.rs
rename to native/core/src/execution/datafusion/operators/expand.rs
diff --git a/core/src/execution/datafusion/operators/mod.rs
b/native/core/src/execution/datafusion/operators/mod.rs
similarity index 100%
rename from core/src/execution/datafusion/operators/mod.rs
rename to native/core/src/execution/datafusion/operators/mod.rs
diff --git a/core/src/execution/datafusion/planner.rs
b/native/core/src/execution/datafusion/planner.rs
similarity index 100%
rename from core/src/execution/datafusion/planner.rs
rename to native/core/src/execution/datafusion/planner.rs
diff --git a/core/src/execution/datafusion/shuffle_writer.rs
b/native/core/src/execution/datafusion/shuffle_writer.rs
similarity index 100%
rename from core/src/execution/datafusion/shuffle_writer.rs
rename to native/core/src/execution/datafusion/shuffle_writer.rs
diff --git a/core/src/execution/datafusion/spark_hash.rs
b/native/core/src/execution/datafusion/spark_hash.rs
similarity index 100%
rename from core/src/execution/datafusion/spark_hash.rs
rename to native/core/src/execution/datafusion/spark_hash.rs
diff --git a/core/src/execution/datafusion/util/mod.rs
b/native/core/src/execution/datafusion/util/mod.rs
similarity index 100%
rename from core/src/execution/datafusion/util/mod.rs
rename to native/core/src/execution/datafusion/util/mod.rs
diff --git a/core/src/execution/datafusion/util/spark_bit_array.rs
b/native/core/src/execution/datafusion/util/spark_bit_array.rs
similarity index 100%
rename from core/src/execution/datafusion/util/spark_bit_array.rs
rename to native/core/src/execution/datafusion/util/spark_bit_array.rs
diff --git a/core/src/execution/datafusion/util/spark_bloom_filter.rs
b/native/core/src/execution/datafusion/util/spark_bloom_filter.rs
similarity index 100%
rename from core/src/execution/datafusion/util/spark_bloom_filter.rs
rename to native/core/src/execution/datafusion/util/spark_bloom_filter.rs
diff --git a/core/src/execution/jni_api.rs
b/native/core/src/execution/jni_api.rs
similarity index 100%
rename from core/src/execution/jni_api.rs
rename to native/core/src/execution/jni_api.rs
diff --git a/core/src/execution/kernels/hash.rs
b/native/core/src/execution/kernels/hash.rs
similarity index 100%
rename from core/src/execution/kernels/hash.rs
rename to native/core/src/execution/kernels/hash.rs
diff --git a/core/src/execution/kernels/mod.rs
b/native/core/src/execution/kernels/mod.rs
similarity index 100%
rename from core/src/execution/kernels/mod.rs
rename to native/core/src/execution/kernels/mod.rs
diff --git a/core/src/execution/kernels/strings.rs
b/native/core/src/execution/kernels/strings.rs
similarity index 100%
rename from core/src/execution/kernels/strings.rs
rename to native/core/src/execution/kernels/strings.rs
diff --git a/core/src/execution/kernels/temporal.rs
b/native/core/src/execution/kernels/temporal.rs
similarity index 100%
rename from core/src/execution/kernels/temporal.rs
rename to native/core/src/execution/kernels/temporal.rs
diff --git a/core/src/execution/memory_pool.rs
b/native/core/src/execution/memory_pool.rs
similarity index 100%
rename from core/src/execution/memory_pool.rs
rename to native/core/src/execution/memory_pool.rs
diff --git a/core/src/execution/metrics/mod.rs
b/native/core/src/execution/metrics/mod.rs
similarity index 100%
rename from core/src/execution/metrics/mod.rs
rename to native/core/src/execution/metrics/mod.rs
diff --git a/core/src/execution/metrics/utils.rs
b/native/core/src/execution/metrics/utils.rs
similarity index 100%
rename from core/src/execution/metrics/utils.rs
rename to native/core/src/execution/metrics/utils.rs
diff --git a/core/src/execution/mod.rs b/native/core/src/execution/mod.rs
similarity index 100%
rename from core/src/execution/mod.rs
rename to native/core/src/execution/mod.rs
diff --git a/core/src/execution/operators/copy.rs
b/native/core/src/execution/operators/copy.rs
similarity index 100%
rename from core/src/execution/operators/copy.rs
rename to native/core/src/execution/operators/copy.rs
diff --git a/core/src/execution/operators/mod.rs
b/native/core/src/execution/operators/mod.rs
similarity index 100%
rename from core/src/execution/operators/mod.rs
rename to native/core/src/execution/operators/mod.rs
diff --git a/core/src/execution/operators/scan.rs
b/native/core/src/execution/operators/scan.rs
similarity index 100%
rename from core/src/execution/operators/scan.rs
rename to native/core/src/execution/operators/scan.rs
diff --git a/core/src/execution/proto/expr.proto
b/native/core/src/execution/proto/expr.proto
similarity index 100%
rename from core/src/execution/proto/expr.proto
rename to native/core/src/execution/proto/expr.proto
diff --git a/core/src/execution/proto/operator.proto
b/native/core/src/execution/proto/operator.proto
similarity index 100%
rename from core/src/execution/proto/operator.proto
rename to native/core/src/execution/proto/operator.proto
diff --git a/core/src/execution/proto/partitioning.proto
b/native/core/src/execution/proto/partitioning.proto
similarity index 100%
rename from core/src/execution/proto/partitioning.proto
rename to native/core/src/execution/proto/partitioning.proto
diff --git a/core/src/execution/serde.rs b/native/core/src/execution/serde.rs
similarity index 100%
rename from core/src/execution/serde.rs
rename to native/core/src/execution/serde.rs
diff --git a/core/src/execution/shuffle/list.rs
b/native/core/src/execution/shuffle/list.rs
similarity index 100%
rename from core/src/execution/shuffle/list.rs
rename to native/core/src/execution/shuffle/list.rs
diff --git a/core/src/execution/shuffle/map.rs
b/native/core/src/execution/shuffle/map.rs
similarity index 100%
rename from core/src/execution/shuffle/map.rs
rename to native/core/src/execution/shuffle/map.rs
diff --git a/core/src/execution/shuffle/mod.rs
b/native/core/src/execution/shuffle/mod.rs
similarity index 100%
rename from core/src/execution/shuffle/mod.rs
rename to native/core/src/execution/shuffle/mod.rs
diff --git a/core/src/execution/shuffle/row.rs
b/native/core/src/execution/shuffle/row.rs
similarity index 100%
rename from core/src/execution/shuffle/row.rs
rename to native/core/src/execution/shuffle/row.rs
diff --git a/core/src/execution/sort.rs b/native/core/src/execution/sort.rs
similarity index 100%
rename from core/src/execution/sort.rs
rename to native/core/src/execution/sort.rs
diff --git a/core/src/execution/timezone.rs
b/native/core/src/execution/timezone.rs
similarity index 100%
rename from core/src/execution/timezone.rs
rename to native/core/src/execution/timezone.rs
diff --git a/core/src/execution/utils.rs b/native/core/src/execution/utils.rs
similarity index 100%
rename from core/src/execution/utils.rs
rename to native/core/src/execution/utils.rs
diff --git a/core/src/jvm_bridge/batch_iterator.rs
b/native/core/src/jvm_bridge/batch_iterator.rs
similarity index 100%
rename from core/src/jvm_bridge/batch_iterator.rs
rename to native/core/src/jvm_bridge/batch_iterator.rs
diff --git a/core/src/jvm_bridge/comet_exec.rs
b/native/core/src/jvm_bridge/comet_exec.rs
similarity index 100%
rename from core/src/jvm_bridge/comet_exec.rs
rename to native/core/src/jvm_bridge/comet_exec.rs
diff --git a/core/src/jvm_bridge/comet_metric_node.rs
b/native/core/src/jvm_bridge/comet_metric_node.rs
similarity index 100%
rename from core/src/jvm_bridge/comet_metric_node.rs
rename to native/core/src/jvm_bridge/comet_metric_node.rs
diff --git a/core/src/jvm_bridge/comet_task_memory_manager.rs
b/native/core/src/jvm_bridge/comet_task_memory_manager.rs
similarity index 100%
rename from core/src/jvm_bridge/comet_task_memory_manager.rs
rename to native/core/src/jvm_bridge/comet_task_memory_manager.rs
diff --git a/core/src/jvm_bridge/mod.rs b/native/core/src/jvm_bridge/mod.rs
similarity index 100%
rename from core/src/jvm_bridge/mod.rs
rename to native/core/src/jvm_bridge/mod.rs
diff --git a/core/src/lib.rs b/native/core/src/lib.rs
similarity index 100%
rename from core/src/lib.rs
rename to native/core/src/lib.rs
diff --git a/core/src/parquet/compression.rs
b/native/core/src/parquet/compression.rs
similarity index 100%
rename from core/src/parquet/compression.rs
rename to native/core/src/parquet/compression.rs
diff --git a/core/src/parquet/data_type.rs
b/native/core/src/parquet/data_type.rs
similarity index 100%
rename from core/src/parquet/data_type.rs
rename to native/core/src/parquet/data_type.rs
diff --git a/core/src/parquet/mod.rs b/native/core/src/parquet/mod.rs
similarity index 100%
rename from core/src/parquet/mod.rs
rename to native/core/src/parquet/mod.rs
diff --git a/core/src/parquet/mutable_vector.rs
b/native/core/src/parquet/mutable_vector.rs
similarity index 100%
rename from core/src/parquet/mutable_vector.rs
rename to native/core/src/parquet/mutable_vector.rs
diff --git a/core/src/parquet/read/column.rs
b/native/core/src/parquet/read/column.rs
similarity index 100%
rename from core/src/parquet/read/column.rs
rename to native/core/src/parquet/read/column.rs
diff --git a/core/src/parquet/read/levels.rs
b/native/core/src/parquet/read/levels.rs
similarity index 100%
rename from core/src/parquet/read/levels.rs
rename to native/core/src/parquet/read/levels.rs
diff --git a/core/src/parquet/read/mod.rs b/native/core/src/parquet/read/mod.rs
similarity index 100%
rename from core/src/parquet/read/mod.rs
rename to native/core/src/parquet/read/mod.rs
diff --git a/core/src/parquet/read/values.rs
b/native/core/src/parquet/read/values.rs
similarity index 100%
rename from core/src/parquet/read/values.rs
rename to native/core/src/parquet/read/values.rs
diff --git a/core/src/parquet/util/bit_packing.rs
b/native/core/src/parquet/util/bit_packing.rs
similarity index 100%
rename from core/src/parquet/util/bit_packing.rs
rename to native/core/src/parquet/util/bit_packing.rs
diff --git a/core/src/parquet/util/buffer.rs
b/native/core/src/parquet/util/buffer.rs
similarity index 100%
rename from core/src/parquet/util/buffer.rs
rename to native/core/src/parquet/util/buffer.rs
diff --git a/core/src/parquet/util/jni.rs b/native/core/src/parquet/util/jni.rs
similarity index 100%
rename from core/src/parquet/util/jni.rs
rename to native/core/src/parquet/util/jni.rs
diff --git a/core/src/parquet/util/jni_buffer.rs
b/native/core/src/parquet/util/jni_buffer.rs
similarity index 100%
rename from core/src/parquet/util/jni_buffer.rs
rename to native/core/src/parquet/util/jni_buffer.rs
diff --git a/core/src/parquet/util/memory.rs
b/native/core/src/parquet/util/memory.rs
similarity index 100%
rename from core/src/parquet/util/memory.rs
rename to native/core/src/parquet/util/memory.rs
diff --git a/core/src/parquet/util/mod.rs b/native/core/src/parquet/util/mod.rs
similarity index 100%
rename from core/src/parquet/util/mod.rs
rename to native/core/src/parquet/util/mod.rs
diff --git a/core/src/parquet/util/test_common/file_util.rs
b/native/core/src/parquet/util/test_common/file_util.rs
similarity index 100%
rename from core/src/parquet/util/test_common/file_util.rs
rename to native/core/src/parquet/util/test_common/file_util.rs
diff --git a/core/src/parquet/util/test_common/mod.rs
b/native/core/src/parquet/util/test_common/mod.rs
similarity index 100%
rename from core/src/parquet/util/test_common/mod.rs
rename to native/core/src/parquet/util/test_common/mod.rs
diff --git a/core/src/parquet/util/test_common/page_util.rs
b/native/core/src/parquet/util/test_common/page_util.rs
similarity index 100%
rename from core/src/parquet/util/test_common/page_util.rs
rename to native/core/src/parquet/util/test_common/page_util.rs
diff --git a/core/src/parquet/util/test_common/rand_gen.rs
b/native/core/src/parquet/util/test_common/rand_gen.rs
similarity index 100%
rename from core/src/parquet/util/test_common/rand_gen.rs
rename to native/core/src/parquet/util/test_common/rand_gen.rs
diff --git a/core/testdata/backtrace.txt b/native/core/testdata/backtrace.txt
similarity index 100%
rename from core/testdata/backtrace.txt
rename to native/core/testdata/backtrace.txt
diff --git a/core/testdata/stacktrace.txt b/native/core/testdata/stacktrace.txt
similarity index 100%
rename from core/testdata/stacktrace.txt
rename to native/core/testdata/stacktrace.txt
diff --git a/pom.xml b/pom.xml
index 043c11e8..fcea91cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@ under the License.
<jacoco.version>0.8.11</jacoco.version>
<semanticdb.version>4.8.8</semanticdb.version>
<slf4j.version>2.0.6</slf4j.version>
- <jni.dir>${project.basedir}/../core/target/debug</jni.dir>
+ <jni.dir>${project.basedir}/../native/target/debug</jni.dir>
<platform>darwin</platform>
<arch>x86_64</arch>
<comet.shade.packageName>org.apache.comet.shaded</comet.shade.packageName>
@@ -454,7 +454,7 @@ under the License.
<profile>
<id>release</id>
<properties>
- <jni.dir>${project.basedir}/../core/target/release</jni.dir>
+ <jni.dir>${project.basedir}/../native/target/release</jni.dir>
</properties>
</profile>
diff --git a/spark/pom.xml b/spark/pom.xml
index 6b3b36aa..49672e0b 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -152,7 +152,7 @@ under the License.
<configuration>
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}</protocArtifact>
<inputDirectories>
- <include>../core/src/execution/proto</include>
+ <include>../native/core/src/execution/proto</include>
</inputDirectories>
</configuration>
</execution>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
