Skip to content

Commit eaa70aa

Browse files
authored
Merge branch 'main' into avro-schema-resolution-promotions
2 parents 88b4c99 + 04f217b commit eaa70aa

File tree

69 files changed

+4909
-600
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+4909
-600
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
steps:
8080
- uses: actions/checkout@v4
8181
- name: Download crate docs
82-
uses: actions/download-artifact@v4
82+
uses: actions/download-artifact@v5
8383
with:
8484
name: crate-docs
8585
path: website/build

arrow-array/src/ffi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ impl ImportedArrowArray<'_> {
525525
unsafe { create_buffer(self.owner.clone(), self.array, 0, buffer_len) }
526526
}
527527

528-
fn dictionary(&self) -> Result<Option<ImportedArrowArray>> {
528+
fn dictionary(&self) -> Result<Option<ImportedArrowArray<'_>>> {
529529
match (self.array.dictionary(), &self.data_type) {
530530
(Some(array), DataType::Dictionary(_, value_type)) => Ok(Some(ImportedArrowArray {
531531
array,

arrow-avro/Cargo.toml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@ zstd = { version = "0.13", default-features = false, optional = true }
5555
bzip2 = { version = "0.6.0", optional = true }
5656
xz = { version = "0.1", default-features = false, optional = true }
5757
crc = { version = "3.0", optional = true }
58-
uuid = "1.17"
5958
strum_macros = "0.27"
59+
uuid = "1.17"
60+
indexmap = "2.10"
61+
6062

6163
[dev-dependencies]
6264
arrow-data = { workspace = true }
@@ -65,13 +67,20 @@ rand = { version = "0.9.1", default-features = false, features = [
6567
"std_rng",
6668
"thread_rng",
6769
] }
68-
criterion = { version = "0.6.0", default-features = false }
70+
criterion = { version = "0.7.0", default-features = false }
6971
tempfile = "3.3"
7072
arrow = { workspace = true }
7173
futures = "0.3.31"
7274
bytes = "1.10.1"
7375
async-stream = "0.3.6"
76+
apache-avro = "0.14.0"
77+
num-bigint = "0.4"
78+
once_cell = "1.21.3"
7479

7580
[[bench]]
7681
name = "avro_reader"
7782
harness = false
83+
84+
[[bench]]
85+
name = "decoder"
86+
harness = false

0 commit comments

Comments
 (0)