This is an automated email from the ASF dual-hosted git repository. yuqi1129 pushed a commit to branch feat/entity-change-log in repository https://gitbox.apache.org/repos/asf/gravitino.git
commit 82aeca251ddec2d17ec66a71452bb78eda1a9710 Author: yuqi <[email protected]> AuthorDate: Fri May 8 15:35:54 2026 +0800 fix(cache): align EntityChangeLogMapper method names with @Provider method= annotations selectChanges -> selectEntityChanges insertChange -> insertEntityChange pruneOldEntries -> pruneOldEntityChanges Match the SQL provider method names already declared in the annotations. Co-Authored-By: Claude Opus 4.7 <[email protected]> --- .../relational/mapper/EntityChangeLogMapper.java | 6 +++--- .../relational/service/CatalogMetaService.java | 6 +++--- .../relational/service/FilesetMetaService.java | 6 +++--- .../relational/service/MetalakeMetaService.java | 6 +++--- .../relational/service/ModelMetaService.java | 4 ++-- .../relational/service/SchemaMetaService.java | 6 +++--- .../relational/service/TableMetaService.java | 4 ++-- .../relational/service/TopicMetaService.java | 4 ++-- .../relational/service/ViewMetaService.java | 4 ++-- .../provider/base/TestEntityChangeLogMapper.java | 23 +++++++++++----------- .../service/TestEntityChangeLogService.java | 2 +- .../relational/service/TestTableMetaService.java | 2 +- 12 files changed, 37 insertions(+), 36 deletions(-) diff --git a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/EntityChangeLogMapper.java b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/EntityChangeLogMapper.java index fb008a0357..4f6193d07f 100644 --- a/core/src/main/java/org/apache/gravitino/storage/relational/mapper/EntityChangeLogMapper.java +++ b/core/src/main/java/org/apache/gravitino/storage/relational/mapper/EntityChangeLogMapper.java @@ -38,16 +38,16 @@ public interface EntityChangeLogMapper { String ENTITY_CHANGE_LOG_TABLE_NAME = "entity_change_log"; @SelectProvider(type = EntityChangeLogSQLProviderFactory.class, method = "selectEntityChanges") - List<EntityChangeRecord> selectChanges( + List<EntityChangeRecord> selectEntityChanges( @Param("createdAtFrom") long createdAtFrom, @Param("maxRows") int maxRows); @InsertProvider(type = EntityChangeLogSQLProviderFactory.class, method = "insertEntityChange") - void insertChange( + void insertEntityChange( @Param("metalakeName") String metalakeName, @Param("entityType") String entityType, @Param("fullName") String fullName, @Param("operateType") OperateType operateType); @DeleteProvider(type = EntityChangeLogSQLProviderFactory.class, method = "pruneOldEntityChanges") - void pruneOldEntries(@Param("before") long before); + void pruneOldEntityChanges(@Param("before") long before); } diff --git a/core/src/main/java/org/apache/gravitino/storage/relational/service/CatalogMetaService.java b/core/src/main/java/org/apache/gravitino/storage/relational/service/CatalogMetaService.java index 3dd056ea58..7b757c31da 100644 --- a/core/src/main/java/org/apache/gravitino/storage/relational/service/CatalogMetaService.java +++ b/core/src/main/java/org/apache/gravitino/storage/relational/service/CatalogMetaService.java @@ -245,7 +245,7 @@ public class CatalogMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( metalakeName, Entity.EntityType.CATALOG.name(), oldFullName, @@ -351,7 +351,7 @@ public class CatalogMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( metalakeName, Entity.EntityType.CATALOG.name(), NameIdentifierUtil.ofCatalog(metalakeName, catalogName).toString(), @@ -403,7 +403,7 @@ public class CatalogMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( metalakeName, Entity.EntityType.CATALOG.name(), NameIdentifierUtil.ofCatalog(metalakeName, catalogName).toString(), diff --git a/core/src/main/java/org/apache/gravitino/storage/relational/service/FilesetMetaService.java b/core/src/main/java/org/apache/gravitino/storage/relational/service/FilesetMetaService.java index 4bcacb7456..51291a387d 100644 --- a/core/src/main/java/org/apache/gravitino/storage/relational/service/FilesetMetaService.java +++ b/core/src/main/java/org/apache/gravitino/storage/relational/service/FilesetMetaService.java @@ -250,7 +250,7 @@ public class FilesetMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( metalakeName, Entity.EntityType.FILESET.name(), oldFullName, @@ -282,7 +282,7 @@ public class FilesetMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( metalakeName, Entity.EntityType.FILESET.name(), oldFullName, @@ -360,7 +360,7 @@ public class FilesetMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( metalakeName, Entity.EntityType.FILESET.name(), filesetFullName, diff --git a/core/src/main/java/org/apache/gravitino/storage/relational/service/MetalakeMetaService.java b/core/src/main/java/org/apache/gravitino/storage/relational/service/MetalakeMetaService.java index dbf75524e3..7acccc4f28 100644 --- a/core/src/main/java/org/apache/gravitino/storage/relational/service/MetalakeMetaService.java +++ b/core/src/main/java/org/apache/gravitino/storage/relational/service/MetalakeMetaService.java @@ -193,7 +193,7 @@ public class MetalakeMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( oldFullName, Entity.EntityType.METALAKE.name(), oldFullName, @@ -338,7 +338,7 @@ public class MetalakeMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( ident.name(), Entity.EntityType.METALAKE.name(), ident.name(), @@ -409,7 +409,7 @@ public class MetalakeMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( ident.name(), Entity.EntityType.METALAKE.name(), ident.name(), diff --git a/core/src/main/java/org/apache/gravitino/storage/relational/service/ModelMetaService.java b/core/src/main/java/org/apache/gravitino/storage/relational/service/ModelMetaService.java index 86346ab1ad..d492371024 100644 --- a/core/src/main/java/org/apache/gravitino/storage/relational/service/ModelMetaService.java +++ b/core/src/main/java/org/apache/gravitino/storage/relational/service/ModelMetaService.java @@ -188,7 +188,7 @@ public class ModelMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( metalakeName, Entity.EntityType.MODEL.name(), modelFullName, @@ -392,7 +392,7 @@ public class ModelMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( metalakeName, Entity.EntityType.MODEL.name(), oldFullName, diff --git a/core/src/main/java/org/apache/gravitino/storage/relational/service/SchemaMetaService.java b/core/src/main/java/org/apache/gravitino/storage/relational/service/SchemaMetaService.java index f2d9c1a358..8127ae4c11 100644 --- a/core/src/main/java/org/apache/gravitino/storage/relational/service/SchemaMetaService.java +++ b/core/src/main/java/org/apache/gravitino/storage/relational/service/SchemaMetaService.java @@ -220,7 +220,7 @@ public class SchemaMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( metalakeName, Entity.EntityType.SCHEMA.name(), oldFullName, @@ -322,7 +322,7 @@ public class SchemaMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( metalakeName, Entity.EntityType.SCHEMA.name(), schemaFullName, @@ -412,7 +412,7 @@ public class SchemaMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( metalakeName, Entity.EntityType.SCHEMA.name(), schemaFullName, diff --git a/core/src/main/java/org/apache/gravitino/storage/relational/service/TableMetaService.java b/core/src/main/java/org/apache/gravitino/storage/relational/service/TableMetaService.java index d4c431ee38..02c094a509 100644 --- a/core/src/main/java/org/apache/gravitino/storage/relational/service/TableMetaService.java +++ b/core/src/main/java/org/apache/gravitino/storage/relational/service/TableMetaService.java @@ -224,7 +224,7 @@ public class TableMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( metalakeName, Entity.EntityType.TABLE.name(), oldFullName, @@ -303,7 +303,7 @@ public class TableMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( metalakeName, Entity.EntityType.TABLE.name(), tableFullName, diff --git a/core/src/main/java/org/apache/gravitino/storage/relational/service/TopicMetaService.java b/core/src/main/java/org/apache/gravitino/storage/relational/service/TopicMetaService.java index 37bfa44653..fd0fbe60ea 100644 --- a/core/src/main/java/org/apache/gravitino/storage/relational/service/TopicMetaService.java +++ b/core/src/main/java/org/apache/gravitino/storage/relational/service/TopicMetaService.java @@ -137,7 +137,7 @@ public class TopicMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( metalakeName, Entity.EntityType.TOPIC.name(), oldFullName, @@ -336,7 +336,7 @@ public class TopicMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( metalakeName, Entity.EntityType.TOPIC.name(), topicFullName, diff --git a/core/src/main/java/org/apache/gravitino/storage/relational/service/ViewMetaService.java b/core/src/main/java/org/apache/gravitino/storage/relational/service/ViewMetaService.java index 3157694249..c65793abd2 100644 --- a/core/src/main/java/org/apache/gravitino/storage/relational/service/ViewMetaService.java +++ b/core/src/main/java/org/apache/gravitino/storage/relational/service/ViewMetaService.java @@ -181,7 +181,7 @@ public class ViewMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( metalakeName, Entity.EntityType.VIEW.name(), oldFullName, @@ -261,7 +261,7 @@ public class ViewMetaService { SessionUtils.doWithoutCommit( EntityChangeLogMapper.class, mapper -> - mapper.insertChange( + mapper.insertEntityChange( metalakeName, Entity.EntityType.VIEW.name(), viewFullName, diff --git a/core/src/test/java/org/apache/gravitino/storage/relational/mapper/provider/base/TestEntityChangeLogMapper.java b/core/src/test/java/org/apache/gravitino/storage/relational/mapper/provider/base/TestEntityChangeLogMapper.java index 2864c40538..55f80f1790 100644 --- a/core/src/test/java/org/apache/gravitino/storage/relational/mapper/provider/base/TestEntityChangeLogMapper.java +++ b/core/src/test/java/org/apache/gravitino/storage/relational/mapper/provider/base/TestEntityChangeLogMapper.java @@ -101,11 +101,12 @@ public class TestEntityChangeLogMapper { @Test void testEntityChangeLogInsertAndSelect() { long jvmBefore = System.currentTimeMillis(); - entityChangeLogMapper.insertChange( + entityChangeLogMapper.insertEntityChange( "metalake1", "TABLE", "metalake1.cat.schema.tbl", OperateType.ALTER); long jvmAfter = System.currentTimeMillis(); - List<EntityChangeRecord> records = entityChangeLogMapper.selectChanges(jvmBefore - 1000L, 10); + List<EntityChangeRecord> records = + entityChangeLogMapper.selectEntityChanges(jvmBefore - 1000L, 10); Assertions.assertEquals(1, records.size()); EntityChangeRecord record = records.get(0); Assertions.assertEquals("metalake1", record.getMetalakeName()); @@ -121,35 +122,35 @@ public class TestEntityChangeLogMapper { @Test void testEntityChangeLogPruneOldEntries() throws SQLException { - entityChangeLogMapper.insertChange( + entityChangeLogMapper.insertEntityChange( "metalake1", "SCHEMA", "metalake1.cat.schema", OperateType.INSERT); forceCreatedAt("metalake1.cat.schema", 1000L); - entityChangeLogMapper.insertChange( + entityChangeLogMapper.insertEntityChange( "metalake1", "TABLE", "metalake1.cat.schema.tbl", OperateType.DROP); long recent = - entityChangeLogMapper.selectChanges(0L, 100).stream() + entityChangeLogMapper.selectEntityChanges(0L, 100).stream() .filter(r -> r.getFullName().equals("metalake1.cat.schema.tbl")) .mapToLong(EntityChangeRecord::getCreatedAt) .findFirst() .orElseThrow(() -> new AssertionError("recent row missing")); - entityChangeLogMapper.pruneOldEntries(1001L); + entityChangeLogMapper.pruneOldEntityChanges(1001L); - List<EntityChangeRecord> after = entityChangeLogMapper.selectChanges(0L, 100); + List<EntityChangeRecord> after = entityChangeLogMapper.selectEntityChanges(0L, 100); Assertions.assertEquals(1, after.size()); Assertions.assertEquals(recent, after.get(0).getCreatedAt()); } @Test void testEntityChangeLogSameTimestampOrderedById() throws SQLException { - entityChangeLogMapper.insertChange("metalake1", "TABLE", "a", OperateType.INSERT); - entityChangeLogMapper.insertChange("metalake1", "TABLE", "b", OperateType.INSERT); - entityChangeLogMapper.insertChange("metalake1", "TABLE", "c", OperateType.INSERT); + entityChangeLogMapper.insertEntityChange("metalake1", "TABLE", "a", OperateType.INSERT); + entityChangeLogMapper.insertEntityChange("metalake1", "TABLE", "b", OperateType.INSERT); + entityChangeLogMapper.insertEntityChange("metalake1", "TABLE", "c", OperateType.INSERT); forceCreatedAt("a", 5_000_000L); forceCreatedAt("b", 5_000_000L); forceCreatedAt("c", 5_000_000L); - List<EntityChangeRecord> rows = entityChangeLogMapper.selectChanges(0L, 100); + List<EntityChangeRecord> rows = entityChangeLogMapper.selectEntityChanges(0L, 100); Assertions.assertEquals(3, rows.size()); Assertions.assertTrue(rows.get(0).getId() < rows.get(1).getId()); Assertions.assertTrue(rows.get(1).getId() < rows.get(2).getId()); diff --git a/core/src/test/java/org/apache/gravitino/storage/relational/service/TestEntityChangeLogService.java b/core/src/test/java/org/apache/gravitino/storage/relational/service/TestEntityChangeLogService.java index 023274dfd5..d605400f41 100644 --- a/core/src/test/java/org/apache/gravitino/storage/relational/service/TestEntityChangeLogService.java +++ b/core/src/test/java/org/apache/gravitino/storage/relational/service/TestEntityChangeLogService.java @@ -49,7 +49,7 @@ public class TestEntityChangeLogService extends TestJDBCBackend { private List<EntityChangeRecord> listEntityChanges(long createdAtFrom) { return SessionUtils.doWithCommitAndFetchResult( - EntityChangeLogMapper.class, mapper -> mapper.selectChanges(createdAtFrom, 100)); + EntityChangeLogMapper.class, mapper -> mapper.selectEntityChanges(createdAtFrom, 100)); } private void assertEntityChange( diff --git a/core/src/test/java/org/apache/gravitino/storage/relational/service/TestTableMetaService.java b/core/src/test/java/org/apache/gravitino/storage/relational/service/TestTableMetaService.java index 98321e6fce..6596b4af2c 100644 --- a/core/src/test/java/org/apache/gravitino/storage/relational/service/TestTableMetaService.java +++ b/core/src/test/java/org/apache/gravitino/storage/relational/service/TestTableMetaService.java @@ -71,7 +71,7 @@ public class TestTableMetaService extends TestJDBCBackend { private List<EntityChangeRecord> listEntityChanges(long createdAtFrom) { return SessionUtils.doWithCommitAndFetchResult( - EntityChangeLogMapper.class, mapper -> mapper.selectChanges(createdAtFrom, 100)); + EntityChangeLogMapper.class, mapper -> mapper.selectEntityChanges(createdAtFrom, 100)); } @TestTemplate
