reorganize the sql provider package

apache · Sep 24, 2024 · a94ddaa · a94ddaa
1 parent a89fe92
commit a94ddaa
Show file tree

Hide file tree

Showing 49 changed files with 95 additions and 67 deletions.
diff --git a/...in/java/org/apache/gravitino/storage/relational/mapper/CatalogMetaSQLProviderFactory.java b/...in/java/org/apache/gravitino/storage/relational/mapper/CatalogMetaSQLProviderFactory.java
@@ -22,7 +22,8 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.apache.gravitino.storage.relational.JDBCBackend.JDBCBackendType;
-import org.apache.gravitino.storage.relational.mapper.postgresql.CatalogMetaPostgreSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.CatalogMetaBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.postgresql.CatalogMetaPostgreSQLProvider;
 import org.apache.gravitino.storage.relational.po.CatalogPO;
 import org.apache.gravitino.storage.relational.session.SqlSessionFactoryHelper;
 import org.apache.ibatis.annotations.Param;

diff --git a/...in/java/org/apache/gravitino/storage/relational/mapper/FilesetMetaSQLProviderFactory.java b/...in/java/org/apache/gravitino/storage/relational/mapper/FilesetMetaSQLProviderFactory.java
@@ -22,7 +22,8 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.apache.gravitino.storage.relational.JDBCBackend.JDBCBackendType;
-import org.apache.gravitino.storage.relational.mapper.postgresql.FilesetMetaPostgreSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.FilesetMetaBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.postgresql.FilesetMetaPostgreSQLProvider;
 import org.apache.gravitino.storage.relational.po.FilesetPO;
 import org.apache.gravitino.storage.relational.session.SqlSessionFactoryHelper;
 import org.apache.ibatis.annotations.Param;

diff --git a/...java/org/apache/gravitino/storage/relational/mapper/FilesetVersionSQLProviderFactory.java b/...java/org/apache/gravitino/storage/relational/mapper/FilesetVersionSQLProviderFactory.java
@@ -21,7 +21,8 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.apache.gravitino.storage.relational.JDBCBackend.JDBCBackendType;
-import org.apache.gravitino.storage.relational.mapper.postgresql.FilesetVersionPostgreSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.FilesetVersionBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.postgresql.FilesetVersionPostgreSQLProvider;
 import org.apache.gravitino.storage.relational.po.FilesetVersionPO;
 import org.apache.gravitino.storage.relational.session.SqlSessionFactoryHelper;
 import org.apache.ibatis.annotations.Param;

diff --git a/...main/java/org/apache/gravitino/storage/relational/mapper/GroupMetaSQLProviderFactory.java b/...main/java/org/apache/gravitino/storage/relational/mapper/GroupMetaSQLProviderFactory.java
@@ -21,7 +21,8 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.apache.gravitino.storage.relational.JDBCBackend.JDBCBackendType;
-import org.apache.gravitino.storage.relational.mapper.postgresql.GroupMetaPostgreSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.GroupMetaBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.postgresql.GroupMetaPostgreSQLProvider;
 import org.apache.gravitino.storage.relational.po.GroupPO;
 import org.apache.gravitino.storage.relational.session.SqlSessionFactoryHelper;
 import org.apache.ibatis.annotations.Param;

diff --git a/...n/java/org/apache/gravitino/storage/relational/mapper/GroupRoleRelSQLProviderFactory.java b/...n/java/org/apache/gravitino/storage/relational/mapper/GroupRoleRelSQLProviderFactory.java
@@ -22,7 +22,8 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.gravitino.storage.relational.JDBCBackend.JDBCBackendType;
-import org.apache.gravitino.storage.relational.mapper.postgresql.GroupRoleRelPostgreSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.GroupRoleRelBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.postgresql.GroupRoleRelPostgreSQLProvider;
 import org.apache.gravitino.storage.relational.po.GroupRoleRelPO;
 import org.apache.gravitino.storage.relational.session.SqlSessionFactoryHelper;
 import org.apache.ibatis.annotations.Param;

