Skip to content

Commit 42da820

Browse files
feeblefakiefeeblefakie
authored
Merge branch 'master' into enable_gradle_build_cache
2 parents a0407a8 + 316229b commit 42da820

File tree

12 files changed

+254
-216
lines changed

12 files changed

+254
-216
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 67 additions & 68 deletions
Large diffs are not rendered by default.

‎.github/workflows/create-release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
echo "version=${VERSION}" >> $GITHUB_OUTPUT
2020
2121
- name: Set up JDK 8 and 11 (default 8)
22-
uses: actions/setup-java@v4
22+
uses: actions/setup-java@v5
2323
with:
2424
distribution: 'temurin'
2525
java-version: |

‎.github/workflows/data-loader-ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v5
1414

1515
- name: Set up JDK 8
16-
uses: actions/setup-java@v4
16+
uses: actions/setup-java@v5
1717
with:
1818
distribution: 'temurin'
1919
java-version: 8

‎.github/workflows/merge-release-notes.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
echo "version=${VERSION}" >> $GITHUB_OUTPUT
1717
1818
- name: Set up JDK 11
19-
uses: actions/setup-java@v4
19+
uses: actions/setup-java@v5
2020
with:
2121
distribution: 'temurin'
2222
java-version: '11'

‎.github/workflows/permission-check.yaml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v5
2020

2121
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
22-
uses: actions/setup-java@v4
22+
uses: actions/setup-java@v5
2323
with:
2424
java-version: ${{ env.JAVA_VERSION }}
2525
distribution: ${{ env.JAVA_VENDOR }}
@@ -58,7 +58,7 @@ jobs:
5858
- uses: actions/checkout@v5
5959

6060
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
61-
uses: actions/setup-java@v4
61+
uses: actions/setup-java@v5
6262
with:
6363
java-version: ${{ env.JAVA_VERSION }}
6464
distribution: ${{ env.JAVA_VENDOR }}
@@ -97,7 +97,7 @@ jobs:
9797
- uses: actions/checkout@v5
9898

9999
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
100-
uses: actions/setup-java@v4
100+
uses: actions/setup-java@v5
101101
with:
102102
java-version: ${{ env.JAVA_VERSION }}
103103
distribution: ${{ env.JAVA_VENDOR }}
@@ -126,7 +126,7 @@ jobs:
126126
- uses: actions/checkout@v5
127127

128128
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
129-
uses: actions/setup-java@v4
129+
uses: actions/setup-java@v5
130130
with:
131131
java-version: ${{ env.JAVA_VERSION }}
132132
distribution: ${{ env.JAVA_VENDOR }}
@@ -155,7 +155,7 @@ jobs:
155155
- uses: actions/checkout@v5
156156

157157
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
158-
uses: actions/setup-java@v4
158+
uses: actions/setup-java@v5
159159
with:
160160
java-version: ${{ env.JAVA_VERSION }}
161161
distribution: ${{ env.JAVA_VENDOR }}
@@ -184,7 +184,7 @@ jobs:
184184
- uses: actions/checkout@v5
185185

186186
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
187-
uses: actions/setup-java@v4
187+
uses: actions/setup-java@v5
188188
with:
189189
java-version: ${{ env.JAVA_VERSION }}
190190
distribution: ${{ env.JAVA_VENDOR }}
@@ -219,7 +219,7 @@ jobs:
219219
- uses: actions/checkout@v5
220220

221221
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
222-
uses: actions/setup-java@v4
222+
uses: actions/setup-java@v5
223223
with:
224224
java-version: ${{ env.JAVA_VERSION }}
225225
distribution: ${{ env.JAVA_VENDOR }}
@@ -254,7 +254,7 @@ jobs:
254254
- uses: actions/checkout@v5
255255

256256
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
257-
uses: actions/setup-java@v4
257+
uses: actions/setup-java@v5
258258
with:
259259
java-version: ${{ env.JAVA_VERSION }}
260260
distribution: ${{ env.JAVA_VENDOR }}
@@ -289,7 +289,7 @@ jobs:
289289
- uses: actions/checkout@v5
290290

291291
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
292-
uses: actions/setup-java@v4
292+
uses: actions/setup-java@v5
293293
with:
294294
java-version: ${{ env.JAVA_VERSION }}
295295
distribution: ${{ env.JAVA_VENDOR }}
@@ -324,7 +324,7 @@ jobs:
324324
- uses: actions/checkout@v5
325325

326326
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
327-
uses: actions/setup-java@v4
327+
uses: actions/setup-java@v5
328328
with:
329329
java-version: ${{ env.JAVA_VERSION }}
330330
distribution: ${{ env.JAVA_VENDOR }}
@@ -359,7 +359,7 @@ jobs:
359359
- uses: actions/checkout@v5
360360

361361
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
362-
uses: actions/setup-java@v4
362+
uses: actions/setup-java@v5
363363
with:
364364
java-version: ${{ env.JAVA_VERSION }}
365365
distribution: ${{ env.JAVA_VENDOR }}
@@ -394,7 +394,7 @@ jobs:
394394
- uses: actions/checkout@v5
395395

396396
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
397-
uses: actions/setup-java@v4
397+
uses: actions/setup-java@v5
398398
with:
399399
java-version: ${{ env.JAVA_VERSION }}
400400
distribution: ${{ env.JAVA_VENDOR }}
@@ -436,7 +436,7 @@ jobs:
436436
- uses: actions/checkout@v5
437437

438438
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
439-
uses: actions/setup-java@v4
439+
uses: actions/setup-java@v5
440440
with:
441441
java-version: ${{ env.JAVA_VERSION }}
442442
distribution: ${{ env.JAVA_VENDOR }}
@@ -491,7 +491,7 @@ jobs:
491491
- uses: actions/checkout@v5
492492

