apache · adutra · Jun 15, 2026 · Jun 12, 2026
diff --git a/...e/src/main/java/org/apache/polaris/persistence/nosql/metastore/NoSqlMetaStoreManager.java b/...e/src/main/java/org/apache/polaris/persistence/nosql/metastore/NoSqlMetaStoreManager.java
@@ -34,6 +34,7 @@
 import java.util.function.Supplier;
 import org.apache.polaris.core.PolarisCallContext;
 import org.apache.polaris.core.config.FeatureConfiguration;
+import org.apache.polaris.core.entity.EventEntity;
 import org.apache.polaris.core.entity.LocationBasedEntity;
 import org.apache.polaris.core.entity.PolarisBaseEntity;
 import org.apache.polaris.core.entity.PolarisEntity;
@@ -42,7 +43,6 @@
 import org.apache.polaris.core.entity.PolarisEntityId;
 import org.apache.polaris.core.entity.PolarisEntitySubType;
 import org.apache.polaris.core.entity.PolarisEntityType;
-import org.apache.polaris.core.entity.PolarisEvent;
 import org.apache.polaris.core.entity.PolarisGrantRecord;
 import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
 import org.apache.polaris.core.entity.PolarisPrivilege;
@@ -687,7 +687,7 @@ public boolean requiresEntityReload() {
 
   @Override
   public void writeEvents(
-      @NonNull PolarisCallContext callCtx, @NonNull List<PolarisEvent> polarisEvents) {
+      @NonNull PolarisCallContext callCtx, @NonNull List<EventEntity> polarisEvents) {
     throw new UnsupportedOperationException("Events not supported in NoSQL persistence");
   }
 }
diff --git a/...ain/java/org/apache/polaris/persistence/nosql/metastore/NonFunctionalBasePersistence.java b/...ain/java/org/apache/polaris/persistence/nosql/metastore/NonFunctionalBasePersistence.java
@@ -24,13 +24,13 @@
 import java.util.function.Predicate;
 import org.apache.polaris.core.PolarisCallContext;
 import org.apache.polaris.core.entity.EntityNameLookupRecord;
+import org.apache.polaris.core.entity.EventEntity;
 import org.apache.polaris.core.entity.PolarisBaseEntity;
 import org.apache.polaris.core.entity.PolarisChangeTrackingVersions;
 import org.apache.polaris.core.entity.PolarisEntityCore;
 import org.apache.polaris.core.entity.PolarisEntityId;
 import org.apache.polaris.core.entity.PolarisEntitySubType;
 import org.apache.polaris.core.entity.PolarisEntityType;
-import org.apache.polaris.core.entity.PolarisEvent;
 import org.apache.polaris.core.entity.PolarisGrantRecord;
 import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
 import org.apache.polaris.core.persistence.BasePersistence;
@@ -329,7 +329,7 @@ public PolarisPrincipalSecrets storePrincipalSecrets(
   }
 
   @Override
