From 16ed14bdd9f026103831055e8026ee237a440dcf Mon Sep 17 00:00:00 2001 From: adnanhemani Date: Mon, 6 Oct 2025 15:06:25 -0700 Subject: [PATCH] Add Arguments to Various Event Records --- ...ebergRestCatalogEventServiceDelegator.java | 29 +++++++++++++++---- .../events/IcebergRestCatalogEvents.java | 21 ++++++++++---- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergRestCatalogEventServiceDelegator.java b/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergRestCatalogEventServiceDelegator.java index edf15d484d..2c9e3cbd87 100644 --- a/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergRestCatalogEventServiceDelegator.java +++ b/runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergRestCatalogEventServiceDelegator.java @@ -275,7 +275,8 @@ public Response loadTable( realmContext, securityContext); polarisEventListener.onAfterLoadTable( - new AfterLoadTableEvent(catalogName, namespaceObj, (LoadTableResponse) resp.getEntity())); + new AfterLoadTableEvent( + catalogName, namespaceObj, table, (LoadTableResponse) resp.getEntity())); return resp; } @@ -331,7 +332,10 @@ public Response registerTable( prefix, namespace, registerTableRequest, realmContext, securityContext); polarisEventListener.onAfterRegisterTable( new AfterRegisterTableEvent( - catalogName, namespaceObj, (LoadTableResponse) resp.getEntity())); + catalogName, + namespaceObj, + registerTableRequest.name(), + (LoadTableResponse) resp.getEntity())); return resp; } @@ -367,7 +371,11 @@ public Response updateTable( prefix, namespace, table, commitTableRequest, realmContext, securityContext); polarisEventListener.onAfterUpdateTable( new AfterUpdateTableEvent( - catalogName, namespaceObj, table, (LoadTableResponse) resp.getEntity())); + catalogName, + namespaceObj, + table, + commitTableRequest, + (LoadTableResponse) resp.getEntity())); return resp; } @@ -385,7 +393,11 @@ public Response createView( Response resp = delegate.createView(prefix, namespace, createViewRequest, realmContext, securityContext); polarisEventListener.onAfterCreateView( - new AfterCreateViewEvent(catalogName, namespaceObj, (LoadViewResponse) resp.getEntity())); + new AfterCreateViewEvent( + catalogName, + namespaceObj, + createViewRequest.name(), + (LoadViewResponse) resp.getEntity())); return resp; } @@ -436,7 +448,8 @@ public Response loadView( polarisEventListener.onBeforeLoadView(new BeforeLoadViewEvent(catalogName, namespaceObj, view)); Response resp = delegate.loadView(prefix, namespace, view, realmContext, securityContext); polarisEventListener.onAfterLoadView( - new AfterLoadViewEvent(catalogName, namespaceObj, (LoadViewResponse) resp.getEntity())); + new AfterLoadViewEvent( + catalogName, namespaceObj, view, (LoadViewResponse) resp.getEntity())); return resp; } @@ -504,7 +517,11 @@ public Response replaceView( prefix, namespace, view, commitViewRequest, realmContext, securityContext); polarisEventListener.onAfterReplaceView( new AfterReplaceViewEvent( - catalogName, namespaceObj, view, (LoadViewResponse) resp.getEntity())); + catalogName, + namespaceObj, + view, + commitViewRequest, + (LoadViewResponse) resp.getEntity())); return resp; } diff --git a/runtime/service/src/main/java/org/apache/polaris/service/events/IcebergRestCatalogEvents.java b/runtime/service/src/main/java/org/apache/polaris/service/events/IcebergRestCatalogEvents.java index 607ff43e47..977b8ea7a5 100644 --- a/runtime/service/src/main/java/org/apache/polaris/service/events/IcebergRestCatalogEvents.java +++ b/runtime/service/src/main/java/org/apache/polaris/service/events/IcebergRestCatalogEvents.java @@ -121,7 +121,10 @@ public record BeforeLoadTableEvent( implements PolarisEvent {} public record AfterLoadTableEvent( - String catalogName, Namespace namespace, LoadTableResponse loadTableResponse) + String catalogName, + Namespace namespace, + String tableName, + LoadTableResponse loadTableResponse) implements PolarisEvent {} public record BeforeCheckExistsTableEvent(String catalogName, Namespace namespace, String table) @@ -143,7 +146,10 @@ public record BeforeRegisterTableEvent( implements PolarisEvent {} public record AfterRegisterTableEvent( - String catalogName, Namespace namespace, LoadTableResponse loadTableResponse) + String catalogName, + Namespace namespace, + String tableName, + LoadTableResponse loadTableResponse) implements PolarisEvent {} public record BeforeRenameTableEvent(String catalogName, RenameTableRequest renameTableRequest) @@ -163,6 +169,7 @@ public record AfterUpdateTableEvent( String catalogName, Namespace namespace, String sourceTable, + CommitTableRequest commitTableRequest, LoadTableResponse loadTableResponse) implements PolarisEvent {} @@ -172,7 +179,7 @@ public record BeforeCreateViewEvent( implements PolarisEvent {} public record AfterCreateViewEvent( - String catalogName, Namespace namespace, LoadViewResponse loadViewResponse) + String catalogName, Namespace namespace, String viewName, LoadViewResponse loadViewResponse) implements PolarisEvent {} public record BeforeListViewsEvent(String catalogName, Namespace namespace) @@ -185,7 +192,7 @@ public record BeforeLoadViewEvent(String catalogName, Namespace namespace, Strin implements PolarisEvent {} public record AfterLoadViewEvent( - String catalogName, Namespace namespace, LoadViewResponse loadViewResponse) + String catalogName, Namespace namespace, String viewName, LoadViewResponse loadViewResponse) implements PolarisEvent {} public record BeforeCheckExistsViewEvent(String catalogName, Namespace namespace, String view) @@ -214,7 +221,11 @@ public record BeforeReplaceViewEvent( implements PolarisEvent {} public record AfterReplaceViewEvent( - String catalogName, Namespace namespace, String sourceView, LoadViewResponse loadViewResponse) + String catalogName, + Namespace namespace, + String sourceView, + CommitViewRequest commitViewRequest, + LoadViewResponse loadViewResponse) implements PolarisEvent {} // Credential Events