493493
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
494-
uses: actions/setup-java@v4
494+
uses: actions/setup-java@v5
495495
with:
496496
java-version: ${{ env.JAVA_VERSION }}
497497
distribution: ${{ env.JAVA_VENDOR }}
@@ -528,7 +528,7 @@ jobs:
528528
version: 2017
529529

530530
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
531-
uses: actions/setup-java@v4
531+
uses: actions/setup-java@v5
532532
with:
533533
java-version: ${{ env.JAVA_VERSION }}
534534
distribution: ${{ env.JAVA_VENDOR }}
@@ -565,7 +565,7 @@ jobs:
565565
- uses: actions/checkout@v5
566566

567567
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
568-
uses: actions/setup-java@v4
568+
uses: actions/setup-java@v5
569569
with:
570570
java-version: ${{ env.JAVA_VERSION }}
571571
distribution: ${{ env.JAVA_VENDOR }}
@@ -602,7 +602,7 @@ jobs:
602602
- uses: actions/checkout@v5
603603

604604
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
605-
uses: actions/setup-java@v4
605+
uses: actions/setup-java@v5
606606
with:
607607
java-version: ${{ env.JAVA_VERSION }}
608608
distribution: ${{ env.JAVA_VENDOR }}
@@ -632,7 +632,7 @@ jobs:
632632
- uses: actions/checkout@v5
633633

634634
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
635-
uses: actions/setup-java@v4
635+
uses: actions/setup-java@v5
636636
with:
637637
java-version: ${{ env.JAVA_VERSION }}
638638
distribution: ${{ env.JAVA_VENDOR }}
@@ -662,7 +662,7 @@ jobs:
662662
- uses: actions/checkout@v5
663663

664664
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
665-
uses: actions/setup-java@v4
665+
uses: actions/setup-java@v5
666666
with:
667667
java-version: ${{ env.JAVA_VERSION }}
668668
distribution: ${{ env.JAVA_VENDOR }}
@@ -692,7 +692,7 @@ jobs:
692692
- uses: actions/checkout@v5
693693

694694
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
695-
uses: actions/setup-java@v4
695+
uses: actions/setup-java@v5
696696
with:
697697
java-version: ${{ env.JAVA_VERSION }}
698698
distribution: ${{ env.JAVA_VENDOR }}
@@ -730,7 +730,7 @@ jobs:
730730
- uses: actions/checkout@v5
731731

732732
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
733-
uses: actions/setup-java@v4
733+
uses: actions/setup-java@v5
734734
with:
735735
java-version: ${{ env.JAVA_VERSION }}
736736
distribution: ${{ env.JAVA_VENDOR }}
@@ -784,7 +784,7 @@ jobs:
784784
- uses: actions/checkout@v5
785785

786786
- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
787-
uses: actions/setup-java@v4
787+
uses: actions/setup-java@v5
788788
with:
789789
java-version: ${{ env.JAVA_VERSION }}
790790
distribution: ${{ env.JAVA_VENDOR }}

‎.github/workflows/release-snapshot.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v5
1717

1818
- name: Set up JDK 8
19-
uses: actions/setup-java@v4
19+
uses: actions/setup-java@v5
2020
with:
2121
java-version: '8'
2222
distribution: 'temurin'

‎.github/workflows/upload-artifacts.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- uses: actions/checkout@v5
3636

3737
- name: Set up JDK 8
38-
uses: actions/setup-java@v4
38+
uses: actions/setup-java@v5
3939
with:
4040
java-version: '8'
4141
distribution: 'temurin'

‎ci/no-superuser/create-no-superuser-sqlserver.sh‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎core/src/main/java/com/scalar/db/transaction/consensuscommit/CommitMutationComposer.java‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.scalar.db.api.ConditionBuilder;
1010
import com.scalar.db.api.Consistency;
1111
import com.scalar.db.api.Delete;
12+
import com.scalar.db.api.DeleteBuilder;
1213
import com.scalar.db.api.Mutation;
1314
import com.scalar.db.api.Operation;
1415
import com.scalar.db.api.Put;
@@ -114,17 +115,20 @@ private Put composePut(Operation base, @Nullable TransactionResult result)
114115

115116
private Delete composeDelete(Operation base, @Nullable TransactionResult result)
116117
throws ExecutionException {
117-
return Delete.newBuilder()
118-
.namespace(base.forNamespace().get())
119-
.table(base.forTable().get())
120-
.partitionKey(getPartitionKey(base, result))
121-
.clusteringKey(getClusteringKey(base, result).orElse(null))
122-
.consistency(Consistency.LINEARIZABLE)
123-
.condition(
124-
ConditionBuilder.deleteIf(ConditionBuilder.column(ID).isEqualToText(id))
125-
.and(ConditionBuilder.column(STATE).isEqualToInt(TransactionState.DELETED.get()))
126-
.build())
127-
.build();
118+
DeleteBuilder.Buildable deleteBuilder =
119+
Delete.newBuilder()
120+
.namespace(base.forNamespace().get())
121+
.table(base.forTable().get())
122+
.partitionKey(getPartitionKey(base, result))
123+
.consistency(Consistency.LINEARIZABLE)
124+
.condition(
125+
ConditionBuilder.deleteIf(ConditionBuilder.column(ID).isEqualToText(id))
126+
.and(
127+
ConditionBuilder.column(STATE).isEqualToInt(TransactionState.DELETED.get()))
128+
.build());
129+
getClusteringKey(base, result).ifPresent(deleteBuilder::clusteringKey);
130+
131+
return deleteBuilder.build();
128132
}
129133

130134
private Key getPartitionKey(Operation base, @Nullable TransactionResult result)

0 commit comments

Comments
 (0)