-
Notifications
You must be signed in to change notification settings - Fork 332
Fixes phantom event emission; Introduces StageCommitTableEvent #3073
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
adnanhemani
wants to merge
2
commits into
apache:main
Choose a base branch
from
adnanhemani:ahemani/fix_phantom_events
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
156 changes: 156 additions & 0 deletions
156
...st/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManagerTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.polaris.core.persistence; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.mockito.Mockito.mock; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import org.apache.iceberg.TableMetadata; | ||
| import org.apache.iceberg.catalog.TableIdentifier; | ||
| import org.apache.polaris.core.PolarisCallContext; | ||
| import org.apache.polaris.core.PolarisDiagnostics; | ||
| import org.apache.polaris.core.entity.PolarisBaseEntity; | ||
| import org.apache.polaris.core.entity.PolarisEntityCore; | ||
| import org.apache.polaris.core.persistence.dao.entity.EntityResult; | ||
| import org.apache.polaris.core.persistence.dao.entity.EntityWithPath; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class TransactionWorkspaceMetaStoreManagerTest { | ||
|
|
||
| private TransactionWorkspaceMetaStoreManager transactionManager; | ||
| private PolarisDiagnostics diagnostics; | ||
| private PolarisMetaStoreManager delegate; | ||
|
|
||
| @BeforeEach | ||
| void setUp() { | ||
| diagnostics = mock(PolarisDiagnostics.class); | ||
| delegate = mock(PolarisMetaStoreManager.class); | ||
| transactionManager = new TransactionWorkspaceMetaStoreManager(diagnostics, delegate); | ||
| } | ||
|
|
||
| @Test | ||
| void testEntityUpdateFunctionality() { | ||
| PolarisCallContext callCtx = mock(PolarisCallContext.class); | ||
|
|
||
| // Test with normal catalog path | ||
| List<PolarisEntityCore> catalogPath = Arrays.asList(mock(PolarisEntityCore.class)); | ||
| PolarisBaseEntity entity1 = mock(PolarisBaseEntity.class); | ||
|
|
||
| EntityResult result1 = | ||
| transactionManager.updateEntityPropertiesIfNotChanged(callCtx, catalogPath, entity1); | ||
| assertThat(result1).isNotNull(); | ||
| assertThat(result1.getEntity()).isEqualTo(entity1); | ||
|
|
||
| // Test with null catalog path (top-level entity) | ||
| PolarisBaseEntity entity2 = mock(PolarisBaseEntity.class); | ||
| EntityResult result2 = | ||
| transactionManager.updateEntityPropertiesIfNotChanged(callCtx, null, entity2); | ||
| assertThat(result2.getEntity()).isEqualTo(entity2); | ||
|
|
||
| // Test with empty catalog path | ||
| List<PolarisEntityCore> emptyCatalogPath = Collections.emptyList(); | ||
| PolarisBaseEntity entity3 = mock(PolarisBaseEntity.class); | ||
| EntityResult result3 = | ||
| transactionManager.updateEntityPropertiesIfNotChanged(callCtx, emptyCatalogPath, entity3); | ||
| assertThat(result3.getEntity()).isEqualTo(entity3); | ||
|
|
||
| // Verify all updates are staged correctly | ||
| List<EntityWithPath> pendingUpdates = transactionManager.getPendingUpdates(); | ||
| assertThat(pendingUpdates).hasSize(3); | ||
|
|
||
| assertThat(pendingUpdates.get(0).getCatalogPath()).isEqualTo(catalogPath); | ||
| assertThat(pendingUpdates.get(0).getEntity()).isEqualTo(entity1); | ||
|
|
||
| assertThat(pendingUpdates.get(1).getCatalogPath()).isNull(); | ||
| assertThat(pendingUpdates.get(1).getEntity()).isEqualTo(entity2); | ||
|
|
||
| assertThat(pendingUpdates.get(2).getCatalogPath()).isEqualTo(emptyCatalogPath); | ||
| assertThat(pendingUpdates.get(2).getEntity()).isEqualTo(entity3); | ||
| } | ||
|
|
||
| @Test | ||
| void testStageEventFunctionality() { | ||
| // Test one event | ||
| String catalogName = "test_catalog"; | ||
| TableIdentifier identifier = TableIdentifier.of("namespace", "table"); | ||
| TableMetadata metadataBefore = mock(TableMetadata.class); | ||
| TableMetadata metadataAfter = mock(TableMetadata.class); | ||
|
|
||
| transactionManager.stageEvent(catalogName, identifier, metadataBefore, metadataAfter); | ||
|
|
||
| List<TransactionWorkspaceMetaStoreManager.StageEvent> events = | ||
| transactionManager.getPendingEvents(); | ||
| assertThat(events).hasSize(1); | ||
|
|
||
| TransactionWorkspaceMetaStoreManager.StageEvent event = events.get(0); | ||
| assertThat(event.catalogName()).isEqualTo(catalogName); | ||
| assertThat(event.identifier()).isEqualTo(identifier); | ||
| assertThat(event.metadataBefore()).isEqualTo(metadataBefore); | ||
| assertThat(event.metadataAfter()).isEqualTo(metadataAfter); | ||
|
|
||
| // Test another event | ||
| String catalog2 = "catalog2"; | ||
| TableIdentifier id2 = TableIdentifier.of("ns2", "table2"); | ||
| TableMetadata meta2Before = mock(TableMetadata.class); | ||
| TableMetadata meta2After = mock(TableMetadata.class); | ||
|
|
||
| transactionManager.stageEvent(catalog2, id2, meta2Before, meta2After); | ||
|
|
||
| events = transactionManager.getPendingEvents(); | ||
| assertThat(events).hasSize(2); | ||
| assertThat(events.get(1).catalogName()).isEqualTo(catalog2); | ||
| assertThat(events.get(1).identifier()).isEqualTo(id2); | ||
| } | ||
|
|
||
| @Test | ||
| void testPendingUpdatesAndEventsTogether() { | ||
| PolarisCallContext callCtx = mock(PolarisCallContext.class); | ||
| PolarisBaseEntity entity = mock(PolarisBaseEntity.class); | ||
| List<PolarisEntityCore> catalogPath = Arrays.asList(mock(PolarisEntityCore.class)); | ||
|
|
||
| String catalogName = "test_catalog"; | ||
| TableIdentifier identifier = TableIdentifier.of("namespace", "table"); | ||
| TableMetadata metadataBefore = mock(TableMetadata.class); | ||
| TableMetadata metadataAfter = mock(TableMetadata.class); | ||
|
|
||
| transactionManager.updateEntityPropertiesIfNotChanged(callCtx, catalogPath, entity); | ||
| transactionManager.stageEvent(catalogName, identifier, metadataBefore, metadataAfter); | ||
|
|
||
| List<EntityWithPath> pendingUpdates = transactionManager.getPendingUpdates(); | ||
| List<TransactionWorkspaceMetaStoreManager.StageEvent> pendingEvents = | ||
| transactionManager.getPendingEvents(); | ||
|
|
||
| assertThat(pendingUpdates).hasSize(1); | ||
| assertThat(pendingEvents).hasSize(1); | ||
|
|
||
| // Verify update | ||
| EntityWithPath update = pendingUpdates.get(0); | ||
| assertThat(update.getCatalogPath()).isEqualTo(catalogPath); | ||
| assertThat(update.getEntity()).isEqualTo(entity); | ||
|
|
||
| // Verify event | ||
| TransactionWorkspaceMetaStoreManager.StageEvent event = pendingEvents.get(0); | ||
| assertThat(event.catalogName()).isEqualTo(catalogName); | ||
| assertThat(event.identifier()).isEqualTo(identifier); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This
if+instanceoflooks concerning to me. I do believe the whole events design can and should be done in a way that processing logic does not require knowing specific types of pluggable components.TransactionalWorkspaceMetaStoreManagerin itself has API design concerns from my POV, so I believe this area of the code needs refactoring in general, so adding logic that depends on specific types is both risky and complicates future refactoring.