Skip to content

Commit bfba28e

Browse files
committed
Merge remote-tracking branch 'upstream/master' into split-out-arrow-schema
2 parents 3c3faf2 + 5b601b3 commit bfba28e

File tree

32 files changed

+1342
-566
lines changed

32 files changed

+1342
-566
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ __blobstorage__
2020

2121
# .bak files
2222
*.bak
23-
23+
*.bak2
2424
# OS-specific .gitignores
2525

2626
# Mac .gitignore

CHANGELOG-old.md

Lines changed: 114 additions & 1 deletion
Large diffs are not rendered by default.

CHANGELOG.md

Lines changed: 86 additions & 97 deletions
Large diffs are not rendered by default.

arrow-buffer/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
[package]
1919
name = "arrow-buffer"
20-
version = "22.0.0"
20+
version = "23.0.0"
2121
description = "Buffer abstractions for Apache Arrow"
2222
homepage = "https://github.com/apache/arrow-rs"
2323
repository = "https://github.com/apache/arrow-rs"

arrow-buffer/src/lib.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
2020
pub mod alloc;
2121
pub mod buffer;
22+
pub use buffer::{Buffer, MutableBuffer};
23+
2224
mod bytes;
23-
pub mod native;
24-
pub mod util;
25+
mod native;
26+
27+
pub use native::*;
28+
mod util;
29+
pub use util::*;

arrow-flight/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
[package]
1919
name = "arrow-flight"
2020
description = "Apache Arrow Flight"
21-
version = "22.0.0"
21+
version = "23.0.0"
2222
edition = "2021"
2323
rust-version = "1.62"
2424
authors = ["Apache Arrow <[email protected]>"]
@@ -27,7 +27,7 @@ repository = "https://github.com/apache/arrow-rs"
2727
license = "Apache-2.0"
2828

2929
[dependencies]
30-
arrow = { path = "../arrow", version = "22.0.0", default-features = false, features = ["ipc"] }
30+
arrow = { path = "../arrow", version = "23.0.0", default-features = false, features = ["ipc"] }
3131
base64 = { version = "0.13", default-features = false }
3232
tonic = { version = "0.8", default-features = false, features = ["transport", "codegen", "prost"] }
3333
bytes = { version = "1", default-features = false }

arrow-flight/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Add this to your Cargo.toml:
2727

2828
```toml
2929
[dependencies]
30-
arrow-flight = "22.0.0"
30+
arrow-flight = "23.0.0"
3131
```
3232

3333
Apache Arrow Flight is a gRPC based protocol for exchanging Arrow data between processes. See the blog post [Introducing Apache Arrow Flight: A Framework for Fast Data Transport](https://arrow.apache.org/blog/2019/10/13/introducing-arrow-flight/) for more information.

arrow-pyarrow-integration-testing/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
[package]
1919
name = "arrow-pyarrow-integration-testing"
2020
description = ""
21-
version = "22.0.0"
21+
version = "23.0.0"
2222
homepage = "https://github.com/apache/arrow-rs"
2323
repository = "https://github.com/apache/arrow-rs"
2424
authors = ["Apache Arrow <[email protected]>"]
@@ -32,7 +32,7 @@ name = "arrow_pyarrow_integration_testing"
3232
crate-type = ["cdylib"]
3333

3434
[dependencies]
35-
arrow = { path = "../arrow", version = "22.0.0", features = ["pyarrow"] }
35+
arrow = { path = "../arrow", version = "23.0.0", features = ["pyarrow"] }
3636
pyo3 = { version = "0.17", features = ["extension-module"] }
3737

3838
[package.metadata.maturin]

arrow/Cargo.toml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
[package]
1919
name = "arrow"
20-
version = "22.0.0"
20+
version = "23.0.0"
2121
description = "Rust implementation of Apache Arrow"
2222
homepage = "https://github.com/apache/arrow-rs"
2323
repository = "https://github.com/apache/arrow-rs"
@@ -44,13 +44,13 @@ ahash = { version = "0.8", default-features = false, features = ["compile-time-r
4444
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
4545

4646
[dependencies]
47-
arrow-buffer = { path = "../arrow-buffer", version = "22.0.0" }
48-
arrow-schema = { version = "22.0.0", path = "../arrow-schema" }
47+
arrow-buffer = { version = "23.0.0", path = "../arrow-buffer" }
48+
arrow-schema = { version = "23.0.0", path = "../arrow-schema" }
4949
serde_json = { version = "1.0", default-features = false, features = ["std"], optional = true }
5050
indexmap = { version = "1.9", default-features = false, features = ["std"] }
5151
rand = { version = "0.8", default-features = false, features = ["std", "std_rng"], optional = true }
5252
num = { version = "0.4", default-features = false, features = ["std"] }
53-
half = { version = "2.0", default-features = false }
53+
half = { version = "2.0", default-features = false, features = ["num-traits"]}
5454
hashbrown = { version = "0.12", default-features = false }
5555
csv_crate = { version = "1.1", default-features = false, optional = true, package = "csv" }
5656
regex = { version = "1.5.6", default-features = false, features = ["std", "unicode"] }
@@ -239,3 +239,8 @@ harness = false
239239
name = "row_format"
240240
harness = false
241241
required-features = ["test_utils"]
242+
243+
[[bench]]
244+
name = "bitwise_kernel"
245+
harness = false
246+
required-features = ["test_utils"]

arrow/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ This crate is tested with the latest stable version of Rust. We do not currently
3535

3636
The arrow crate follows the [SemVer standard](https://doc.rust-lang.org/cargo/reference/semver.html) defined by Cargo and works well within the Rust crate ecosystem.
3737

38-
However, for historical reasons, this crate uses versions with major numbers greater than `0.x` (e.g. `22.0.0`), unlike many other crates in the Rust ecosystem which spend extended time releasing versions `0.x` to signal planned ongoing API changes. Minor arrow releases contain only compatible changes, while major releases may contain breaking API changes.
38+
However, for historical reasons, this crate uses versions with major numbers greater than `0.x` (e.g. `23.0.0`), unlike many other crates in the Rust ecosystem which spend extended time releasing versions `0.x` to signal planned ongoing API changes. Minor arrow releases contain only compatible changes, while major releases may contain breaking API changes.
3939

4040
## Feature Flags
4141

@@ -61,7 +61,7 @@ The [Apache Arrow Status](https://arrow.apache.org/docs/status.html) page lists
6161

6262
## Safety
6363

64-
Arrow seeks to uphold the Rust Soundness Pledge as articulated eloquently [here](https://raphlinus.github.io/rust/22.0.01/18/soundness-pledge.html). Specifically:
64+
Arrow seeks to uphold the Rust Soundness Pledge as articulated eloquently [here](https://raphlinus.github.io/rust/23.0.01/18/soundness-pledge.html). Specifically:
6565

6666
> The intent of this crate is to be free of soundness bugs. The developers will do their best to avoid them, and welcome help in analyzing and fixing them
6767

0 commit comments

Comments
 (0)