Skip to content

Commit 94af094

Browse files
KodaiDKodaiD
committed
Fix workflow and test
1 parent 4119ccf commit 94af094

File tree

5 files changed

+30
-60
lines changed

5 files changed

+30
-60
lines changed

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,13 @@ jobs:
6565
tests_filter: '--tests "**.ConsensusCommit**"'
6666
bucket_suffix: consensus-commit-gc
6767
group_commit_enabled: true
68-
- label: storage_scan
69-
tests_filter: '--tests "**.ObjectStorageSingle**" --tests "**.ObjectStorageMultiple**"'
70-
bucket_suffix: storage-scan
68+
- label: storage_scan_single
69+
tests_filter: '--tests "**.ObjectStorageSingle**"'
70+
bucket_suffix: storage-scan-single
71+
group_commit_enabled: false
72+
- label: storage_scan_multiple
73+
tests_filter: '--tests "**.ObjectStorageMultiple**"'
74+
bucket_suffix: storage-scan-multiple
7175
group_commit_enabled: false
7276
- label: storage_wrapper
7377
tests_filter: '--tests "**.ObjectStorageWrapper**"'
@@ -152,9 +156,13 @@ jobs:
152156
tests_filter: '--tests "**.ConsensusCommit**"'
153157
bucket_suffix: consensus-commit-gc
154158
group_commit_enabled: true
155-
- label: storage_scan
156-
tests_filter: '--tests "**.ObjectStorageSingle**" --tests "**.ObjectStorageMultiple**"'
157-
bucket_suffix: storage-scan
159+
- label: storage_scan_single
160+
tests_filter: '--tests "**.ObjectStorageSingle**"'
161+
bucket_suffix: storage-scan-single
162+
group_commit_enabled: false
163+
- label: storage_scan_multiple
164+
tests_filter: '--tests "**.ObjectStorageMultiple**"'
165+
bucket_suffix: storage-scan-multiple
158166
group_commit_enabled: false
159167
- label: storage_wrapper
160168
tests_filter: '--tests "**.ObjectStorageWrapper**"'

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

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,19 @@ protected Properties getProperties(String testName) {
1717
}
1818