diff --git a/...n/java/org/apache/gravitino/storage/relational/mapper/MetalakeMetaSQLProviderFactory.java b/...n/java/org/apache/gravitino/storage/relational/mapper/MetalakeMetaSQLProviderFactory.java
@@ -22,7 +22,8 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.apache.gravitino.storage.relational.JDBCBackend.JDBCBackendType;
-import org.apache.gravitino.storage.relational.mapper.postgresql.MetalakeMetaPostgreSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.MetalakeMetaBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.postgresql.MetalakeMetaPostgreSQLProvider;
 import org.apache.gravitino.storage.relational.po.MetalakePO;
 import org.apache.gravitino.storage.relational.session.SqlSessionFactoryHelper;
 import org.apache.ibatis.annotations.Param;

diff --git a/...main/java/org/apache/gravitino/storage/relational/mapper/OwnerMetaSQLProviderFactory.java b/...main/java/org/apache/gravitino/storage/relational/mapper/OwnerMetaSQLProviderFactory.java
@@ -21,7 +21,8 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.apache.gravitino.storage.relational.JDBCBackend.JDBCBackendType;
-import org.apache.gravitino.storage.relational.mapper.postgresql.OwnerMetaPostgreSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.OwnerMetaBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.postgresql.OwnerMetaPostgreSQLProvider;
 import org.apache.gravitino.storage.relational.po.OwnerRelPO;
 import org.apache.gravitino.storage.relational.session.SqlSessionFactoryHelper;
 import org.apache.ibatis.annotations.Param;

diff --git a/.../main/java/org/apache/gravitino/storage/relational/mapper/RoleMetaSQLProviderFactory.java b/.../main/java/org/apache/gravitino/storage/relational/mapper/RoleMetaSQLProviderFactory.java
@@ -21,7 +21,8 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.apache.gravitino.storage.relational.JDBCBackend.JDBCBackendType;
-import org.apache.gravitino.storage.relational.mapper.postgresql.RoleMetaPostgreSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.RoleMetaBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.postgresql.RoleMetaPostgreSQLProvider;
 import org.apache.gravitino.storage.relational.po.RolePO;
 import org.apache.gravitino.storage.relational.session.SqlSessionFactoryHelper;
 import org.apache.ibatis.annotations.Param;

diff --git a/...ain/java/org/apache/gravitino/storage/relational/mapper/SchemaMetaSQLProviderFactory.java b/...ain/java/org/apache/gravitino/storage/relational/mapper/SchemaMetaSQLProviderFactory.java
@@ -21,7 +21,8 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.apache.gravitino.storage.relational.JDBCBackend.JDBCBackendType;
-import org.apache.gravitino.storage.relational.mapper.postgresql.SchemaMetaPostgreSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.SchemaMetaBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.postgresql.SchemaMetaPostgreSQLProvider;
 import org.apache.gravitino.storage.relational.po.SchemaPO;
 import org.apache.gravitino.storage.relational.session.SqlSessionFactoryHelper;
 import org.apache.ibatis.annotations.Param;

diff --git a/...ava/org/apache/gravitino/storage/relational/mapper/SecurableObjectSQLProviderFactory.java b/...ava/org/apache/gravitino/storage/relational/mapper/SecurableObjectSQLProviderFactory.java
@@ -22,7 +22,8 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.gravitino.storage.relational.JDBCBackend.JDBCBackendType;
-import org.apache.gravitino.storage.relational.mapper.postgresql.SecurableObjectPostgreSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.SecurableObjectBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.postgresql.SecurableObjectPostgreSQLProvider;
 import org.apache.gravitino.storage.relational.po.SecurableObjectPO;
 import org.apache.gravitino.storage.relational.session.SqlSessionFactoryHelper;
 import org.apache.ibatis.annotations.Param;

diff --git a/...main/java/org/apache/gravitino/storage/relational/mapper/TableMetaSQLProviderFactory.java b/...main/java/org/apache/gravitino/storage/relational/mapper/TableMetaSQLProviderFactory.java
@@ -21,7 +21,8 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.apache.gravitino.storage.relational.JDBCBackend.JDBCBackendType;
-import org.apache.gravitino.storage.relational.mapper.postgresql.TableMetaPostgreSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.TableMetaBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.postgresql.TableMetaPostgreSQLProvider;
 import org.apache.gravitino.storage.relational.po.TablePO;
 import org.apache.gravitino.storage.relational.session.SqlSessionFactoryHelper;
 import org.apache.ibatis.annotations.Param;

