Skip to content

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

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

Merged
merged 1 commit into from
Nov 27, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/GetBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -947,7 +937,7 @@ public BuildableGetFromExistingWithOngoingWhereOr or(AndConditionSet andConditio
}

public static class BuildableGetFromExistingWithOngoingWhereOr
extends BuildableGetFromExistingWithOngoingWhere
extends BuildableGetFromExistingWithWhere
implements Or<BuildableGetFromExistingWithOngoingWhereOr> {

private BuildableGetFromExistingWithOngoingWhereOr(
Expand Down Expand Up @@ -983,7 +973,7 @@ public BuildableGetFromExistingWithOngoingWhereOr or(AndConditionSet andConditio
}

public static class BuildableGetFromExistingWithOngoingWhereAnd
extends BuildableGetFromExistingWithOngoingWhere
extends BuildableGetFromExistingWithWhere
implements And<BuildableGetFromExistingWithOngoingWhereAnd> {

private BuildableGetFromExistingWithOngoingWhereAnd(
Expand Down
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 @@ -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);
Expand Down Expand Up @@ -1510,7 +1500,7 @@ public BuildableScanFromExistingWithOngoingWhereOr or(AndConditionSet andConditi
}

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

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

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

private BuildableScanFromExistingWithOngoingWhereAnd(
Expand Down