From d57c9d9427324d44890bedf67af0e2c1ea7c6745 Mon Sep 17 00:00:00 2001
From: Jan Kaul <jankaul@mailbox.org>
Date: Sun, 8 Dec 2024 08:57:29 +0100
Subject: [PATCH] refactor files

---
 datafusion_iceberg/src/catalog/mirror.rs                  | 2 +-
 iceberg-file-catalog/src/lib.rs                           | 2 +-
 iceberg-glue-catalog/src/lib.rs                           | 2 +-
 iceberg-rust/src/lib.rs                                   | 1 -
 iceberg-rust/src/{object_store.rs => object_store/mod.rs} | 2 ++
 iceberg-rust/src/{ => object_store}/store.rs              | 0
 iceberg-sql-catalog/src/lib.rs                            | 2 +-
 7 files changed, 6 insertions(+), 5 deletions(-)
 rename iceberg-rust/src/{object_store.rs => object_store/mod.rs} (99%)
 rename iceberg-rust/src/{ => object_store}/store.rs (100%)

diff --git a/datafusion_iceberg/src/catalog/mirror.rs b/datafusion_iceberg/src/catalog/mirror.rs
index 10715d4d..ce05fd3f 100644
--- a/datafusion_iceberg/src/catalog/mirror.rs
+++ b/datafusion_iceberg/src/catalog/mirror.rs
@@ -1,7 +1,7 @@
 use dashmap::DashMap;
 use datafusion::{datasource::TableProvider, error::DataFusionError};
 use futures::{executor::LocalPool, task::LocalSpawnExt};
-use iceberg_rust::store::IcebergStore;
+use iceberg_rust::object_store::store::IcebergStore;
 use std::{collections::HashSet, sync::Arc};
 
 use iceberg_rust::spec::{tabular::TabularMetadata, view_metadata::REF_PREFIX};
diff --git a/iceberg-file-catalog/src/lib.rs b/iceberg-file-catalog/src/lib.rs
index 8e64456c..c7aefb27 100644
--- a/iceberg-file-catalog/src/lib.rs
+++ b/iceberg-file-catalog/src/lib.rs
@@ -20,6 +20,7 @@ use iceberg_rust::{
     },
     error::Error as IcebergError,
     materialized_view::MaterializedView,
+    object_store::store::IcebergStore,
     object_store::{Bucket, ObjectStoreBuilder},
     spec::{
         materialized_view_metadata::MaterializedViewMetadata,
@@ -28,7 +29,6 @@ use iceberg_rust::{
         util::strip_prefix,
         view_metadata::ViewMetadata,
     },
-    store::IcebergStore,
     table::Table,
     view::View,
 };
diff --git a/iceberg-glue-catalog/src/lib.rs b/iceberg-glue-catalog/src/lib.rs
index 2e5ed791..6ee8a614 100644
--- a/iceberg-glue-catalog/src/lib.rs
+++ b/iceberg-glue-catalog/src/lib.rs
@@ -23,6 +23,7 @@ use iceberg_rust::{
     },
     error::Error as IcebergError,
     materialized_view::MaterializedView,
+    object_store::store::IcebergStore,
     object_store::{Bucket, ObjectStoreBuilder},
     spec::{
         self,
@@ -32,7 +33,6 @@ use iceberg_rust::{
         util::strip_prefix,
         view_metadata::ViewMetadata,
     },
-    store::IcebergStore,
     table::Table,
     view::View,
 };
diff --git a/iceberg-rust/src/lib.rs b/iceberg-rust/src/lib.rs
index 42da47a7..8c031f30 100644
--- a/iceberg-rust/src/lib.rs
+++ b/iceberg-rust/src/lib.rs
@@ -10,7 +10,6 @@ pub mod materialized_view;
 pub mod object_store;
 pub mod spec;
 pub mod sql;
-pub mod store;
 pub mod table;
 pub(crate) mod util;
 pub mod view;
diff --git a/iceberg-rust/src/object_store.rs b/iceberg-rust/src/object_store/mod.rs
similarity index 99%
rename from iceberg-rust/src/object_store.rs
rename to iceberg-rust/src/object_store/mod.rs
index cb9684d4..94d9ae49 100644
--- a/iceberg-rust/src/object_store.rs
+++ b/iceberg-rust/src/object_store/mod.rs
@@ -19,6 +19,8 @@ use object_store::{
 
 use crate::error::Error;
 
+pub mod store;
+
 /// Type for buckets for different cloud providers
 #[derive(Debug)]
 pub enum Bucket<'s> {
diff --git a/iceberg-rust/src/store.rs b/iceberg-rust/src/object_store/store.rs
similarity index 100%
rename from iceberg-rust/src/store.rs
rename to iceberg-rust/src/object_store/store.rs
diff --git a/iceberg-sql-catalog/src/lib.rs b/iceberg-sql-catalog/src/lib.rs
index 509755ac..ad9c581a 100644
--- a/iceberg-sql-catalog/src/lib.rs
+++ b/iceberg-sql-catalog/src/lib.rs
@@ -18,6 +18,7 @@ use iceberg_rust::{
     },
     error::Error as IcebergError,
     materialized_view::MaterializedView,
+    object_store::store::IcebergStore,
     object_store::{Bucket, ObjectStoreBuilder},
     spec::{
         materialized_view_metadata::MaterializedViewMetadata,
@@ -26,7 +27,6 @@ use iceberg_rust::{
         util::strip_prefix,
         view_metadata::ViewMetadata,
     },
-    store::IcebergStore,
     table::Table,
     view::View,
 };