diff --git a/...c/main/java/org/apache/gravitino/storage/relational/mapper/TagMetaSQLProviderFactory.java b/...c/main/java/org/apache/gravitino/storage/relational/mapper/TagMetaSQLProviderFactory.java
@@ -22,7 +22,8 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.gravitino.storage.relational.JDBCBackend.JDBCBackendType;
-import org.apache.gravitino.storage.relational.mapper.postgresql.TagMetaPostgreSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.TagMetaBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.postgresql.TagMetaPostgreSQLProvider;
 import org.apache.gravitino.storage.relational.po.TagPO;
 import org.apache.gravitino.storage.relational.session.SqlSessionFactoryHelper;
 import org.apache.ibatis.annotations.Param;

diff --git a/...rg/apache/gravitino/storage/relational/mapper/TagMetadataObjectRelSQLProviderFactory.java b/...rg/apache/gravitino/storage/relational/mapper/TagMetadataObjectRelSQLProviderFactory.java
@@ -22,7 +22,8 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.gravitino.storage.relational.JDBCBackend.JDBCBackendType;
-import org.apache.gravitino.storage.relational.mapper.postgresql.TagMetadataObjectRelPostgreSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.TagMetadataObjectRelBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.postgresql.TagMetadataObjectRelPostgreSQLProvider;
 import org.apache.gravitino.storage.relational.po.TagMetadataObjectRelPO;
 import org.apache.gravitino.storage.relational.session.SqlSessionFactoryHelper;
 import org.apache.ibatis.annotations.Param;

diff --git a/...main/java/org/apache/gravitino/storage/relational/mapper/TopicMetaSQLProviderFactory.java b/...main/java/org/apache/gravitino/storage/relational/mapper/TopicMetaSQLProviderFactory.java
@@ -22,7 +22,8 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.apache.gravitino.storage.relational.JDBCBackend.JDBCBackendType;
-import org.apache.gravitino.storage.relational.mapper.postgresql.TopicMetaPostgreSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.TopicMetaBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.postgresql.TopicMetaPostgreSQLProvider;
 import org.apache.gravitino.storage.relational.po.TopicPO;
 import org.apache.gravitino.storage.relational.session.SqlSessionFactoryHelper;
 import org.apache.ibatis.annotations.Param;

diff --git a/.../main/java/org/apache/gravitino/storage/relational/mapper/UserMetaSQLProviderFactory.java b/.../main/java/org/apache/gravitino/storage/relational/mapper/UserMetaSQLProviderFactory.java
@@ -22,8 +22,9 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.apache.gravitino.storage.relational.JDBCBackend.JDBCBackendType;
-import org.apache.gravitino.storage.relational.mapper.h2.UserMetaH2Provider;
-import org.apache.gravitino.storage.relational.mapper.postgresql.UserMetaPostgreSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.UserMetaBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.h2.UserMetaH2Provider;
+import org.apache.gravitino.storage.relational.mapper.provider.postgresql.UserMetaPostgreSQLProvider;
 import org.apache.gravitino.storage.relational.po.UserPO;
 import org.apache.gravitino.storage.relational.session.SqlSessionFactoryHelper;
 import org.apache.ibatis.annotations.Param;

diff --git a/...in/java/org/apache/gravitino/storage/relational/mapper/UserRoleRelSQLProviderFactory.java b/...in/java/org/apache/gravitino/storage/relational/mapper/UserRoleRelSQLProviderFactory.java
@@ -23,7 +23,8 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.gravitino.storage.relational.JDBCBackend.JDBCBackendType;
-import org.apache.gravitino.storage.relational.mapper.postgresql.UserRoleRelPostgreSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.UserRoleRelBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.postgresql.UserRoleRelPostgreSQLProvider;
 import org.apache.gravitino.storage.relational.po.UserRoleRelPO;
 import org.apache.gravitino.storage.relational.session.SqlSessionFactoryHelper;
 import org.apache.ibatis.annotations.Param;

diff --git a/...al/mapper/CatalogMetaBaseSQLProvider.java → ...ider/base/CatalogMetaBaseSQLProvider.java b/...al/mapper/CatalogMetaBaseSQLProvider.java → ...ider/base/CatalogMetaBaseSQLProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.gravitino.storage.relational.mapper;
+package org.apache.gravitino.storage.relational.mapper.provider.base;
 
 import static org.apache.gravitino.storage.relational.mapper.CatalogMetaMapper.TABLE_NAME;
 

