This is an automated email from the ASF dual-hosted git repository.
dimas pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push:
new 9b5e51892 Harmonize parameters in PolarisMetaStoreManager (#1165)
9b5e51892 is described below
commit 9b5e5189222ff491b819db948d4b641d5442233e
Author: Dmitri Bourlatchkov <[email protected]>
AuthorDate: Wed Mar 12 18:23:42 2025 -0400
Harmonize parameters in PolarisMetaStoreManager (#1165)
* Use `PolarisBaseEntity` for the entity that is acted upon in
`renameEntity` and `dropEntityIfExists`
* This is in line with existing parameters for "acted upon"
entities in other methods.
* Simplify TaskExecutorImpl (avoid object copy)
* Existing call sites have the required data available.
Co-authored-by: Robert Stupp <[email protected]>
---
.../core/persistence/AtomicOperationMetaStoreManager.java | 4 ++--
.../polaris/core/persistence/PolarisMetaStoreManager.java | 4 ++--
.../persistence/TransactionWorkspaceMetaStoreManager.java | 4 ++--
.../transactional/PolarisMetaStoreManagerImpl.java | 11 ++++++-----
.../polaris/core/persistence/PolarisTestMetaStoreManager.java | 2 +-
.../org/apache/polaris/service/task/TaskExecutorImpl.java | 3 +--
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/AtomicOperationMetaStoreManager.java
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/AtomicOperationMetaStoreManager.java
index 591edbdc5..26a1a1791 100644
---
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/AtomicOperationMetaStoreManager.java
+++
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/AtomicOperationMetaStoreManager.java
@@ -1003,7 +1003,7 @@ public class AtomicOperationMetaStoreManager extends
BaseMetaStoreManager {
public @Nonnull EntityResult renameEntity(
@Nonnull PolarisCallContext callCtx,
@Nullable List<PolarisEntityCore> catalogPath,
- @Nonnull PolarisEntityCore entityToRename,
+ @Nonnull PolarisBaseEntity entityToRename,
@Nullable List<PolarisEntityCore> newCatalogPath,
@Nonnull PolarisEntity renamedEntity) {
// get metastore we should be using
@@ -1101,7 +1101,7 @@ public class AtomicOperationMetaStoreManager extends
BaseMetaStoreManager {
public @Nonnull DropEntityResult dropEntityIfExists(
@Nonnull PolarisCallContext callCtx,
@Nullable List<PolarisEntityCore> catalogPath,
- @Nonnull PolarisEntityCore entityToDrop,
+ @Nonnull PolarisBaseEntity entityToDrop,
@Nullable Map<String, String> cleanupProperties,
boolean cleanup) {
// get metastore we should be using
diff --git
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManager.java
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManager.java
index 75859c451..cc082bc27 100644
---
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManager.java
+++
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManager.java
@@ -252,7 +252,7 @@ public interface PolarisMetaStoreManager
EntityResult renameEntity(
@Nonnull PolarisCallContext callCtx,
@Nullable List<PolarisEntityCore> catalogPath,
- @Nonnull PolarisEntityCore entityToRename,
+ @Nonnull PolarisBaseEntity entityToRename,
@Nullable List<PolarisEntityCore> newCatalogPath,
@Nonnull PolarisEntity renamedEntity);
@@ -272,7 +272,7 @@ public interface PolarisMetaStoreManager
DropEntityResult dropEntityIfExists(
@Nonnull PolarisCallContext callCtx,
@Nullable List<PolarisEntityCore> catalogPath,
- @Nonnull PolarisEntityCore entityToDrop,
+ @Nonnull PolarisBaseEntity entityToDrop,
@Nullable Map<String, String> cleanupProperties,
boolean cleanup);
diff --git
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java
index 8ca542b1a..c8c59797c 100644
---
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java
+++
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java
@@ -211,7 +211,7 @@ public class TransactionWorkspaceMetaStoreManager
implements PolarisMetaStoreMan
public EntityResult renameEntity(
@Nonnull PolarisCallContext callCtx,
@Nullable List<PolarisEntityCore> catalogPath,
- @Nonnull PolarisEntityCore entityToRename,
+ @Nonnull PolarisBaseEntity entityToRename,
@Nullable List<PolarisEntityCore> newCatalogPath,
@Nonnull PolarisEntity renamedEntity) {
callCtx.getDiagServices().fail("illegal_method_in_transaction_workspace",
"renameEntity");
@@ -222,7 +222,7 @@ public class TransactionWorkspaceMetaStoreManager
implements PolarisMetaStoreMan
public DropEntityResult dropEntityIfExists(
@Nonnull PolarisCallContext callCtx,
@Nullable List<PolarisEntityCore> catalogPath,
- @Nonnull PolarisEntityCore entityToDrop,
+ @Nonnull PolarisBaseEntity entityToDrop,
@Nullable Map<String, String> cleanupProperties,
boolean cleanup) {
callCtx.getDiagServices().fail("illegal_method_in_transaction_workspace",
"dropEntityIfExists");
diff --git
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/PolarisMetaStoreManagerImpl.java
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/PolarisMetaStoreManagerImpl.java
index 17ba13ab1..0b8a91c52 100644
---
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/PolarisMetaStoreManagerImpl.java
+++
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/PolarisMetaStoreManagerImpl.java
@@ -1152,7 +1152,7 @@ public class PolarisMetaStoreManagerImpl extends
BaseMetaStoreManager {
}
/**
- * See {@link PolarisMetaStoreManager#renameEntity(PolarisCallContext, List,
PolarisEntityCore,
+ * See {@link PolarisMetaStoreManager#renameEntity(PolarisCallContext, List,
PolarisBaseEntity,
* List, PolarisEntity)}
*/
private @Nonnull EntityResult renameEntity(
@@ -1264,7 +1264,7 @@ public class PolarisMetaStoreManagerImpl extends
BaseMetaStoreManager {
public @Nonnull EntityResult renameEntity(
@Nonnull PolarisCallContext callCtx,
@Nullable List<PolarisEntityCore> catalogPath,
- @Nonnull PolarisEntityCore entityToRename,
+ @Nonnull PolarisBaseEntity entityToRename,
@Nullable List<PolarisEntityCore> newCatalogPath,
@Nonnull PolarisEntity renamedEntity) {
// get metastore we should be using
@@ -1281,13 +1281,14 @@ public class PolarisMetaStoreManagerImpl extends
BaseMetaStoreManager {
/**
* See
*
- * <p>{@link #dropEntityIfExists(PolarisCallContext, List,
PolarisEntityCore, Map, boolean)}
+ * <p>{@link #dropEntityIfExists(PolarisCallContext,
TransactionalPersistence, List,
+ * PolarisBaseEntity, Map, boolean)}
*/
private @Nonnull DropEntityResult dropEntityIfExists(
@Nonnull PolarisCallContext callCtx,
@Nonnull TransactionalPersistence ms,
@Nullable List<PolarisEntityCore> catalogPath,
- @Nonnull PolarisEntityCore entityToDrop,
+ @Nonnull PolarisBaseEntity entityToDrop,
@Nullable Map<String, String> cleanupProperties,
boolean cleanup) {
// entity cannot be null
@@ -1397,7 +1398,7 @@ public class PolarisMetaStoreManagerImpl extends
BaseMetaStoreManager {
public @Nonnull DropEntityResult dropEntityIfExists(
@Nonnull PolarisCallContext callCtx,
@Nullable List<PolarisEntityCore> catalogPath,
- @Nonnull PolarisEntityCore entityToDrop,
+ @Nonnull PolarisBaseEntity entityToDrop,
@Nullable Map<String, String> cleanupProperties,
boolean cleanup) {
// get metastore we should be using
diff --git
a/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java
b/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java
index b85485de1..55849baf4 100644
---
a/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java
+++
b/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java
@@ -651,7 +651,7 @@ public class PolarisTestMetaStoreManager {
}
/** Drop the entity if it exists. */
- void dropEntity(List<PolarisEntityCore> catalogPath, PolarisEntityCore
entityToDrop) {
+ void dropEntity(List<PolarisEntityCore> catalogPath, PolarisBaseEntity
entityToDrop) {
// see if the entity exists
final boolean exists;
boolean hasChildren = false;
diff --git
a/service/common/src/main/java/org/apache/polaris/service/task/TaskExecutorImpl.java
b/service/common/src/main/java/org/apache/polaris/service/task/TaskExecutorImpl.java
index a80068232..4fd382bc6 100644
---
a/service/common/src/main/java/org/apache/polaris/service/task/TaskExecutorImpl.java
+++
b/service/common/src/main/java/org/apache/polaris/service/task/TaskExecutorImpl.java
@@ -29,7 +29,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import org.apache.polaris.core.context.CallContext;
import org.apache.polaris.core.entity.PolarisBaseEntity;
-import org.apache.polaris.core.entity.PolarisEntity;
import org.apache.polaris.core.entity.PolarisEntityType;
import org.apache.polaris.core.entity.TaskEntity;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
@@ -140,7 +139,7 @@ public class TaskExecutorImpl implements TaskExecutor {
.addKeyValue("handlerClass", handler.getClass())
.log("Task successfully handled");
metaStoreManager.dropEntityIfExists(
- ctx.getPolarisCallContext(), null, PolarisEntity.toCore(taskEntity),
Map.of(), false);
+ ctx.getPolarisCallContext(), null, taskEntity, Map.of(), false);
} else {
LOGGER
.atWarn()
