Backport to branch(3.13) : Fix GetBuilder and ScanBuilder (#2358)

Co-authored-by: Jun Nemoto <[email protected]>
scalar-labs · Nov 27, 2024 · 0ae42e3 · 0ae42e3
1 parent ce2e199
commit 0ae42e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 24 deletions.
diff --git a/core/src/main/java/com/scalar/db/api/GetBuilder.java b/core/src/main/java/com/scalar/db/api/GetBuilder.java
@@ -902,21 +902,11 @@ public static class BuildableGetFromExistingWithOngoingWhere
       implements And<BuildableGetFromExistingWithOngoingWhereAnd>,
           Or<BuildableGetFromExistingWithOngoingWhereOr> {
 
-    private BuildableGetFromExistingWithOngoingWhere(
-        BuildableGetOrGetWithIndexFromExisting buildable) {
-      super(buildable);
-    }
-
     private BuildableGetFromExistingWithOngoingWhere(
         BuildableGetOrGetWithIndexFromExisting buildable, ConditionalExpression condition) {
       super(buildable, condition);
     }
 
-    private BuildableGetFromExistingWithOngoingWhere(
-        BuildableGetFromExistingWithOngoingWhere buildable) {
-      super(buildable);
-    }
-
     @Override
     public BuildableGetFromExistingWithOngoingWhereAnd and(ConditionalExpression condition) {
       checkNotNull(condition);
@@ -947,7 +937,7 @@ public BuildableGetFromExistingWithOngoingWhereOr or(AndConditionSet andConditio
   }
 
   public static class BuildableGetFromExistingWithOngoingWhereOr
-      extends BuildableGetFromExistingWithOngoingWhere
+      extends BuildableGetFromExistingWithWhere
       implements Or<BuildableGetFromExistingWithOngoingWhereOr> {
 
     private BuildableGetFromExistingWithOngoingWhereOr(
@@ -983,7 +973,7 @@ public BuildableGetFromExistingWithOngoingWhereOr or(AndConditionSet andConditio
   }
 
   public static class BuildableGetFromExistingWithOngoingWhereAnd
-      extends BuildableGetFromExistingWithOngoingWhere
+      extends BuildableGetFromExistingWithWhere
       implements And<BuildableGetFromExistingWithOngoingWhereAnd> {
 
     private BuildableGetFromExistingWithOngoingWhereAnd(

diff --git a/core/src/main/java/com/scalar/db/api/ScanBuilder.java b/core/src/main/java/com/scalar/db/api/ScanBuilder.java
@@ -1465,21 +1465,11 @@ public static class BuildableScanFromExistingWithOngoingWhere
       implements And<BuildableScanFromExistingWithOngoingWhereAnd>,
           Or<BuildableScanFromExistingWithOngoingWhereOr> {
 
-    private BuildableScanFromExistingWithOngoingWhere(
-        BuildableScanOrScanAllFromExisting buildable) {
-      super(buildable);
-    }
-
     private BuildableScanFromExistingWithOngoingWhere(
         BuildableScanOrScanAllFromExisting buildable, ConditionalExpression condition) {
       super(buildable, condition);
     }
 
-    private BuildableScanFromExistingWithOngoingWhere(
-        BuildableScanFromExistingWithOngoingWhere buildable) {
-      super(buildable);
-    }
-
     @Override
     public BuildableScanFromExistingWithOngoingWhereAnd and(ConditionalExpression condition) {
       checkNotNull(condition);
@@ -1510,7 +1500,7 @@ public BuildableScanFromExistingWithOngoingWhereOr or(AndConditionSet andConditi
   }
 
   public static class BuildableScanFromExistingWithOngoingWhereOr
-      extends BuildableScanFromExistingWithOngoingWhere
+      extends BuildableScanFromExistingWithWhere
       implements Or<BuildableScanFromExistingWithOngoingWhereOr> {
 
     private BuildableScanFromExistingWithOngoingWhereOr(
@@ -1546,7 +1536,7 @@ public BuildableScanFromExistingWithOngoingWhereOr or(AndConditionSet andConditi
   }
 
   public static class BuildableScanFromExistingWithOngoingWhereAnd
-      extends BuildableScanFromExistingWithOngoingWhere
+      extends BuildableScanFromExistingWithWhere
       implements And<BuildableScanFromExistingWithOngoingWhereAnd> {
 
     private BuildableScanFromExistingWithOngoingWhereAnd(