Skip to content

Commit 5646449

Browse files
committed
Merge branch 'main' into tm/timestamp-ns
2 parents 0b28660 + 79711ac commit 5646449

Some content is hidden

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

49 files changed

+4220
-1342
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
run: cargo test --no-fail-fast --all-targets --all-features --workspace
114114

115115
- name: Async-std Test
116-
run: cargo test --no-fail-fast --all-targets --no-default-features --features "async-std" --features "storage-fs" --workspace
116+
run: cargo test --no-fail-fast --all-targets --no-default-features --features "async-std" --features "storage-all" --workspace
117117

118118
- name: Doc Test
119119
run: cargo test --no-fail-fast --doc --all-features --workspace

.github/workflows/publish.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,13 @@ jobs:
3636
# Order here is sensitive, as it will be used to determine the order of publishing
3737
package:
3838
- "crates/iceberg"
39+
- "crates/catalog/glue"
3940
- "crates/catalog/hms"
41+
- "crates/catalog/memory"
4042
- "crates/catalog/rest"
43+
# sql is not ready for release yet.
44+
# - "crates/catalog/sql"
45+
- "crates/integrations/datafusion"
4146
steps:
4247
- uses: actions/checkout@v4
4348

CHANGELOG.md

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

CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ All pull requests should be reviewed by at least one iceberg-rust committer.
7373

7474
All pull requests are squash merged. We generally discourage large pull requests that are over 300-500 lines of diff. If you would like to propose a change that is larger we suggest coming onto [Iceberg's DEV mailing list](mailto:[email protected]) or [Slack #rust Channel](https://join.slack.com/t/apache-iceberg/shared_invite/zt-1zbov3k6e-KtJfoaxp97YfX6dPz1Bk7A) and discuss it with us. This way we can talk through the solution and discuss if a change that large is even needed! This will produce a quicker response to the change and likely produce code that aligns better with our process.
7575

76+
When a pull request is under review, please avoid using force push as it makes it difficult for reviewer to track changes. If you need to keep the branch up to date with the main branch, consider using `git merge` instead.
77+
7678
### CI
7779

7880
Currently, iceberg-rust uses GitHub Actions to run tests. The workflows are defined in `.github/workflows`.

Cargo.toml

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,16 @@
1818
[workspace]
1919
resolver = "2"
2020
members = [
21-
"crates/catalog/*",
22-
"crates/examples",
23-
"crates/iceberg",
24-
"crates/integrations/*",
25-
"crates/test_utils",
26-
]
27-
exclude = [
28-
"bindings/python"
21+
"crates/catalog/*",
22+
"crates/examples",
23+
"crates/iceberg",
24+
"crates/integrations/*",
25+
"crates/test_utils",
2926
]
27+
exclude = ["bindings/python"]
3028

3129
[workspace.package]
32-
version = "0.2.0"
30+
version = "0.3.0"
3331
edition = "2021"
3432
homepage = "https://rust.iceberg.apache.org/"
3533

@@ -49,48 +47,49 @@ arrow-select = { version = "52" }
4947
arrow-string = { version = "52" }
5048
async-stream = "0.3.5"
5149
async-trait = "0.1"
52-
async-std = "1.12.0"
50+
async-std = "1.12"
5351
aws-config = "1.1.8"
54-
aws-sdk-glue = "1.21.0"
52+
aws-sdk-glue = "1.21"
5553
bimap = "0.6"
5654
bitvec = "1.0.1"
5755
bytes = "1.5"
5856
chrono = "0.4.34"
5957
ctor = "0.2.8"
60-
derive_builder = "0.20.0"
58+
derive_builder = "0.20"
6159
either = "1"
6260
env_logger = "0.11.0"
6361
fnv = "1"
6462
futures = "0.3"
65-
iceberg = { version = "0.2.0", path = "./crates/iceberg" }
66-
iceberg-catalog-rest = { version = "0.2.0", path = "./crates/catalog/rest" }
67-
iceberg-catalog-hms = { version = "0.2.0", path = "./crates/catalog/hms" }
63+
iceberg = { version = "0.3.0", path = "./crates/iceberg" }
64+
iceberg-catalog-rest = { version = "0.3.0", path = "./crates/catalog/rest" }
65+
iceberg-catalog-hms = { version = "0.3.0", path = "./crates/catalog/hms" }
66+
iceberg-catalog-memory = { version = "0.3.0", path = "./crates/catalog/memory" }
6867
itertools = "0.13"
69-
log = "^0.4"
70-
mockito = "^1"
68+
log = "0.4"
69+
mockito = "1"
7170
murmur3 = "0.5.2"
7271
once_cell = "1"
73-
opendal = "0.48"
74-
ordered-float = "4.0.0"
72+
opendal = "0.49"
73+
ordered-float = "4"
7574
parquet = "52"
7675
pilota = "0.11.2"
77-
pretty_assertions = "1.4.0"
76+
pretty_assertions = "1.4"
7877
port_scanner = "0.1.5"
7978
regex = "1.10.5"
80-
reqwest = { version = "^0.12", default-features = false, features = ["json"] }
81-
rust_decimal = "1.31.0"
82-
serde = { version = "^1.0", features = ["rc"] }
79+
reqwest = { version = "0.12", default-features = false, features = ["json"] }
80+
rust_decimal = "1.31"
81+
serde = { version = "1", features = ["rc"] }
8382
serde_bytes = "0.11.8"
84-
serde_derive = "^1.0"
85-
serde_json = "^1.0"
83+
serde_derive = "1"
84+
serde_json = "1"
8685
serde_repr = "0.1.16"
87-
serde_with = "3.4.0"
86+
serde_with = "3.4"
8887
tempfile = "3.8"
8988
tokio = { version = "1", default-features = false }
90-
typed-builder = "^0.19"
89+
typed-builder = "0.19"
9190
url = "2"
9291
urlencoding = "2"
9392
uuid = { version = "1.6.1", features = ["v7"] }
9493
volo-thrift = "0.10"
95-
hive_metastore = "0.1.0"
94+
hive_metastore = "0.1"
9695
tera = "1"

0 commit comments

Comments
 (0)