diff --git a/...al/mapper/FilesetMetaBaseSQLProvider.java → ...ider/base/FilesetMetaBaseSQLProvider.java b/...al/mapper/FilesetMetaBaseSQLProvider.java → ...ider/base/FilesetMetaBaseSQLProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.gravitino.storage.relational.mapper;
+package org.apache.gravitino.storage.relational.mapper.provider.base;
 
 import static org.apache.gravitino.storage.relational.mapper.FilesetMetaMapper.META_TABLE_NAME;
 import static org.apache.gravitino.storage.relational.mapper.FilesetMetaMapper.VERSION_TABLE_NAME;

diff --git a/...mapper/FilesetVersionBaseSQLProvider.java → ...r/base/FilesetVersionBaseSQLProvider.java b/...mapper/FilesetVersionBaseSQLProvider.java → ...r/base/FilesetVersionBaseSQLProvider.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.storage.relational.mapper;
+package org.apache.gravitino.storage.relational.mapper.provider.base;
 
 import static org.apache.gravitino.storage.relational.mapper.FilesetVersionMapper.VERSION_TABLE_NAME;
 

diff --git a/...onal/mapper/GroupMetaBaseSQLProvider.java → ...ovider/base/GroupMetaBaseSQLProvider.java b/...onal/mapper/GroupMetaBaseSQLProvider.java → ...ovider/base/GroupMetaBaseSQLProvider.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.storage.relational.mapper;
+package org.apache.gravitino.storage.relational.mapper.provider.base;
 
 import static org.apache.gravitino.storage.relational.mapper.GroupMetaMapper.GROUP_TABLE_NAME;
 import static org.apache.gravitino.storage.relational.mapper.RoleMetaMapper.GROUP_ROLE_RELATION_TABLE_NAME;

diff --git a/...l/mapper/GroupRoleRelBaseSQLProvider.java → ...der/base/GroupRoleRelBaseSQLProvider.java b/...l/mapper/GroupRoleRelBaseSQLProvider.java → ...der/base/GroupRoleRelBaseSQLProvider.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.storage.relational.mapper;
+package org.apache.gravitino.storage.relational.mapper.provider.base;
 
 import static org.apache.gravitino.storage.relational.mapper.GroupRoleRelMapper.GROUP_ROLE_RELATION_TABLE_NAME;
 import static org.apache.gravitino.storage.relational.mapper.GroupRoleRelMapper.GROUP_TABLE_NAME;

diff --git a/...l/mapper/MetalakeMetaBaseSQLProvider.java → ...der/base/MetalakeMetaBaseSQLProvider.java b/...l/mapper/MetalakeMetaBaseSQLProvider.java → ...der/base/MetalakeMetaBaseSQLProvider.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.storage.relational.mapper;
+package org.apache.gravitino.storage.relational.mapper.provider.base;
 
 import static org.apache.gravitino.storage.relational.mapper.MetalakeMetaMapper.TABLE_NAME;
 

diff --git a/...onal/mapper/OwnerMetaBaseSQLProvider.java → ...ovider/base/OwnerMetaBaseSQLProvider.java b/...onal/mapper/OwnerMetaBaseSQLProvider.java → ...ovider/base/OwnerMetaBaseSQLProvider.java
@@ -16,10 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.storage.relational.mapper;
+package org.apache.gravitino.storage.relational.mapper.provider.base;
 
 import static org.apache.gravitino.storage.relational.mapper.OwnerMetaMapper.OWNER_TABLE_NAME;
 
+import org.apache.gravitino.storage.relational.mapper.CatalogMetaMapper;
+import org.apache.gravitino.storage.relational.mapper.FilesetMetaMapper;
+import org.apache.gravitino.storage.relational.mapper.GroupMetaMapper;
+import org.apache.gravitino.storage.relational.mapper.SchemaMetaMapper;
+import org.apache.gravitino.storage.relational.mapper.TableMetaMapper;
+import org.apache.gravitino.storage.relational.mapper.TopicMetaMapper;
+import org.apache.gravitino.storage.relational.mapper.UserMetaMapper;
 import org.apache.gravitino.storage.relational.po.OwnerRelPO;
 import org.apache.ibatis.annotations.Param;
 