-  public void writeEvents(@NonNull List<PolarisEvent> events) {
+  public void writeEvents(@NonNull List<EventEntity> events) {
     throw unimplemented();
   }
 

diff --git a/...src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcBasePersistenceImpl.java b/...src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcBasePersistenceImpl.java
@@ -38,6 +38,7 @@
 import org.apache.polaris.core.PolarisCallContext;
 import org.apache.polaris.core.PolarisDiagnostics;
 import org.apache.polaris.core.entity.EntityNameLookupRecord;
+import org.apache.polaris.core.entity.EventEntity;
 import org.apache.polaris.core.entity.LocationBasedEntity;
 import org.apache.polaris.core.entity.PolarisBaseEntity;
 import org.apache.polaris.core.entity.PolarisChangeTrackingVersions;
@@ -47,7 +48,6 @@
 import org.apache.polaris.core.entity.PolarisEntitySubType;
 import org.apache.polaris.core.entity.PolarisEntityType;
 import org.apache.polaris.core.entity.PolarisEntityUtils;
-import org.apache.polaris.core.entity.PolarisEvent;
 import org.apache.polaris.core.entity.PolarisGrantRecord;
 import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
 import org.apache.polaris.core.exceptions.AlreadyExistsException;
@@ -277,7 +277,7 @@ public void writeToGrantRecords(
   }
 
   @Override
-  public void writeEvents(@NonNull List<PolarisEvent> events) {
+  public void writeEvents(@NonNull List<EventEntity> events) {
     if (events.isEmpty()) {
       return; // or throw if empty list is invalid
     }
@@ -301,7 +301,7 @@ public void writeEvents(@NonNull List<PolarisEvent> events) {
 
       // Process remaining events and verify SQL consistency
       for (int i = 1; i < events.size(); i++) {
-        PolarisEvent event = events.get(i);
+        EventEntity event = events.get(i);
         PreparedQuery pq =
             QueryGenerator.generateInsertQuery(
                 ModelEvent.ALL_COLUMNS,

diff --git a/...-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/models/ModelEvent.java b/...-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/models/ModelEvent.java
@@ -24,13 +24,13 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.polaris.core.entity.PolarisEvent;
+import org.apache.polaris.core.entity.EventEntity;
 import org.apache.polaris.immutables.PolarisImmutable;
 import org.apache.polaris.persistence.relational.jdbc.DatabaseType;
 import org.jspecify.annotations.Nullable;
 
 @PolarisImmutable
-public interface ModelEvent extends Converter<PolarisEvent> {
+public interface ModelEvent extends Converter<EventEntity> {
   String TABLE_NAME = "EVENTS";
 
   String CATALOG_ID = "catalog_id";
@@ -68,7 +68,7 @@ public interface ModelEvent extends Converter<PolarisEvent> {
           .eventType("")
           .timestampMs(0L)
           .principalName("")
-          .resourceType(PolarisEvent.ResourceType.CATALOG)
+          .resourceType(EventEntity.ResourceType.CATALOG)
           .resourceIdentifier("")
           .additionalProperties("")
           .build();
@@ -92,7 +92,7 @@ public interface ModelEvent extends Converter<PolarisEvent> {
   @Nullable String getPrincipalName();
 
   // Enum that states the type of resource was being operated on
-  PolarisEvent.ResourceType getResourceType();
+  EventEntity.ResourceType getResourceType();
 
   // Which resource was operated on
   String getResourceIdentifier();
@@ -101,7 +101,7 @@ public interface ModelEvent extends Converter<PolarisEvent> {
   String getAdditionalProperties();
 
   @Override
-  default PolarisEvent fromResultSet(ResultSet rs) throws SQLException {
+  default EventEntity fromResultSet(ResultSet rs) throws SQLException {
     var modelEvent =
         ImmutableModelEvent.builder()
             .catalogId(rs.getString(CATALOG_ID))
@@ -110,7 +110,7 @@ default PolarisEvent fromResultSet(ResultSet rs) throws SQLException {
             .eventType(rs.getString(EVENT_TYPE))
             .timestampMs(rs.getLong(TIMESTAMP_MS))
             .principalName(rs.getString(PRINCIPAL_NAME))
-            .resourceType(PolarisEvent.ResourceType.valueOf(rs.getString(RESOURCE_TYPE)))
+            .resourceType(EventEntity.ResourceType.valueOf(rs.getString(RESOURCE_TYPE)))
             .resourceIdentifier(rs.getString(RESOURCE_IDENTIFIER))
             .additionalProperties(rs.getString(ADDITIONAL_PROPERTIES))
             .build();
@@ -136,7 +136,7 @@ default Map<String, Object> toMap(DatabaseType databaseType) {
     return map;
   }
 
-  static ModelEvent fromEvent(PolarisEvent event) {
+  static ModelEvent fromEvent(EventEntity event) {
     if (event == null) return null;
 
     return ImmutableModelEvent.builder()
@@ -152,11 +152,11 @@ static ModelEvent fromEvent(PolarisEvent event) {
         .build();
   }
 
-  static PolarisEvent toEvent(ModelEvent model) {
+  static EventEntity toEvent(ModelEvent model) {
     if (model == null) return null;
 
-    PolarisEvent polarisEvent =
-        new PolarisEvent(
+    EventEntity polarisEvent =
+        new EventEntity(
             model.getCatalogId(),
             model.getEventId(),
             model.getRequestId(),

diff --git a/...rc/test/java/org/apache/polaris/persistence/relational/jdbc/DatasourceOperationsTest.java b/...rc/test/java/org/apache/polaris/persistence/relational/jdbc/DatasourceOperationsTest.java
@@ -38,7 +38,7 @@
 import java.util.List;
 import java.util.Optional;
 import javax.sql.DataSource;
-import org.apache.polaris.core.entity.PolarisEvent;
+import org.apache.polaris.core.entity.EventEntity;
 import org.apache.polaris.persistence.relational.jdbc.DatasourceOperations.Operation;
 import org.apache.polaris.persistence.relational.jdbc.models.ImmutableModelEvent;
 import org.apache.polaris.persistence.relational.jdbc.models.ModelEntity;
@@ -108,7 +108,7 @@ void executeBatchUpdate_success() throws Exception {
     for (int i = 0; i < 1000; i++) {
       ModelEvent modelEvent =
           ImmutableModelEvent.builder()
-              .resourceType(PolarisEvent.ResourceType.CATALOG)
+              .resourceType(EventEntity.ResourceType.CATALOG)
               .resourceIdentifier("catalog_" + i)
               .catalogId("catalog_" + i)
               .eventId("event_" + i)

diff --git a/...c/src/test/java/org/apache/polaris/persistence/relational/jdbc/models/ModelEventTest.java b/...c/src/test/java/org/apache/polaris/persistence/relational/jdbc/models/ModelEventTest.java
@@ -36,7 +36,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Map;
-import org.apache.polaris.core.entity.PolarisEvent;
+import org.apache.polaris.core.entity.EventEntity;
 import org.apache.polaris.persistence.relational.jdbc.DatabaseType;
 import org.junit.jupiter.api.Test;
 import org.postgresql.util.PGobject;
@@ -49,8 +49,7 @@ public class ModelEventTest {
   private static final String TEST_EVENT_TYPE = "CREATE";
   private static final long TEST_TIMESTAMP_MS = 1234567890L;
   private static final String TEST_USER = "test-user";
-  private static final PolarisEvent.ResourceType TEST_RESOURCE_TYPE =
-      PolarisEvent.ResourceType.TABLE;
+  private static final EventEntity.ResourceType TEST_RESOURCE_TYPE = EventEntity.ResourceType.TABLE;
   private static final String TEST_RESOURCE_TYPE_STRING = "TABLE";
   private static final String TEST_RESOURCE_IDENTIFIER = "test-table";
   private static final String EMPTY_JSON = "{}";
@@ -71,7 +70,7 @@ public void testFromResultSet() throws SQLException {
     when(mockResultSet.getString(ADDITIONAL_PROPERTIES)).thenReturn(EMPTY_JSON);
 
     // Act
-    PolarisEvent result = ModelEvent.CONVERTER.fromResultSet(mockResultSet);
+    EventEntity result = ModelEvent.CONVERTER.fromResultSet(mockResultSet);
 
     // Assert
     assertEquals(TEST_CATALOG_ID, result.getCatalogId());
@@ -163,8 +162,8 @@ public void testFromEventWithNullInput() {
   @Test
   public void testFromEvent() {
     // Arrange
-    PolarisEvent polarisEvent =
-        new PolarisEvent(
+    EventEntity polarisEvent =
+        new EventEntity(
             TEST_CATALOG_ID,
             TEST_EVENT_ID,
             TEST_REQUEST_ID,
@@ -207,7 +206,7 @@ public void testToEvent() {
             .build();
 
     // Act
-    PolarisEvent result = ModelEvent.toEvent(modelEvent);
+    EventEntity result = ModelEvent.toEvent(modelEvent);
 
     // Assert
     assertEquals(TEST_CATALOG_ID, result.getCatalogId());

diff --git a/...che/polaris/core/entity/PolarisEvent.java → ...ache/polaris/core/entity/EventEntity.java b/...che/polaris/core/entity/PolarisEvent.java → ...ache/polaris/core/entity/EventEntity.java
@@ -27,7 +27,7 @@
 import java.util.Map;
 import org.jspecify.annotations.Nullable;
 
-public class PolarisEvent {
+public class EventEntity {
   public static final String EMPTY_MAP_STRING = "{}";
 
   /**
@@ -118,7 +118,7 @@ public String getAdditionalProperties() {
     return additionalProperties != null ? additionalProperties : EMPTY_MAP_STRING;
   }
 
-  public PolarisEvent(
+  public EventEntity(
       String catalogId,
       String id,
       @Nullable String requestId,

diff --git a/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEventManager.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEventManager.java
@@ -26,7 +26,7 @@
 
 public interface PolarisEventManager {
   default void writeEvents(
-      @NonNull PolarisCallContext callCtx, @NonNull List<PolarisEvent> polarisEvents) {
+      @NonNull PolarisCallContext callCtx, @NonNull List<EventEntity> polarisEvents) {
     BasePersistence ms = callCtx.getMetaStore();
     ms.writeEvents(polarisEvents);
   }

diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/BasePersistence.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/BasePersistence.java
@@ -24,6 +24,7 @@
 import java.util.function.Predicate;
 import org.apache.polaris.core.PolarisCallContext;
 import org.apache.polaris.core.entity.EntityNameLookupRecord;
+import org.apache.polaris.core.entity.EventEntity;
 import org.apache.polaris.core.entity.LocationBasedEntity;
 import org.apache.polaris.core.entity.PolarisBaseEntity;
 import org.apache.polaris.core.entity.PolarisChangeTrackingVersions;
@@ -32,7 +33,6 @@
 import org.apache.polaris.core.entity.PolarisEntityId;
 import org.apache.polaris.core.entity.PolarisEntitySubType;
 import org.apache.polaris.core.entity.PolarisEntityType;
-import org.apache.polaris.core.entity.PolarisEvent;
 import org.apache.polaris.core.entity.PolarisGrantRecord;
 import org.apache.polaris.core.persistence.pagination.Page;
 import org.apache.polaris.core.persistence.pagination.PageToken;
@@ -148,7 +148,7 @@ void writeToGrantRecords(
    *
    * @param events events to persist
    */
-  void writeEvents(@NonNull List<PolarisEvent> events);
+  void writeEvents(@NonNull List<EventEntity> events);
 
   /**
    * Delete this entity from the meta store.

diff --git a/...c/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java b/...c/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java
@@ -25,14 +25,14 @@
 import java.util.Optional;
 import org.apache.polaris.core.PolarisCallContext;
 import org.apache.polaris.core.PolarisDiagnostics;
+import org.apache.polaris.core.entity.EventEntity;
 import org.apache.polaris.core.entity.LocationBasedEntity;
 import org.apache.polaris.core.entity.PolarisBaseEntity;
 import org.apache.polaris.core.entity.PolarisEntity;
 import org.apache.polaris.core.entity.PolarisEntityCore;
 import org.apache.polaris.core.entity.PolarisEntityId;
 import org.apache.polaris.core.entity.PolarisEntitySubType;
 import org.apache.polaris.core.entity.PolarisEntityType;
-import org.apache.polaris.core.entity.PolarisEvent;
 import org.apache.polaris.core.entity.PolarisPrivilege;
 import org.apache.polaris.core.entity.PrincipalEntity;
 import org.apache.polaris.core.persistence.dao.entity.BaseResult;
@@ -396,7 +396,7 @@ Optional<Optional<String>> hasOverlappingSiblings(
 
   @Override
   public void writeEvents(
-      @NonNull PolarisCallContext callCtx, @NonNull List<PolarisEvent> polarisEvents) {
+      @NonNull PolarisCallContext callCtx, @NonNull List<EventEntity> polarisEvents) {
     throw illegalMethodError("writeEvents");
   }
 }
diff --git a/...a/org/apache/polaris/core/persistence/transactional/AbstractTransactionalPersistence.java b/...a/org/apache/polaris/core/persistence/transactional/AbstractTransactionalPersistence.java
@@ -25,14 +25,14 @@
 import org.apache.polaris.core.PolarisCallContext;
 import org.apache.polaris.core.PolarisDiagnostics;
 import org.apache.polaris.core.entity.EntityNameLookupRecord;
+import org.apache.polaris.core.entity.EventEntity;
 import org.apache.polaris.core.entity.PolarisBaseEntity;
 import org.apache.polaris.core.entity.PolarisChangeTrackingVersions;
 import org.apache.polaris.core.entity.PolarisEntitiesActiveKey;
 import org.apache.polaris.core.entity.PolarisEntityCore;
 import org.apache.polaris.core.entity.PolarisEntityId;
 import org.apache.polaris.core.entity.PolarisEntitySubType;
 import org.apache.polaris.core.entity.PolarisEntityType;
-import org.apache.polaris.core.entity.PolarisEvent;
 import org.apache.polaris.core.entity.PolarisGrantRecord;
 import org.apache.polaris.core.entity.PolarisPrincipalSecrets;
 import org.apache.polaris.core.persistence.EntityAlreadyExistsException;
@@ -275,7 +275,7 @@ public void writeToGrantRecords(
   }
 
   @Override
-  public void writeEvents(@NonNull List<PolarisEvent> events) {
+  public void writeEvents(@NonNull List<EventEntity> events) {
     throw new UnsupportedOperationException("Not implemented for transactional persistence.");
   }
 

diff --git a/...ain/java/org/apache/polaris/service/events/listeners/PolarisPersistenceEventListener.java b/...ain/java/org/apache/polaris/service/events/listeners/PolarisPersistenceEventListener.java
@@ -30,7 +30,8 @@
 import org.apache.iceberg.rest.requests.RenameTableRequest;
 import org.apache.iceberg.rest.responses.LoadTableResponse;
 import org.apache.polaris.core.auth.PolarisPrincipal;
-import org.apache.polaris.core.entity.PolarisEvent.ResourceType;
+import org.apache.polaris.core.entity.EventEntity;
+import org.apache.polaris.core.entity.EventEntity.ResourceType;
 import org.apache.polaris.service.events.AttributeKey;
 import org.apache.polaris.service.events.EventAttributeMap;
 import org.apache.polaris.service.events.EventAttributes;
@@ -47,8 +48,8 @@ public void onEvent(PolarisEvent event) {
     ResourceType resourceType = resolveResourceType(event.type());
     String resourceIdentifier = resolveResourceIdentifier(event, resourceType, catalogName);
 
-    org.apache.polaris.core.entity.PolarisEvent polarisEvent =
-        new org.apache.polaris.core.entity.PolarisEvent(
+    EventEntity polarisEvent =
+        new EventEntity(
             catalogName,
             event.metadata().eventId().toString(),
             event.metadata().requestId().orElse(null),
@@ -67,10 +68,7 @@ public void onEvent(PolarisEvent event) {
   }
 
   private static String resolveCatalogName(PolarisEvent event) {
-    return event
-        .attributes()
-        .get(EventAttributes.CATALOG_NAME)
-        .orElse(org.apache.polaris.core.entity.PolarisEvent.REALM_SCOPED);
+    return event.attributes().get(EventAttributes.CATALOG_NAME).orElse(EventEntity.REALM_SCOPED);
   }
 
   /**
@@ -236,7 +234,7 @@ private static String resolveRealmResourceIdentifier(PolarisEvent event) {
   }
 
   private static String fallbackResourceIdentifier(PolarisEvent event, String catalogName) {
-    if (!org.apache.polaris.core.entity.PolarisEvent.REALM_SCOPED.equals(catalogName)) {
+    if (!EventEntity.REALM_SCOPED.equals(catalogName)) {
       return catalogName;
     }
     return event.type().name();
@@ -307,6 +305,5 @@ private static Map<String, String> pruneTableMetadata(TableMetadata metadata) {
     return summary;
   }
 
-  protected abstract void processEvent(
-      String realmId, org.apache.polaris.core.entity.PolarisEvent event);
+  protected abstract void processEvent(String realmId, EventEntity event);
 }