Skip to content

Commit f90dbff

Browse files
authored
Prep 0.4.0 release (#809)
* deprecate functions * bump version to 0.4.0 * revert
1 parent 43501ff commit f90dbff

File tree

5 files changed

+8
-63
lines changed

5 files changed

+8
-63
lines changed

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ members = [
2828
exclude = ["bindings/python"]
2929

3030
[workspace.package]
31-
version = "0.3.0"
31+
version = "0.4.0"
3232
edition = "2021"
3333
homepage = "https://rust.iceberg.apache.org/"
3434

@@ -62,11 +62,11 @@ either = "1"
6262
env_logger = "0.11.0"
6363
fnv = "1"
6464
futures = "0.3"
65-
iceberg = { version = "0.3.0", path = "./crates/iceberg" }
66-
iceberg-catalog-rest = { version = "0.3.0", path = "./crates/catalog/rest" }
67-
iceberg-catalog-hms = { version = "0.3.0", path = "./crates/catalog/hms" }
68-
iceberg-catalog-memory = { version = "0.3.0", path = "./crates/catalog/memory" }
69-
iceberg-datafusion = { version = "0.3.0", path = "./crates/integrations/datafusion" }
65+
iceberg = { version = "0.4.0", path = "./crates/iceberg" }
66+
iceberg-catalog-rest = { version = "0.4.0", path = "./crates/catalog/rest" }
67+
iceberg-catalog-hms = { version = "0.4.0", path = "./crates/catalog/hms" }
68+
iceberg-catalog-memory = { version = "0.4.0", path = "./crates/catalog/memory" }
69+
iceberg-datafusion = { version = "0.4.0", path = "./crates/integrations/datafusion" }
7070
itertools = "0.13"
7171
log = "0.4"
7272
mockito = "1"

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323

2424
Rust implementation of [Apache Iceberg™](https://iceberg.apache.org/).
2525

26-
Working on [v0.3.0 Release Milestone](https://github.com/apache/iceberg-rust/milestone/2)
27-
2826
## Components
2927

3028
The Apache Iceberg Rust project is composed of the following components:

crates/catalog/rest/src/catalog.rs

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,6 @@ impl RestCatalogConfig {
7373
pub(crate) fn get_token_endpoint(&self) -> String {
7474
if let Some(oauth2_uri) = self.props.get("oauth2-server-uri") {
7575
oauth2_uri.to_string()
76-
} else if let Some(auth_url) = self.props.get("rest.authorization-url") {
77-
log::warn!(
78-
"'rest.authorization-url' is deprecated and will be removed in version 0.4.0. \
79-
Please use 'oauth2-server-uri' instead."
80-
);
81-
auth_url.to_string()
8276
} else {
8377
[&self.uri, PATH_V1, "oauth", "tokens"].join("/")
8478
}
@@ -924,36 +918,6 @@ mod tests {
924918
assert_eq!(headers, expected_headers);
925919
}
926920

927-
#[tokio::test]
928-
async fn test_oauth_with_deprecated_auth_url() {
929-
let mut server = Server::new_async().await;
930-
let config_mock = create_config_mock(&mut server).await;
931-
932-
let mut auth_server = Server::new_async().await;
933-
let auth_server_path = "/some/path";
934-
let oauth_mock = create_oauth_mock_with_path(&mut auth_server, auth_server_path).await;
935-
936-
let mut props = HashMap::new();
937-
props.insert("credential".to_string(), "client1:secret1".to_string());
938-
props.insert(
939-
"rest.authorization-url".to_string(),
940-
format!("{}{}", auth_server.url(), auth_server_path).to_string(),
941-
);
942-
943-
let catalog = RestCatalog::new(
944-
RestCatalogConfig::builder()
945-
.uri(server.url())
946-
.props(props)
947-
.build(),
948-
);
949-
950-
let token = catalog.context().await.unwrap().client.token().await;
951-
952-
oauth_mock.assert_async().await;
953-
config_mock.assert_async().await;
954-
assert_eq!(token, Some("ey000000000000".to_string()));
955-
}
956-
957921
#[tokio::test]
958922
async fn test_oauth_with_oauth2_server_uri() {
959923
let mut server = Server::new_async().await;

crates/iceberg/src/catalog/mod.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -367,12 +367,6 @@ pub enum TableUpdate {
367367
AddSchema {
368368
/// The schema to add.
369369
schema: Schema,
370-
/// The last column id of the table.
371-
#[deprecated(
372-
since = "0.3.0",
373-
note = "This field is handled internally, and should not be part of the update."
374-
)]
375-
last_column_id: Option<i32>,
376370
},
377371
/// Set table's current schema
378372
#[serde(rename_all = "kebab-case")]
@@ -1301,7 +1295,6 @@ mod tests {
13011295
"#,
13021296
TableUpdate::AddSchema {
13031297
schema: test_schema.clone(),
1304-
last_column_id: Some(3),
13051298
},
13061299
);
13071300

@@ -1340,7 +1333,6 @@ mod tests {
13401333
"#,
13411334
TableUpdate::AddSchema {
13421335
schema: test_schema.clone(),
1343-
last_column_id: None,
13441336
},
13451337
);
13461338
}

crates/iceberg/src/spec/table_metadata_builder.rs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,6 @@ impl TableMetadataBuilder {
585585
if schema_found {
586586
if self.last_added_schema_id != Some(new_schema_id) {
587587
self.changes.push(TableUpdate::AddSchema {
588-
last_column_id: Some(self.metadata.last_column_id),
589588
schema: schema.clone(),
590589
});
591590
self.last_added_schema_id = Some(new_schema_id);
@@ -609,10 +608,7 @@ impl TableMetadataBuilder {
609608
.schemas
610609
.insert(new_schema_id, schema.clone().into());
611610

612-
self.changes.push(TableUpdate::AddSchema {
613-
schema,
614-
last_column_id: Some(self.metadata.last_column_id),
615-
});
611+
self.changes.push(TableUpdate::AddSchema { schema });
616612

617613
self.last_added_schema_id = Some(new_schema_id);
618614

@@ -1453,10 +1449,7 @@ mod tests {
14531449
TableUpdate::SetLocation {
14541450
location: TEST_LOCATION.to_string()
14551451
},
1456-
TableUpdate::AddSchema {
1457-
last_column_id: Some(LAST_ASSIGNED_COLUMN_ID),
1458-
schema: schema(),
1459-
},
1452+
TableUpdate::AddSchema { schema: schema() },
14601453
TableUpdate::SetCurrentSchema { schema_id: -1 },
14611454
TableUpdate::AddSpec {
14621455
// Because this is a new tables, field-ids are assigned
@@ -1509,7 +1502,6 @@ mod tests {
15091502
location: TEST_LOCATION.to_string()
15101503
},
15111504
TableUpdate::AddSchema {
1512-
last_column_id: Some(0),
15131505
schema: Schema::builder().build().unwrap(),
15141506
},
15151507
TableUpdate::SetCurrentSchema { schema_id: -1 },
@@ -1751,7 +1743,6 @@ mod tests {
17511743
Some(&Arc::new(added_schema.clone()))
17521744
);
17531745
pretty_assertions::assert_eq!(build_result.changes[0], TableUpdate::AddSchema {
1754-
last_column_id: Some(4),
17551746
schema: added_schema
17561747
});
17571748
assert_eq!(build_result.changes[1], TableUpdate::SetCurrentSchema {

0 commit comments

Comments
 (0)