Skip to content

Commit ef302fc

Browse files
JanKaulJanKaul
committed
fix storage table reference
1 parent 7842a41 commit ef302fc

11 files changed

Lines changed: 19 additions & 25 deletions

File tree

‎catalogs/iceberg-file-catalog/src/lib.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ use iceberg_rust::{
2222
materialized_view::MaterializedView,
2323
object_store::{store::IcebergStore, Bucket, ObjectStoreBuilder},
2424
spec::{
25-
identifier::FullIdentifier,
2625
materialized_view_metadata::MaterializedViewMetadata,
2726
table_metadata::{new_metadata_location, TableMetadata},
2827
tabular::TabularMetadata,
@@ -441,7 +440,7 @@ impl Catalog for FileCatalog {
441440
}
442441
async fn update_materialized_view(
443442
self: Arc<Self>,
444-
commit: CommitView<FullIdentifier>,
443+
commit: CommitView<Identifier>,
445444
) -> Result<MaterializedView, IcebergError> {
446445
let bucket = Bucket::from_path(&self.path)?;
447446
let object_store = self.object_store.build(bucket)?;

‎catalogs/iceberg-glue-catalog/src/lib.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ use iceberg_rust::{
2727
object_store::{store::IcebergStore, Bucket, ObjectStoreBuilder},
2828
spec::{
2929
self,
30-
identifier::FullIdentifier,
3130
materialized_view_metadata::MaterializedViewMetadata,
3231
table_metadata::{new_metadata_location, TableMetadata},
3332
tabular::TabularMetadata,
@@ -769,7 +768,7 @@ impl Catalog for GlueCatalog {
769768
}
770769
async fn update_materialized_view(
771770
self: Arc<Self>,
772-
commit: CommitView<FullIdentifier>,
771+
commit: CommitView<Identifier>,
773772
) -> Result<MaterializedView, IcebergError> {
774773
let identifier = commit.identifier;
775774
let Some(entry) = self.cache.read().unwrap().get(&identifier).cloned() else {

‎catalogs/iceberg-rest-catalog/src/catalog.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ impl Catalog for RestCatalog {
526526
}
527527
async fn update_materialized_view(
528528
self: Arc<Self>,
529-
commit: CommitView<FullIdentifier>,
529+
commit: CommitView<Identifier>,
530530
) -> Result<MaterializedView, Error> {
531531
let configuration = self.get_configuration().await?;
532532
let identifier = commit.identifier.clone();

‎catalogs/iceberg-s3tables-catalog/src/lib.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ use iceberg_rust::{
2727
object_store::{store::IcebergStore, Bucket, ObjectStoreBuilder},
2828
spec::{
2929
self,
30-
identifier::FullIdentifier,
3130
materialized_view_metadata::MaterializedViewMetadata,
3231
table_metadata::{new_metadata_location, TableMetadata},
3332
tabular::TabularMetadata,
@@ -716,7 +715,7 @@ impl Catalog for S3TablesCatalog {
716715
}
717716
async fn update_materialized_view(
718717
self: Arc<Self>,
719-
commit: CommitView<FullIdentifier>,
718+
commit: CommitView<Identifier>,
720719
) -> Result<MaterializedView, IcebergError> {
721720
let identifier = commit.identifier;
722721
let Some(entry) = self.cache.read().unwrap().get(&identifier).cloned() else {

‎catalogs/iceberg-sql-catalog/src/lib.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ use iceberg_rust::{
2020
materialized_view::MaterializedView,
2121
object_store::{store::IcebergStore, Bucket, ObjectStoreBuilder},
2222
spec::{
23-
identifier::FullIdentifier,
2423
materialized_view_metadata::MaterializedViewMetadata,
2524
table_metadata::{new_metadata_location, TableMetadata},
2625
tabular::TabularMetadata,
@@ -579,7 +578,7 @@ impl Catalog for SqlCatalog {
579578
}
580579
async fn update_materialized_view(
581580
self: Arc<Self>,
582-
commit: CommitView<FullIdentifier>,
581+
commit: CommitView<Identifier>,
583582
) -> Result<MaterializedView, IcebergError> {
584583
let identifier = commit.identifier;
585584
let Some(entry) = self.cache.read().unwrap().get(&identifier).cloned() else {

‎datafusion_iceberg/src/materialized_view/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ async fn get_source_tables(
219219
branch: &Option<String>,
220220
old_refresh_state: Arc<Option<RefreshState>>,
221221
version: &iceberg_rust::spec::view_metadata::Version<
222-
iceberg_rust::spec::identifier::FullIdentifier,
222+
iceberg_rust::spec::identifier::Identifier,
223223
>,
224224
) -> Result<
225225
(

‎iceberg-rust-spec/src/spec/materialized_view_metadata.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use std::{collections::HashMap, ops::Deref};
1414
use serde::{Deserialize, Serialize};
1515
use uuid::Uuid;
1616

17-
use crate::identifier::FullIdentifier;
17+
use crate::identifier::Identifier;
1818

1919
use super::{
2020
tabular::TabularMetadataRef,
@@ -24,9 +24,9 @@ use super::{
2424
pub static REFRESH_STATE: &str = "refresh-state";
2525

2626
/// Fields for the version 1 of the view metadata.
27-
pub type MaterializedViewMetadata = GeneralViewMetadata<FullIdentifier>;
27+
pub type MaterializedViewMetadata = GeneralViewMetadata<Identifier>;
2828
/// Builder for materialized view metadata
29-
pub type MaterializedViewMetadataBuilder = GeneralViewMetadataBuilder<FullIdentifier>;
29+
pub type MaterializedViewMetadataBuilder = GeneralViewMetadataBuilder<Identifier>;
3030

3131
impl MaterializedViewMetadata {
3232
pub fn as_ref(&self) -> TabularMetadataRef<'_> {

‎iceberg-rust-spec/src/spec/view_metadata.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use serde::{Deserialize, Serialize};
2222
use serde_repr::{Deserialize_repr, Serialize_repr};
2323
use uuid::Uuid;
2424

25-
use crate::{error::Error, identifier::FullIdentifier};
25+
use crate::{error::Error, identifier::Identifier};
2626

2727
use super::{
2828
schema::{Schema, DEFAULT_SCHEMA_ID},
@@ -354,7 +354,7 @@ impl Materialization for Option<()> {
354354
}
355355
}
356356

357-
impl Materialization for FullIdentifier {
357+
impl Materialization for Identifier {
358358
fn is_none(&self) -> bool {
359359
false
360360
}

‎iceberg-rust/src/catalog/create.rs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use std::{
1717

1818
use derive_builder::Builder;
1919
use iceberg_rust_spec::{
20-
identifier::FullIdentifier,
20+
identifier::Identifier,
2121
spec::{
2222
materialized_view_metadata::MaterializedViewMetadata,
2323
partition::{PartitionSpec, DEFAULT_PARTITION_SPEC_ID},
@@ -38,7 +38,7 @@ use crate::{
3838
view::View,
3939
};
4040

41-
use super::{identifier::Identifier, Catalog};
41+
use super::Catalog;
4242

4343
/// Configuration for creating a new Iceberg table in a catalog
4444
///
@@ -316,7 +316,7 @@ impl TryInto<ViewMetadata> for CreateView<Option<()>> {
316316
}
317317
}
318318

319-
impl TryInto<MaterializedViewMetadata> for CreateView<FullIdentifier> {
319+
impl TryInto<MaterializedViewMetadata> for CreateView<Identifier> {
320320
type Error = Error;
321321
fn try_into(self) -> Result<MaterializedViewMetadata, Self::Error> {
322322
Ok(MaterializedViewMetadata {
@@ -362,7 +362,7 @@ pub struct CreateMaterializedView {
362362
/// Schema of the view
363363
pub schema: Schema,
364364
/// Viersion of the view
365-
pub view_version: Version<FullIdentifier>,
365+
pub view_version: Version<Identifier>,
366366
/// View properties
367367
#[builder(setter(each(name = "with_property")), default)]
368368
pub properties: HashMap<String, String>,
@@ -429,8 +429,7 @@ impl CreateMaterializedViewBuilder {
429429
representations: create.view_version.representations.clone(),
430430
default_catalog: create.view_version.default_catalog,
431431
default_namespace: create.view_version.default_namespace,
432-
storage_table: FullIdentifier::new(
433-
None,
432+
storage_table: Identifier::new(
434433
identifier.namespace(),
435434
&(identifier.name().to_string() + STORAGE_TABLE_POSTFIX),
436435
),
@@ -446,7 +445,7 @@ impl CreateMaterializedViewBuilder {
446445
}
447446
}
448447

449-
impl From<CreateMaterializedView> for (CreateView<FullIdentifier>, CreateTable) {
448+
impl From<CreateMaterializedView> for (CreateView<Identifier>, CreateTable) {
450449
fn from(val: CreateMaterializedView) -> Self {
451450
let storage_table = val.view_version.storage_table.name().to_owned();
452451
(

‎iceberg-rust/src/catalog/mod.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ use std::collections::HashMap;
2626
use std::fmt::Debug;
2727
use std::sync::Arc;
2828

29-
use iceberg_rust_spec::identifier::FullIdentifier;
3029
use identifier::Identifier;
3130

3231
use crate::error::Error;
@@ -359,7 +358,7 @@ pub trait Catalog: Send + Sync + Debug {
359358
/// * The underlying storage cannot be updated
360359
async fn update_materialized_view(
361360
self: Arc<Self>,
362-
commit: CommitView<FullIdentifier>,
361+
commit: CommitView<Identifier>,
363362
) -> Result<MaterializedView, Error>;
364363
/// Registers an existing table in the catalog using its metadata location.
365364
///

0 commit comments

Comments
 (0)