Skip to content

Commit c729d22

Browse files
committed
Merge remote-tracking branch 'origin/gh5854_thrift_remodel' into write_thrift
2 parents 138b0d5 + 9596775 commit c729d22

File tree

32 files changed

+5136
-1551
lines changed

32 files changed

+5136
-1551
lines changed

.github/workflows/integration.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ jobs:
6363
ARROW_INTEGRATION_CPP: ON
6464
ARROW_INTEGRATION_CSHARP: ON
6565
ARCHERY_INTEGRATION_TARGET_IMPLEMENTATIONS: "rust"
66+
ARCHERY_INTEGRATION_WITH_DOTNET: "1"
6667
ARCHERY_INTEGRATION_WITH_GO: "1"
6768
ARCHERY_INTEGRATION_WITH_JAVA: "1"
6869
ARCHERY_INTEGRATION_WITH_JS: "1"
@@ -98,6 +99,11 @@ jobs:
9899
with:
99100
path: rust
100101
fetch-depth: 0
102+
- name: Checkout Arrow .NET
103+
uses: actions/checkout@v5
104+
with:
105+
repository: apache/arrow-dotnet
106+
path: dotnet
101107
- name: Checkout Arrow Go
102108
uses: actions/checkout@v5
103109
with:

.github/workflows/parquet.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ jobs:
119119
run: cargo check -p parquet --no-default-features --features flate2 --features flate2-rust_backened
120120
- name: Check compilation --no-default-features --features flate2 --features flate2-zlib-rs
121121
run: cargo check -p parquet --no-default-features --features flate2 --features flate2-zlib-rs
122-
122+
- name: Check compilation --no-default-features --features variant_experimental
123+
run: cargo check -p parquet --no-default-features --features variant_experimental
124+
123125

124126
# test the parquet crate builds against wasm32 in stable rust
125127
wasm32-build:

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ parquet = { version = "56.1.0", path = "./parquet", default-features = false }
104104
# These crates have not yet been released and thus do not use the workspace version
105105
parquet-variant = { version = "0.1.0", path = "./parquet-variant" }
106106
parquet-variant-json = { version = "0.1.0", path = "./parquet-variant-json" }
107-
parquet-variant-compute = { version = "0.1.0", path = "./parquet-variant-json" }
107+
parquet-variant-compute = { version = "0.1.0", path = "./parquet-variant-compute" }
108108

109109
chrono = { version = "0.4.40", default-features = false, features = ["clock"] }
110110

arrow-avro/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ snappy = ["snap", "crc"]
4242
canonical_extension_types = ["arrow-schema/canonical_extension_types"]
4343
md5 = ["dep:md5"]
4444
sha256 = ["dep:sha2"]
45+
small_decimals = []
4546

4647
[dependencies]
4748
arrow-schema = { workspace = true }

0 commit comments

Comments
 (0)