From cb0494dfdac53a7718e07e7516521827a98eaefb Mon Sep 17 00:00:00 2001 From: Jun Nemoto <35618893+jnmt@users.noreply.github.com> Date: Tue, 26 Nov 2024 23:14:05 +0900 Subject: [PATCH] Fix GetBuilder and ScanBuilder (#2352) --- .../main/java/com/scalar/db/api/GetBuilder.java | 14 ++------------ .../main/java/com/scalar/db/api/ScanBuilder.java | 14 ++------------ 2 files changed, 4 insertions(+), 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 index 86a1eb418d..1ce8882862 100644 --- a/core/src/main/java/com/scalar/db/api/GetBuilder.java +++ b/core/src/main/java/com/scalar/db/api/GetBuilder.java @@ -1033,21 +1033,11 @@ public static class BuildableGetFromExistingWithOngoingWhere implements And, Or { - 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); @@ -1078,7 +1068,7 @@ public BuildableGetFromExistingWithOngoingWhereOr or(AndConditionSet andConditio } public static class BuildableGetFromExistingWithOngoingWhereOr - extends BuildableGetFromExistingWithOngoingWhere + extends BuildableGetFromExistingWithWhere implements Or { private BuildableGetFromExistingWithOngoingWhereOr( @@ -1114,7 +1104,7 @@ public BuildableGetFromExistingWithOngoingWhereOr or(AndConditionSet andConditio } public static class BuildableGetFromExistingWithOngoingWhereAnd - extends BuildableGetFromExistingWithOngoingWhere + extends BuildableGetFromExistingWithWhere implements And { 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 index 13e20020f4..32a38c16bb 100644 --- a/core/src/main/java/com/scalar/db/api/ScanBuilder.java +++ b/core/src/main/java/com/scalar/db/api/ScanBuilder.java @@ -1624,21 +1624,11 @@ public static class BuildableScanFromExistingWithOngoingWhere implements And, Or { - 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); @@ -1669,7 +1659,7 @@ public BuildableScanFromExistingWithOngoingWhereOr or(AndConditionSet andConditi } public static class BuildableScanFromExistingWithOngoingWhereOr - extends BuildableScanFromExistingWithOngoingWhere + extends BuildableScanFromExistingWithWhere implements Or { private BuildableScanFromExistingWithOngoingWhereOr( @@ -1705,7 +1695,7 @@ public BuildableScanFromExistingWithOngoingWhereOr or(AndConditionSet andConditi } public static class BuildableScanFromExistingWithOngoingWhereAnd - extends BuildableScanFromExistingWithOngoingWhere + extends BuildableScanFromExistingWithWhere implements And { private BuildableScanFromExistingWithOngoingWhereAnd(