Skip to content
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.

Sign up for GitHub

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

Backport to branch(3.11) : Fix GetBuilder and ScanBuilder #2360

Merged
merged 3 commits into from
Nov 27, 2024
Merged

Backport to branch(3.11) : Fix GetBuilder and ScanBuilder #2360

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7dd7a8
Empty commit [skip ci]
jnmt Nov 26, 2024
6a4fa96
Merge branch '3.11' into 3.11-pull-2352
jnmt Nov 27, 2024
67627fe
Fix GetBuilder and ScanBuilder (#2352)
jnmt Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions core/src/main/java/com/scalar/db/api/ScanBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,21 +996,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);
Expand Down Expand Up @@ -1041,7 +1031,7 @@ public BuildableScanFromExistingWithOngoingWhereOr or(AndConditionSet andConditi
}

public static class BuildableScanFromExistingWithOngoingWhereOr
extends BuildableScanFromExistingWithOngoingWhere
extends BuildableScanFromExistingWithWhere
implements Or<BuildableScanFromExistingWithOngoingWhereOr> {

private BuildableScanFromExistingWithOngoingWhereOr(
Expand Down Expand Up @@ -1077,7 +1067,7 @@ public BuildableScanFromExistingWithOngoingWhereOr or(AndConditionSet andConditi
}

public static class BuildableScanFromExistingWithOngoingWhereAnd
extends BuildableScanFromExistingWithOngoingWhere
extends BuildableScanFromExistingWithWhere
implements And<BuildableScanFromExistingWithOngoingWhereAnd> {

private BuildableScanFromExistingWithOngoingWhereAnd(
Expand Down