Refactor Version Resolver

prasar-ashutosh · Oct 11, 2023 · 12d022d · 12d022d
1 parent 19e7ae7
commit 12d022d
Show file tree

Hide file tree

Showing 22 changed files with 95 additions and 95 deletions.
diff --git a/...in/java/org/finos/legend/engine/persistence/components/ingestmode/AppendOnlyAbstract.java b/...in/java/org/finos/legend/engine/persistence/components/ingestmode/AppendOnlyAbstract.java
@@ -18,7 +18,7 @@
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.AllVersionsStrategyAbstract;
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.MaxVersionStrategyAbstract;
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.NoVersioningStrategyAbstract;
-import org.finos.legend.engine.persistence.components.ingestmode.versioning.VersioningResolver;
+import org.finos.legend.engine.persistence.components.ingestmode.versioning.VersionResolver;
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.VersioningStrategyVisitor;
 import org.immutables.value.Value;
 
@@ -61,7 +61,7 @@ public Void visitNoVersioningStrategy(NoVersioningStrategyAbstract noVersioningS
             @Override
             public Void visitMaxVersionStrategy(MaxVersionStrategyAbstract maxVersionStrategy)
             {
-                if (maxVersionStrategy.versioningComparator() != VersioningResolver.DIGEST_BASED)
+                if (maxVersionStrategy.versionResolver() != VersionResolver.DIGEST_BASED)
                 {
                     throw new IllegalStateException("Cannot build AppendOnly, Only DIGEST_BASED VersioningResolver allowed for this ingest mode");
                 }
@@ -71,7 +71,7 @@ public Void visitMaxVersionStrategy(MaxVersionStrategyAbstract maxVersionStrateg
             @Override
             public Void visitAllVersionsStrategy(AllVersionsStrategyAbstract allVersionsStrategyAbstract)
             {
-                if (allVersionsStrategyAbstract.versioningComparator() != VersioningResolver.DIGEST_BASED)
+                if (allVersionsStrategyAbstract.versionResolver() != VersionResolver.DIGEST_BASED)
                 {
                     throw new IllegalStateException("Cannot build AppendOnly, Only DIGEST_BASED VersioningResolver allowed for this ingest mode");
                 }

diff --git a/...va/org/finos/legend/engine/persistence/components/ingestmode/BitemporalDeltaAbstract.java b/...va/org/finos/legend/engine/persistence/components/ingestmode/BitemporalDeltaAbstract.java
@@ -25,7 +25,7 @@
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.AllVersionsStrategyAbstract;
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.MaxVersionStrategyAbstract;
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.NoVersioningStrategyAbstract;
-import org.finos.legend.engine.persistence.components.ingestmode.versioning.VersioningResolver;
+import org.finos.legend.engine.persistence.components.ingestmode.versioning.VersionResolver;
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.VersioningStrategyVisitor;
 import org.immutables.value.Value;
 
@@ -89,7 +89,7 @@ public Void visitMaxVersionStrategy(MaxVersionStrategyAbstract maxVersionStrateg
             @Override
             public Void visitAllVersionsStrategy(AllVersionsStrategyAbstract allVersionsStrategyAbstract)
             {
-                if (allVersionsStrategyAbstract.versioningComparator() != VersioningResolver.DIGEST_BASED)
+                if (allVersionsStrategyAbstract.versionResolver() != VersionResolver.DIGEST_BASED)
                 {
                     throw new IllegalStateException("Cannot build BitemporalDelta, Only DIGEST_BASED VersioningResolver allowed for this ingest mode");
                 }

diff --git a/...va/org/finos/legend/engine/persistence/components/ingestmode/IngestModeCaseConverter.java b/...va/org/finos/legend/engine/persistence/components/ingestmode/IngestModeCaseConverter.java
@@ -348,7 +348,7 @@ public VersioningStrategy visitMaxVersionStrategy(MaxVersionStrategyAbstract max
         {
             return MaxVersionStrategy
                     .builder()
-                    .versioningComparator(maxVersionStrategy.versioningComparator())
+                    .versionResolver(maxVersionStrategy.versionResolver())
                     .versioningField(strategy.apply(maxVersionStrategy.versioningField()))
                     .performVersioning(maxVersionStrategy.performVersioning())
                     .build();
@@ -359,7 +359,7 @@ public VersioningStrategy visitAllVersionsStrategy(AllVersionsStrategyAbstract a
         {
             return AllVersionsStrategy
                     .builder()
-                    .versioningComparator(allVersionsStrategyAbstract.versioningComparator())
+                    .versionResolver(allVersionsStrategyAbstract.versionResolver())
                     .versioningField(strategy.apply(allVersionsStrategyAbstract.versioningField()))
                     .dataSplitFieldName(strategy.apply(allVersionsStrategyAbstract.dataSplitFieldName()))
                     .performVersioning(allVersionsStrategyAbstract.performVersioning())

diff --git a/...rg/finos/legend/engine/persistence/components/ingestmode/NontemporalSnapshotAbstract.java b/...rg/finos/legend/engine/persistence/components/ingestmode/NontemporalSnapshotAbstract.java
@@ -18,7 +18,7 @@
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.AllVersionsStrategyAbstract;
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.MaxVersionStrategyAbstract;
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.NoVersioningStrategyAbstract;
-import org.finos.legend.engine.persistence.components.ingestmode.versioning.VersioningResolver;
+import org.finos.legend.engine.persistence.components.ingestmode.versioning.VersionResolver;
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.VersioningStrategyVisitor;
 import org.immutables.value.Value;
 
@@ -58,7 +58,7 @@ public Void visitNoVersioningStrategy(NoVersioningStrategyAbstract noVersioningS
             @Override
             public Void visitMaxVersionStrategy(MaxVersionStrategyAbstract maxVersionStrategy)
             {
-                if (maxVersionStrategy.versioningComparator() != VersioningResolver.DIGEST_BASED)
+                if (maxVersionStrategy.versionResolver() != VersionResolver.DIGEST_BASED)
                 {
                     throw new IllegalStateException("Cannot build NontemporalSnapshot, Only DIGEST_BASED VersioningResolver allowed for this ingest mode");
                 }

diff --git a/...rg/finos/legend/engine/persistence/components/ingestmode/UnitemporalSnapshotAbstract.java b/...rg/finos/legend/engine/persistence/components/ingestmode/UnitemporalSnapshotAbstract.java
@@ -22,7 +22,7 @@
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.NoVersioningStrategyAbstract;
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.AllVersionsStrategyAbstract;
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.MaxVersionStrategyAbstract;
-import org.finos.legend.engine.persistence.components.ingestmode.versioning.VersioningResolver;
+import org.finos.legend.engine.persistence.components.ingestmode.versioning.VersionResolver;
 import org.immutables.value.Value;
 
 import java.util.List;
@@ -101,7 +101,7 @@ public Void visitNoVersioningStrategy(NoVersioningStrategyAbstract noVersioningS
             @Override
             public Void visitMaxVersionStrategy(MaxVersionStrategyAbstract maxVersionStrategy)
             {
-                if (maxVersionStrategy.versioningComparator() != VersioningResolver.DIGEST_BASED)
+                if (maxVersionStrategy.versionResolver() != VersionResolver.DIGEST_BASED)
                 {
                     throw new IllegalStateException("Cannot build UnitemporalSnapshot, Only DIGEST_BASED VersioningResolver allowed for this ingest mode");
                 }

diff --git a/...gend/engine/persistence/components/ingestmode/versioning/AllVersionsStrategyAbstract.java b/...gend/engine/persistence/components/ingestmode/versioning/AllVersionsStrategyAbstract.java
@@ -36,9 +36,9 @@ public interface AllVersionsStrategyAbstract extends VersioningStrategy
     String versioningField();
 
     @Value.Default
-    default VersioningResolver versioningComparator()
+    default VersionResolver versionResolver()
     {
-        return VersioningResolver.DIGEST_BASED;
+        return VersionResolver.DIGEST_BASED;
     }
 
     @Value.Default

diff --git a/...egend/engine/persistence/components/ingestmode/versioning/MaxVersionStrategyAbstract.java b/...egend/engine/persistence/components/ingestmode/versioning/MaxVersionStrategyAbstract.java
@@ -33,9 +33,9 @@ public interface MaxVersionStrategyAbstract extends VersioningStrategy
     String versioningField();
 
     @Value.Default
-    default VersioningResolver versioningComparator()
+    default VersionResolver versionResolver()
     {
-        return VersioningResolver.DIGEST_BASED;
+        return VersionResolver.DIGEST_BASED;
     }
 
     @Value.Default

diff --git a/...stmode/versioning/VersioningResolver.java → ...ngestmode/versioning/VersionResolver.java b/...stmode/versioning/VersioningResolver.java → ...ngestmode/versioning/VersionResolver.java
@@ -14,7 +14,7 @@
 
 package org.finos.legend.engine.persistence.components.ingestmode.versioning;
 
-public enum VersioningResolver
+public enum VersionResolver
 {
     GREATER_THAN_ACTIVE_VERSION,
     GREATER_THAN_EQUAL_TO_ACTIVE_VERSION,

diff --git a/...egend/engine/persistence/components/ingestmode/versioning/VersioningConditionVisitor.java b/...egend/engine/persistence/components/ingestmode/versioning/VersioningConditionVisitor.java
@@ -59,7 +59,7 @@ public Condition visitMaxVersionStrategy(MaxVersionStrategyAbstract maxVersionSt
         FieldValue mainVersioningField = FieldValue.builder().datasetRef(mainDataset.datasetReference()).fieldName(maxVersionStrategy.versioningField()).build();
         FieldValue stagingVersioningField = FieldValue.builder().datasetRef(stagingDataset.datasetReference()).fieldName(maxVersionStrategy.versioningField()).build();
 
-        switch (maxVersionStrategy.versioningComparator())
+        switch (maxVersionStrategy.versionResolver())
         {
             case GREATER_THAN_ACTIVE_VERSION:
                 if (invertComparison)

diff --git a/...c/test/java/org/finos/legend/engine/persistence/components/util/LogicalPlanUtilsTest.java b/...c/test/java/org/finos/legend/engine/persistence/components/util/LogicalPlanUtilsTest.java
@@ -38,7 +38,7 @@
 import java.util.Map;
 import com.fasterxml.jackson.core.JsonProcessingException;
 
-import static org.finos.legend.engine.persistence.components.ingestmode.versioning.VersioningResolver.GREATER_THAN_ACTIVE_VERSION;
+import static org.finos.legend.engine.persistence.components.ingestmode.versioning.VersionResolver.GREATER_THAN_ACTIVE_VERSION;
 
 public class LogicalPlanUtilsTest extends IngestModeTest
 {
@@ -57,7 +57,7 @@ public void testDeduplicateByMaxVersion()
         RelationalTransformer transformer = new RelationalTransformer(AnsiSqlSink.get());
 
         List<String> primaryKeys = Arrays.asList("id", "name");
-        VersioningStrategy versioningStrategy = MaxVersionStrategy.builder().versioningField("version").performVersioning(true).versioningComparator(GREATER_THAN_ACTIVE_VERSION).build();
+        VersioningStrategy versioningStrategy = MaxVersionStrategy.builder().versioningField("version").performVersioning(true).versionResolver(GREATER_THAN_ACTIVE_VERSION).build();
         Selection selection = (Selection) versioningStrategy.accept(new DatasetDeduplicator(dataset, primaryKeys));
         LogicalPlan logicalPlan = LogicalPlan.builder().addOps(selection).build();
         SqlPlan physicalPlan = transformer.generatePhysicalPlan(logicalPlan);
@@ -87,7 +87,7 @@ public void testDeduplicateByMaxVersionAndFilterDataset()
                 .addDatasetFilters(DatasetFilter.of("biz_date", FilterType.LESS_THAN, "2020-01-03"))
                 .build();
 
-        VersioningStrategy versioningStrategy = MaxVersionStrategy.builder().versioningField("version").performVersioning(true).versioningComparator(GREATER_THAN_ACTIVE_VERSION).build();
+        VersioningStrategy versioningStrategy = MaxVersionStrategy.builder().versioningField("version").performVersioning(true).versionResolver(GREATER_THAN_ACTIVE_VERSION).build();
         Selection selection = (Selection) versioningStrategy.accept(new DatasetDeduplicator(dataset, primaryKeys));
 
         LogicalPlan logicalPlan = LogicalPlan.builder().addOps(selection).build();

diff --git a/...d/engine/persistence/components/ingestmode/bitemporal/BitemporalDeltaWithBatchIdTest.java b/...d/engine/persistence/components/ingestmode/bitemporal/BitemporalDeltaWithBatchIdTest.java
@@ -24,7 +24,7 @@
 import org.finos.legend.engine.persistence.components.ingestmode.validitymilestoning.derivation.SourceSpecifiesFromAndThruDateTime;
 import org.finos.legend.engine.persistence.components.ingestmode.validitymilestoning.derivation.SourceSpecifiesFromDateTime;
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.AllVersionsStrategy;
-import org.finos.legend.engine.persistence.components.ingestmode.versioning.VersioningResolver;
+import org.finos.legend.engine.persistence.components.ingestmode.versioning.VersionResolver;
 import org.finos.legend.engine.persistence.components.logicalplan.datasets.Dataset;
 import org.finos.legend.engine.persistence.components.logicalplan.datasets.DatasetDefinition;
 import org.finos.legend.engine.persistence.components.planner.PlannerOptions;
@@ -516,7 +516,7 @@ void testMilestoningSourceSpecifiesFromSet3WithDataSplit() throws Exception
             .versioningStrategy(AllVersionsStrategy.builder()
                 .versioningField(versionName)
                 .dataSplitFieldName(dataSplitName)
-                .versioningComparator(VersioningResolver.DIGEST_BASED)
+                .versionResolver(VersionResolver.DIGEST_BASED)
                 .performVersioning(false)
                 .build())
             .transactionMilestoning(BatchId.builder()
@@ -598,7 +598,7 @@ void testMilestoningSourceSpecifiesFromSet3WithDataSplitMultiPasses() throws Exc
             .versioningStrategy(AllVersionsStrategy.builder()
                 .versioningField(versionName)
                 .dataSplitFieldName(dataSplitName)
-                .versioningComparator(VersioningResolver.DIGEST_BASED)
+                .versionResolver(VersionResolver.DIGEST_BASED)
                 .performVersioning(false)
                 .build())
             .transactionMilestoning(BatchId.builder()
@@ -788,7 +788,7 @@ void testMilestoningSourceSpecifiesFromSet5WithDataSplitFilterDuplicates() throw
             .versioningStrategy(AllVersionsStrategy.builder()
                 .versioningField(versionName)
                 .dataSplitFieldName(dataSplitName)
-                .versioningComparator(VersioningResolver.DIGEST_BASED)
+                .versionResolver(VersionResolver.DIGEST_BASED)
                 .performVersioning(false)
                 .build())
             .transactionMilestoning(BatchId.builder()
@@ -871,7 +871,7 @@ void testMilestoningSourceSpecifiesFromSet5WithDataSplitFilterDuplicatesMultiPas
             .versioningStrategy(AllVersionsStrategy.builder()
                 .versioningField(versionName)
                 .dataSplitFieldName(dataSplitName)
-                .versioningComparator(VersioningResolver.DIGEST_BASED)
+                .versionResolver(VersionResolver.DIGEST_BASED)
                 .performVersioning(false)
                 .build())
             .transactionMilestoning(BatchId.builder()
@@ -1121,7 +1121,7 @@ void testMilestoningSourceSpecifiesFromWithDeleteIndicatorSet3WithDataSplit() th
             .versioningStrategy(AllVersionsStrategy.builder()
                 .versioningField(versionName)
                 .dataSplitFieldName(dataSplitName)
-                .versioningComparator(VersioningResolver.DIGEST_BASED)
+                .versionResolver(VersionResolver.DIGEST_BASED)
                 .performVersioning(false)
                 .build())
             .transactionMilestoning(BatchId.builder()
@@ -1202,7 +1202,7 @@ void testMilestoningSourceSpecifiesFromWithDeleteIndicatorSet3WithDataSplitWithM
             .versioningStrategy(AllVersionsStrategy.builder()
                 .versioningField(versionName)
                 .dataSplitFieldName(dataSplitName)
-                .versioningComparator(VersioningResolver.DIGEST_BASED)
+                .versionResolver(VersionResolver.DIGEST_BASED)
                 .performVersioning(false)
                 .build())
             .transactionMilestoning(BatchId.builder()
@@ -1390,7 +1390,7 @@ void testMilestoningSourceSpecifiesFromWithDeleteIndicatorSet5WithDataSplitFilte
             .versioningStrategy(AllVersionsStrategy.builder()
                 .versioningField(versionName)
                 .dataSplitFieldName(dataSplitName)
-                .versioningComparator(VersioningResolver.DIGEST_BASED)
+                .versionResolver(VersionResolver.DIGEST_BASED)
                 .performVersioning(false)
                 .build())
             .transactionMilestoning(BatchId.builder()
@@ -1475,7 +1475,7 @@ void testMilestoningSourceSpecifiesFromWithDeleteIndicatorSet5WithDataSplitFilte
             .versioningStrategy(AllVersionsStrategy.builder()
                 .versioningField(versionName)
                 .dataSplitFieldName(dataSplitName)
-                .versioningComparator(VersioningResolver.DIGEST_BASED)
+                .versionResolver(VersionResolver.DIGEST_BASED)
                 .performVersioning(false)
                 .build())
             .transactionMilestoning(BatchId.builder()

diff --git a/...org/finos/legend/engine/persistence/components/ingestmode/nontemporal/AppendOnlyTest.java b/...org/finos/legend/engine/persistence/components/ingestmode/nontemporal/AppendOnlyTest.java
@@ -27,7 +27,7 @@
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.AllVersionsStrategy;
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.MaxVersionStrategy;
 import org.finos.legend.engine.persistence.components.ingestmode.versioning.NoVersioningStrategy;
-import org.finos.legend.engine.persistence.components.ingestmode.versioning.VersioningResolver;
+import org.finos.legend.engine.persistence.components.ingestmode.versioning.VersionResolver;
 import org.finos.legend.engine.persistence.components.logicalplan.datasets.Dataset;
 import org.finos.legend.engine.persistence.components.logicalplan.datasets.DatasetDefinition;
 import org.finos.legend.engine.persistence.components.planner.PlannerOptions;
@@ -194,7 +194,7 @@ void testAppendOnlyWithAuditingMaxVersionFilterDuplicatesFilterExistingRecordsUp
             .deduplicationStrategy(FilterDuplicates.builder().build())
             .versioningStrategy(MaxVersionStrategy.builder()
                 .versioningField(versionName)
-                .versioningComparator(VersioningResolver.DIGEST_BASED)
+                .versionResolver(VersionResolver.DIGEST_BASED)
                 .performVersioning(true)
                 .build())
             .auditing(DateTimeAuditing.builder().dateTimeField(batchUpdateTimeName).build())
@@ -243,7 +243,7 @@ void testAppendOnlyWithAuditingMaxVersionFilterDuplicatesNoFilterExistingRecords
             .deduplicationStrategy(FilterDuplicates.builder().build())
             .versioningStrategy(MaxVersionStrategy.builder()
                 .versioningField(versionName)
-                .versioningComparator(VersioningResolver.DIGEST_BASED)
+                .versionResolver(VersionResolver.DIGEST_BASED)
                 .performVersioning(true)
                 .build())
             .auditing(DateTimeAuditing.builder().dateTimeField(batchUpdateTimeName).build())
@@ -294,7 +294,7 @@ void testAppendOnlyWithAuditingAllVersionFilterDuplicatesFilterExistingRecords()
             .versioningStrategy(AllVersionsStrategy.builder()
                 .versioningField(versionName)
                 .dataSplitFieldName(dataSplitName)
-                .versioningComparator(VersioningResolver.DIGEST_BASED)
+                .versionResolver(VersionResolver.DIGEST_BASED)
                 .performVersioning(true)
                 .build())
             .auditing(DateTimeAuditing.builder().dateTimeField(batchUpdateTimeName).build())
@@ -345,7 +345,7 @@ void testAppendOnlyWithAuditingAllVersionFilterDuplicatesNoFilterExistingRecords
             .versioningStrategy(AllVersionsStrategy.builder()
                 .versioningField(versionName)
                 .dataSplitFieldName(dataSplitName)
-                .versioningComparator(VersioningResolver.DIGEST_BASED)
+                .versionResolver(VersionResolver.DIGEST_BASED)
                 .performVersioning(true)
                 .build())
             .auditing(DateTimeAuditing.builder().dateTimeField(batchUpdateTimeName).build())