Skip to content

Commit 7e9a377

Browse files
authored
Merge branch 'master' into improve-logging-in-consensus-commit
2 parents 5ea0c84 + 14db577 commit 7e9a377

File tree

35 files changed

+1892
-1796
lines changed

35 files changed

+1892
-1796
lines changed

.github/workflows/manual-vuln-check.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ jobs:
1010
uses: ./.github/workflows/vuln-check.yaml
1111
with:
1212
target-ref: ${{ github.ref_name }}
13-
secrets:
14-
CR_PAT: ${{ secrets.CR_PAT }}

.github/workflows/scheduled-vuln-check.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ jobs:
1313
with:
1414
target-ref: master
1515
secrets:
16-
CR_PAT: ${{ secrets.CR_PAT }}
1716
SLACK_SECURITY_WEBHOOK_URL: ${{ secrets.SLACK_SECURITY_WEBHOOK_URL }}
1817

1918
call-vuln-check-for-v3_13:
@@ -22,7 +21,6 @@ jobs:
2221
target-ref: v3.13
2322
find-latest-release: true
2423
secrets:
25-
CR_PAT: ${{ secrets.CR_PAT }}
2624
SLACK_SECURITY_WEBHOOK_URL: ${{ secrets.SLACK_SECURITY_WEBHOOK_URL }}
2725

2826
call-vuln-check-for-v3_14:
@@ -31,7 +29,6 @@ jobs:
3129
target-ref: v3.14
3230
find-latest-release: true
3331
secrets:
34-
CR_PAT: ${{ secrets.CR_PAT }}
3532
SLACK_SECURITY_WEBHOOK_URL: ${{ secrets.SLACK_SECURITY_WEBHOOK_URL }}
3633

3734
call-vuln-check-for-v3_15:
@@ -40,7 +37,6 @@ jobs:
4037
target-ref: v3.15
4138
find-latest-release: true
4239
secrets:
43-
CR_PAT: ${{ secrets.CR_PAT }}
4440
SLACK_SECURITY_WEBHOOK_URL: ${{ secrets.SLACK_SECURITY_WEBHOOK_URL }}
4541

4642
call-vuln-check-for-v3_16:
@@ -49,5 +45,4 @@ jobs:
4945
target-ref: v3.16
5046
find-latest-release: true
5147
secrets:
52-
CR_PAT: ${{ secrets.CR_PAT }}
5348
SLACK_SECURITY_WEBHOOK_URL: ${{ secrets.SLACK_SECURITY_WEBHOOK_URL }}

.github/workflows/vuln-check.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ on:
1414
type: boolean
1515
default: false
1616
secrets:
17-
CR_PAT:
18-
required: true
1917
SLACK_SECURITY_WEBHOOK_URL:
2018
required: false
2119

@@ -28,5 +26,4 @@ jobs:
2826
images: '[["ScalarDB Schema Loader", "scalardb-schema-loader"], ["ScalarDB Data Loader CLI", "scalardb-data-loader-cli"]]'
2927
version-command: "./gradlew :core:properties -q | grep version: | awk '{print $2}'"
3028
secrets:
31-
CR_PAT: ${{ secrets.CR_PAT }}
3229
SLACK_SECURITY_WEBHOOK_URL: ${{ secrets.SLACK_SECURITY_WEBHOOK_URL }}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package com.scalar.db.storage.cassandra;
2+
3+
import com.scalar.db.api.DistributedStorageAdminCaseSensitivityIntegrationTestBase;
4+
import com.scalar.db.util.AdminTestUtils;
5+
import java.util.Collections;
6+
import java.util.Map;
7+
import java.util.Properties;
8+
9+
public class CassandraAdminCaseSensitivityIntegrationTest
10+
extends DistributedStorageAdminCaseSensitivityIntegrationTestBase {
11+
@Override
12+
protected Properties getProperties(String testName) {
13+
return CassandraEnv.getProperties(testName);
14+
}
15+
16+
@Override
17+
protected Map<String, String> getCreationOptions() {
18+
return Collections.singletonMap(CassandraAdmin.REPLICATION_FACTOR, "1");
19+
}
20+
21+
@Override
22+
protected AdminTestUtils getAdminTestUtils(String testName) {
23+
return new CassandraAdminTestUtils(getProperties(testName));
24+
}
25+
26+
@Override
27+
protected boolean isTimestampTypeSupported() {
28+
return false;
29+
}
30+
}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.scalar.db.storage.cassandra;
2+
3+
import com.scalar.db.api.DistributedStorageCaseSensitivityIntegrationTestBase;
4+
import java.util.Collections;
5+
import java.util.Map;
6+
import java.util.Properties;
7+
import org.junit.jupiter.api.Disabled;
8+
import org.junit.jupiter.api.Test;
9+
10+
public class CassandraCaseSensitivityIntegrationTest
11+
extends DistributedStorageCaseSensitivityIntegrationTestBase {
12+
@Override
13+
protected Properties getProperties(String testName) {
14+
return CassandraEnv.getProperties(testName);
15+
}
16+
17+
@Override
18+
protected Map<String, String> getCreationOptions() {
19+
return Collections.singletonMap(CassandraAdmin.REPLICATION_FACTOR, "1");
20+
}
21+
22+
@Disabled(
23+
"In Cassandra, if an IS NULL condition is specified for a column in a non-existing record, "
24+
+ "the condition is considered satisfied. This behavior differs from that of other adapters")
25+
@Override
26+
@Test
27+
public void put_withPutIfIsNullWhenRecordDoesNotExist_shouldThrowNoMutationException() {}
28+
}