diff --git a/...ional/mapper/RoleMetaBaseSQLProvider.java → ...rovider/base/RoleMetaBaseSQLProvider.java b/...ional/mapper/RoleMetaBaseSQLProvider.java → ...rovider/base/RoleMetaBaseSQLProvider.java
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.storage.relational.mapper;
+package org.apache.gravitino.storage.relational.mapper.provider.base;
 
 import static org.apache.gravitino.storage.relational.mapper.RoleMetaMapper.GROUP_ROLE_RELATION_TABLE_NAME;
 import static org.apache.gravitino.storage.relational.mapper.RoleMetaMapper.ROLE_TABLE_NAME;
 import static org.apache.gravitino.storage.relational.mapper.RoleMetaMapper.USER_ROLE_RELATION_TABLE_NAME;
 
+import org.apache.gravitino.storage.relational.mapper.SecurableObjectMapper;
 import org.apache.gravitino.storage.relational.po.RolePO;
 import org.apache.ibatis.annotations.Param;
 

diff --git a/...nal/mapper/SchemaMetaBaseSQLProvider.java → ...vider/base/SchemaMetaBaseSQLProvider.java b/...nal/mapper/SchemaMetaBaseSQLProvider.java → ...vider/base/SchemaMetaBaseSQLProvider.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.storage.relational.mapper;
+package org.apache.gravitino.storage.relational.mapper.provider.base;
 
 import static org.apache.gravitino.storage.relational.mapper.SchemaMetaMapper.TABLE_NAME;
 

diff --git a/...apper/SecurableObjectBaseSQLProvider.java → .../base/SecurableObjectBaseSQLProvider.java b/...apper/SecurableObjectBaseSQLProvider.java → .../base/SecurableObjectBaseSQLProvider.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.storage.relational.mapper;
+package org.apache.gravitino.storage.relational.mapper.provider.base;
 
 import static org.apache.gravitino.storage.relational.mapper.SecurableObjectMapper.ROLE_TABLE_NAME;
 import static org.apache.gravitino.storage.relational.mapper.SecurableObjectMapper.SECURABLE_OBJECT_TABLE_NAME;

diff --git a/...onal/mapper/TableMetaBaseSQLProvider.java → ...ovider/base/TableMetaBaseSQLProvider.java b/...onal/mapper/TableMetaBaseSQLProvider.java → ...ovider/base/TableMetaBaseSQLProvider.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.storage.relational.mapper;
+package org.apache.gravitino.storage.relational.mapper.provider.base;
 
 import static org.apache.gravitino.storage.relational.mapper.TableMetaMapper.TABLE_NAME;
 

diff --git a/...tional/mapper/TagMetaBaseSQLProvider.java → ...provider/base/TagMetaBaseSQLProvider.java b/...tional/mapper/TagMetaBaseSQLProvider.java → ...provider/base/TagMetaBaseSQLProvider.java
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.storage.relational.mapper;
+package org.apache.gravitino.storage.relational.mapper.provider.base;
 
 import static org.apache.gravitino.storage.relational.mapper.TagMetaMapper.TAG_TABLE_NAME;
 
 import java.util.List;
+import org.apache.gravitino.storage.relational.mapper.MetalakeMetaMapper;
 import org.apache.gravitino.storage.relational.po.TagPO;
 import org.apache.ibatis.annotations.Param;
 

diff --git a/.../TagMetadataObjectRelBaseSQLProvider.java → .../TagMetadataObjectRelBaseSQLProvider.java b/.../TagMetadataObjectRelBaseSQLProvider.java → .../TagMetadataObjectRelBaseSQLProvider.java
@@ -16,11 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.storage.relational.mapper;
+package org.apache.gravitino.storage.relational.mapper.provider.base;
 
 import static org.apache.gravitino.storage.relational.mapper.TagMetadataObjectRelMapper.TAG_METADATA_OBJECT_RELATION_TABLE_NAME;
 
 import java.util.List;
+import org.apache.gravitino.storage.relational.mapper.MetalakeMetaMapper;
+import org.apache.gravitino.storage.relational.mapper.TagMetaMapper;
 import org.apache.gravitino.storage.relational.po.TagMetadataObjectRelPO;
 import org.apache.ibatis.annotations.Param;
 

diff --git a/...onal/mapper/TopicMetaBaseSQLProvider.java → ...ovider/base/TopicMetaBaseSQLProvider.java b/...onal/mapper/TopicMetaBaseSQLProvider.java → ...ovider/base/TopicMetaBaseSQLProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.gravitino.storage.relational.mapper;
+package org.apache.gravitino.storage.relational.mapper.provider.base;
 
 import static org.apache.gravitino.storage.relational.mapper.TopicMetaMapper.TABLE_NAME;
 