1919
@Override
20-
protected boolean isParallelDdlSupported() {
21-
return false;
20+
protected int getThreadNum() {
21+
return 3;
2222
}
2323

2424
@Override
25-
protected Column<?> getColumnWithMinValue(String columnName, DataType dataType) {
26-
if (dataType == DataType.TEXT && ObjectStorageEnv.isS3()) {
27-
// Since S3 and Cloud Storage can't handle "\u0001" character correctly, we use " " as the min
28-
// value
29-
return TextColumn.of(columnName, " ");
30-
}
31-
return super.getColumnWithMinValue(columnName, dataType);
25+
protected boolean isParallelDdlSupported() {
26+
return false;
3227
}
3328

3429
@Override
3530
protected Column<?> getColumnWithMaxValue(String columnName, DataType dataType) {
36-
if (dataType == DataType.TEXT
37-
&& (ObjectStorageEnv.isCloudStorage() || ObjectStorageEnv.isS3())) {
38-
// Since S3 and Cloud Storage can't handle 0xFF character correctly, we use "ZZZ..." as the
39-
// max value
31+
if (dataType == DataType.TEXT && ObjectStorageEnv.isCloudStorage()) {
32+
// Since Cloud Storage can't handle 0xFF character correctly, we use "ZZZ..." as the max value
4033
StringBuilder builder = new StringBuilder();
4134
IntStream.range(0, TestUtils.MAX_TEXT_COUNT).forEach(i -> builder.append('Z'));
4235
return TextColumn.of(columnName, builder.toString());

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

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,19 @@ protected Properties getProperties(String testName) {
1717
}
1818

1919
@Override
20-
protected boolean isParallelDdlSupported() {
21-
return false;
20+
protected int getThreadNum() {
21+
return 3;
2222
}
2323

2424
@Override
25-
protected Column<?> getColumnWithMinValue(String columnName, DataType dataType) {
26-
if (dataType == DataType.TEXT && ObjectStorageEnv.isS3()) {
27-
// Since S3 and Cloud Storage can't handle "\u0001" character correctly, we use " " as the min
28-
// value
29-
return TextColumn.of(columnName, " ");
30-
}
31-
return super.getColumnWithMinValue(columnName, dataType);
25+
protected boolean isParallelDdlSupported() {
26+
return false;
3227
}
3328

3429
@Override
3530
protected Column<?> getColumnWithMaxValue(String columnName, DataType dataType) {
36-
if (dataType == DataType.TEXT
37-
&& (ObjectStorageEnv.isCloudStorage() || ObjectStorageEnv.isS3())) {
38-
// Since S3 and Cloud Storage can't handle 0xFF character correctly, we use "ZZZ..." as the
39-
// max value
31+
if (dataType == DataType.TEXT && ObjectStorageEnv.isCloudStorage()) {
32+
// Since Cloud Storage can't handle 0xFF character correctly, we use "ZZZ..." as the max value
4033
StringBuilder builder = new StringBuilder();
4134
IntStream.range(0, TestUtils.MAX_TEXT_COUNT).forEach(i -> builder.append('Z'));
4235
return TextColumn.of(columnName, builder.toString());

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

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,10 @@ protected Properties getProperties(String testName) {
1616
return ObjectStorageEnv.getProperties(testName);
1717
}
1818

19-
@Override
20-
protected Column<?> getColumnWithMinValue(String columnName, DataType dataType) {
21-
if (dataType == DataType.TEXT && ObjectStorageEnv.isS3()) {
22-
// Since S3 and Cloud Storage can't handle "\u0001" character correctly, we use " " as the min
23-
// value
24-
return TextColumn.of(columnName, " ");
25-
}
26-
return super.getColumnWithMinValue(columnName, dataType);
27-
}
28-
2919
@Override
3020
protected Column<?> getColumnWithMaxValue(String columnName, DataType dataType) {
31-
if (dataType == DataType.TEXT
32-
&& (ObjectStorageEnv.isCloudStorage() || ObjectStorageEnv.isS3())) {
33-
// Since S3 and Cloud Storage can't handle 0xFF character correctly, we use "ZZZ..." as the
34-
// max value
21+
if (dataType == DataType.TEXT && ObjectStorageEnv.isCloudStorage()) {
22+
// Since Cloud Storage can't handle 0xFF character correctly, we use "ZZZ..." as the max value
3523
StringBuilder builder = new StringBuilder();
3624
IntStream.range(0, TestUtils.MAX_TEXT_COUNT).forEach(i -> builder.append('Z'));
3725
return TextColumn.of(columnName, builder.toString());

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

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,10 @@ protected Properties getProperties(String testName) {
1616
return ObjectStorageEnv.getProperties(testName);
1717
}
1818

19-
@Override
20-
protected Column<?> getColumnWithMinValue(String columnName, DataType dataType) {
21-
if (dataType == DataType.TEXT && ObjectStorageEnv.isS3()) {
22-
// Since S3 and Cloud Storage can't handle "\u0001" character correctly, we use " " as the min
23-
// value
24-
return TextColumn.of(columnName, " ");
25-
}
26-
return super.getColumnWithMinValue(columnName, dataType);
27-
}
28-
2919
@Override
3020
protected Column<?> getColumnWithMaxValue(String columnName, DataType dataType) {
31-
if (dataType == DataType.TEXT
32-
&& (ObjectStorageEnv.isCloudStorage() || ObjectStorageEnv.isS3())) {
33-
// Since S3 and Cloud Storage can't handle 0xFF character correctly, we use "ZZZ..." as the
34-
// max value
21+
if (dataType == DataType.TEXT && ObjectStorageEnv.isCloudStorage()) {
22+
// Since Cloud Storage can't handle 0xFF character correctly, we use "ZZZ..." as the max value
3523
StringBuilder builder = new StringBuilder();
3624
IntStream.range(0, TestUtils.MAX_TEXT_COUNT).forEach(i -> builder.append('Z'));
3725
return TextColumn.of(columnName, builder.toString());

0 commit comments

Comments
 (0)