core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraWithReservedKeywordIntegrationTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import java.util.Collections;
55
import java.util.Map;
66
import java.util.Properties;
7+
import org.junit.jupiter.api.Disabled;
8+
import org.junit.jupiter.api.Test;
79

810
public class CassandraWithReservedKeywordIntegrationTest
911
extends DistributedStorageWithReservedKeywordIntegrationTestBase {
@@ -58,4 +60,11 @@ protected String getColumnName5() {
5860
protected Properties getProperties(String testName) {
5961
return CassandraEnv.getProperties(testName);
6062
}
63+
64+
@Disabled(
65+
"In Cassandra, if an IS NULL condition is specified for a column in a non-existing record, "
66+
+ "the condition is considered satisfied. This behavior differs from that of other adapters")
67+
@Override
68+
@Test
69+
public void put_withPutIfIsNullWhenRecordDoesNotExist_shouldThrowNoMutationException() {}
6170
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.scalar.db.storage.cosmos;
2+
3+
import com.scalar.db.api.DistributedStorageAdminCaseSensitivityIntegrationTestBase;
4+
import com.scalar.db.util.AdminTestUtils;
5+
import java.util.Map;
6+
import java.util.Properties;
7+
8+
public class CosmosAdminCaseSensitivityIntegrationTest
9+
extends DistributedStorageAdminCaseSensitivityIntegrationTestBase {
10+
11+
@Override
12+
protected Properties getProperties(String testName) {
13+
return CosmosEnv.getProperties(testName);
14+
}
15+
16+
@Override
17+
protected Map<String, String> getCreationOptions() {
18+
return CosmosEnv.getCreationOptions();
19+
}
20+
21+
@Override
22+
protected AdminTestUtils getAdminTestUtils(String testName) {
23+
return new CosmosAdminTestUtils(getProperties(testName));
24+
}
25+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.scalar.db.storage.cosmos;
2+
3+
import com.scalar.db.api.DistributedStorageCaseSensitivityIntegrationTestBase;
4+
import java.util.Map;
5+
import java.util.Properties;
6+
7+
public class CosmosCaseSensitivityIntegrationTest
8+
extends DistributedStorageCaseSensitivityIntegrationTestBase {
9+
10+
@Override
11+
protected Properties getProperties(String testName) {
12+
return CosmosEnv.getProperties(testName);
13+
}
14+
15+
@Override
16+
protected Map<String, String> getCreationOptions() {
17+
return CosmosEnv.getCreationOptions();
18+
}
19+
}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package com.scalar.db.storage.dynamo;
2+
3+
import com.scalar.db.api.DistributedStorageAdminCaseSensitivityIntegrationTestBase;
4+
import com.scalar.db.util.AdminTestUtils;
5+
import java.util.Map;
6+
import java.util.Properties;
7+
8+
public class DynamoAdminCaseSensitivityIntegrationTest
9+
extends DistributedStorageAdminCaseSensitivityIntegrationTestBase {
10+
11+
@Override
12+
protected Properties getProperties(String testName) {
13+
return DynamoEnv.getProperties(testName);
14+
}
15+
16+
@Override
17+
protected Map<String, String> getCreationOptions() {
18+
return DynamoEnv.getCreationOptions();
19+
}
20+
21+
@Override
22+
protected boolean isIndexOnBooleanColumnSupported() {
23+
return false;
24+
}
25+
26+
@Override
27+
protected AdminTestUtils getAdminTestUtils(String testName) {
28+
return new DynamoAdminTestUtils(getProperties(testName));
29+
}
30+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.scalar.db.storage.dynamo;
2+
3+
import com.scalar.db.api.DistributedStorageCaseSensitivityIntegrationTestBase;
4+
import java.util.Map;
5+
import java.util.Properties;
6+
import org.junit.jupiter.api.Disabled;
7+
8+
public class DynamoCaseSensitivityIntegrationTest
9+
extends DistributedStorageCaseSensitivityIntegrationTestBase {
10+
11+
@Override
12+
protected Properties getProperties(String testName) {
13+
return DynamoEnv.getProperties(testName);
14+
}
15+
16+
@Override
17+
protected Map<String, String> getCreationOptions() {
18+
return DynamoEnv.getCreationOptions();
19+
}
20+
21+
@Disabled("DynamoDB doesn't support putting a null value for a secondary index column")
22+
@Override
23+
public void put_PutGivenForIndexedColumnWithNullValue_ShouldPut() {}
24+
}

0 commit comments

Comments
 (0)