Skip to content

Commit ff63b5a

Browse files
committed
Fix workflow and test
1 parent 960d6af commit ff63b5a

File tree

5 files changed

+18
-10
lines changed

5 files changed

+18
-10
lines changed

.github/workflows/object-storage-adapter-check.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
bucket_suffix: storage-cm
8383
group_commit_enabled: false
8484
- label: storage_others
85-
tests_filter: '--tests "**.ObjectStorage**" --tests "!**.ObjectStorageSingle**" --tests "!**.ObjectStorageMultiple**" --tests "!**.ObjectStorageWrapper**" --tests "!**.ObjectStorageAdmin**" --tests "!**.ObjectStorageConditionalMutation**"'
85+
tests_filter: '--tests "**.ObjectStorageCaseSensitivity**" --tests "**.ObjectStorageColumnValue**" --tests "**.ObjectStorageCrossPartition**" --tests "**.ObjectStorageIntegrationTest" --tests "**.ObjectStorageJapanese**" --tests "**.ObjectStorageMutationAtomicity**" --tests "**.ObjectStorageWithReservedKeyword**"'
8686
bucket_suffix: storage
8787
group_commit_enabled: false
8888
- label: two_phase_consensus_commit
@@ -169,7 +169,7 @@ jobs:
169169
bucket_suffix: storage-cm
170170
group_commit_enabled: false
171171
- label: storage_others
172-
tests_filter: '--tests "**.ObjectStorage**" --tests "!**.ObjectStorageSingle**" --tests "!**.ObjectStorageMultiple**" --tests "!**.ObjectStorageWrapper**" --tests "!**.ObjectStorageAdmin**" --tests "!**.ObjectStorageConditionalMutation**"'
172+
tests_filter: '--tests "**.ObjectStorageCaseSensitivity**" --tests "**.ObjectStorageColumnValue**" --tests "**.ObjectStorageCrossPartition**" --tests "**.ObjectStorageIntegrationTest" --tests "**.ObjectStorageJapanese**" --tests "**.ObjectStorageMutationAtomicity**" --tests "**.ObjectStorageWithReservedKeyword**"'
173173
bucket_suffix: storage
174174
group_commit_enabled: false
175175
- label: two_phase_consensus_commit

core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageMultipleClusteringKeyScanIntegrationTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ protected boolean isParallelDdlSupported() {
2323

2424
@Override
2525
protected Column<?> getColumnWithMaxValue(String columnName, DataType dataType) {
26-
if (dataType == DataType.TEXT && ObjectStorageEnv.isCloudStorage()) {
27-
// Since Cloud Storage can't handle 0xFF character correctly, we use "ZZZ..." as the max value
26+
if (dataType == DataType.TEXT
27+
&& (ObjectStorageEnv.isCloudStorage() || ObjectStorageEnv.isS3())) {
28+
// Since S3 and Cloud Storage can't handle 0xFF character correctly, we use "ZZZ..." as the
29+
// max value
2830
StringBuilder builder = new StringBuilder();
2931
IntStream.range(0, TestUtils.MAX_TEXT_COUNT).forEach(i -> builder.append('Z'));
3032
return TextColumn.of(columnName, builder.toString());

core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageMultiplePartitionKeyIntegrationTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ protected boolean isParallelDdlSupported() {
2323

2424
@Override
2525
protected Column<?> getColumnWithMaxValue(String columnName, DataType dataType) {
26-
if (dataType == DataType.TEXT && ObjectStorageEnv.isCloudStorage()) {
27-
// Since Cloud Storage can't handle 0xFF character correctly, we use "ZZZ..." as the max value
26+
if (dataType == DataType.TEXT
27+
&& (ObjectStorageEnv.isCloudStorage() || ObjectStorageEnv.isS3())) {
28+
// Since S3 and Cloud Storage can't handle 0xFF character correctly, we use "ZZZ..." as the
29+
// max value
2830
StringBuilder builder = new StringBuilder();
2931
IntStream.range(0, TestUtils.MAX_TEXT_COUNT).forEach(i -> builder.append('Z'));
3032
return TextColumn.of(columnName, builder.toString());

core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageSingleClusteringKeyScanIntegrationTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ protected Properties getProperties(String testName) {
1818

1919
@Override
2020
protected Column<?> getColumnWithMaxValue(String columnName, DataType dataType) {
21-
if (dataType == DataType.TEXT && ObjectStorageEnv.isCloudStorage()) {
22-
// Since Cloud Storage can't handle 0xFF character correctly, we use "ZZZ..." as the max value
21+
if (dataType == DataType.TEXT
22+
&& (ObjectStorageEnv.isCloudStorage() || ObjectStorageEnv.isS3())) {
23+
// Since S3 and Cloud Storage can't handle 0xFF character correctly, we use "ZZZ..." as the
24+
// max value
2325
StringBuilder builder = new StringBuilder();
2426
IntStream.range(0, TestUtils.MAX_TEXT_COUNT).forEach(i -> builder.append('Z'));
2527
return TextColumn.of(columnName, builder.toString());

core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageSinglePartitionKeyIntegrationTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ protected Properties getProperties(String testName) {
1818

1919
@Override
2020
protected Column<?> getColumnWithMaxValue(String columnName, DataType dataType) {
21-
if (dataType == DataType.TEXT && ObjectStorageEnv.isCloudStorage()) {
22-
// Since Cloud Storage can't handle 0xFF character correctly, we use "ZZZ..." as the max value
21+
if (dataType == DataType.TEXT
22+
&& (ObjectStorageEnv.isCloudStorage() || ObjectStorageEnv.isS3())) {
23+
// Since S3 and Cloud Storage can't handle 0xFF character correctly, we use "ZZZ..." as the
24+
// max value
2325
StringBuilder builder = new StringBuilder();
2426
IntStream.range(0, TestUtils.MAX_TEXT_COUNT).forEach(i -> builder.append('Z'));
2527
return TextColumn.of(columnName, builder.toString());

0 commit comments

Comments
 (0)