diff --git a/...ional/mapper/UserMetaBaseSQLProvider.java → ...rovider/base/UserMetaBaseSQLProvider.java b/...ional/mapper/UserMetaBaseSQLProvider.java → ...rovider/base/UserMetaBaseSQLProvider.java
@@ -17,12 +17,13 @@
  * under the License.
  */
 
-package org.apache.gravitino.storage.relational.mapper;
+package org.apache.gravitino.storage.relational.mapper.provider.base;
 
 import static org.apache.gravitino.storage.relational.mapper.RoleMetaMapper.ROLE_TABLE_NAME;
 import static org.apache.gravitino.storage.relational.mapper.UserMetaMapper.USER_ROLE_RELATION_TABLE_NAME;
 import static org.apache.gravitino.storage.relational.mapper.UserRoleRelMapper.USER_TABLE_NAME;
 
+import org.apache.gravitino.storage.relational.mapper.MetalakeMetaMapper;
 import org.apache.gravitino.storage.relational.po.UserPO;
 import org.apache.ibatis.annotations.Param;
 

diff --git a/...al/mapper/UserRoleRelBaseSQLProvider.java → ...ider/base/UserRoleRelBaseSQLProvider.java b/...al/mapper/UserRoleRelBaseSQLProvider.java → ...ider/base/UserRoleRelBaseSQLProvider.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.gravitino.storage.relational.mapper;
+package org.apache.gravitino.storage.relational.mapper.provider.base;
 
 import static org.apache.gravitino.storage.relational.mapper.UserRoleRelMapper.USER_ROLE_RELATION_TABLE_NAME;
 import static org.apache.gravitino.storage.relational.mapper.UserRoleRelMapper.USER_TABLE_NAME;

diff --git a/...ational/mapper/h2/UserMetaH2Provider.java → ...apper/provider/h2/UserMetaH2Provider.java b/...ational/mapper/h2/UserMetaH2Provider.java → ...apper/provider/h2/UserMetaH2Provider.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.storage.relational.mapper.h2;
+package org.apache.gravitino.storage.relational.mapper.provider.h2;
 
 import static org.apache.gravitino.storage.relational.mapper.RoleMetaMapper.ROLE_TABLE_NAME;
 import static org.apache.gravitino.storage.relational.mapper.UserMetaMapper.USER_ROLE_RELATION_TABLE_NAME;
 import static org.apache.gravitino.storage.relational.mapper.UserRoleRelMapper.USER_TABLE_NAME;
 
-import org.apache.gravitino.storage.relational.mapper.UserMetaBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.UserMetaBaseSQLProvider;
 import org.apache.ibatis.annotations.Param;
 
 public class UserMetaH2Provider extends UserMetaBaseSQLProvider {

diff --git a/...gresql/CatalogMetaPostgreSQLProvider.java → ...gresql/CatalogMetaPostgreSQLProvider.java b/...gresql/CatalogMetaPostgreSQLProvider.java → ...gresql/CatalogMetaPostgreSQLProvider.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.storage.relational.mapper.postgresql;
+package org.apache.gravitino.storage.relational.mapper.provider.postgresql;
 
 import static org.apache.gravitino.storage.relational.mapper.CatalogMetaMapper.TABLE_NAME;
 
-import org.apache.gravitino.storage.relational.mapper.CatalogMetaBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.CatalogMetaBaseSQLProvider;
 import org.apache.gravitino.storage.relational.po.CatalogPO;
 import org.apache.ibatis.annotations.Param;
 

diff --git a/...gresql/FilesetMetaPostgreSQLProvider.java → ...gresql/FilesetMetaPostgreSQLProvider.java b/...gresql/FilesetMetaPostgreSQLProvider.java → ...gresql/FilesetMetaPostgreSQLProvider.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.gravitino.storage.relational.mapper.postgresql;
+package org.apache.gravitino.storage.relational.mapper.provider.postgresql;
 
 import static org.apache.gravitino.storage.relational.mapper.FilesetMetaMapper.META_TABLE_NAME;
 
-import org.apache.gravitino.storage.relational.mapper.FilesetMetaBaseSQLProvider;
+import org.apache.gravitino.storage.relational.mapper.provider.base.FilesetMetaBaseSQLProvider;
 import org.apache.gravitino.storage.relational.po.FilesetPO;
 
 public class FilesetMetaPostgreSQLProvider extends FilesetMetaBaseSQLProvider {