-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Backport to branch(3.12) : Remove hard-coded collation in JDBC adapter (
- Loading branch information
Showing
9 changed files
with
377 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
...tegration-test/java/com/scalar/db/storage/cassandra/CassandraJapaneseIntegrationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
package com.scalar.db.storage.cassandra; | ||
|
||
import com.scalar.db.api.DistributedStorageJapaneseIntegrationTestBase; | ||
import java.util.Collections; | ||
import java.util.Map; | ||
import java.util.Properties; | ||
|
||
public class CassandraJapaneseIntegrationTest | ||
extends DistributedStorageJapaneseIntegrationTestBase { | ||
@Override | ||
protected Properties getProperties(String testName) { | ||
return CassandraEnv.getProperties(testName); | ||
} | ||
|
||
@Override | ||
protected Map<String, String> getCreationOptions() { | ||
return Collections.singletonMap(CassandraAdmin.REPLICATION_FACTOR, "1"); | ||
} | ||
} |
26 changes: 26 additions & 0 deletions
26
...src/integration-test/java/com/scalar/db/storage/cosmos/CosmosJapaneseIntegrationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
package com.scalar.db.storage.cosmos; | ||
|
||
import com.scalar.db.api.DistributedStorageJapaneseIntegrationTestBase; | ||
import java.util.Map; | ||
import java.util.Optional; | ||
import java.util.Properties; | ||
|
||
public class CosmosJapaneseIntegrationTest extends DistributedStorageJapaneseIntegrationTestBase { | ||
|
||
@Override | ||
protected Properties getProperties(String testName) { | ||
return CosmosEnv.getProperties(testName); | ||
} | ||
|
||
@Override | ||
protected String getNamespace() { | ||
String namespace = super.getNamespace(); | ||
Optional<String> databasePrefix = CosmosEnv.getDatabasePrefix(); | ||
return databasePrefix.map(prefix -> prefix + namespace).orElse(namespace); | ||
} | ||
|
||
@Override | ||
protected Map<String, String> getCreationOptions() { | ||
return CosmosEnv.getCreationOptions(); | ||
} | ||
} |
18 changes: 18 additions & 0 deletions
18
...src/integration-test/java/com/scalar/db/storage/dynamo/DynamoJapaneseIntegrationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package com.scalar.db.storage.dynamo; | ||
|
||
import com.scalar.db.api.DistributedStorageJapaneseIntegrationTestBase; | ||
import java.util.Map; | ||
import java.util.Properties; | ||
|
||
public class DynamoJapaneseIntegrationTest extends DistributedStorageJapaneseIntegrationTestBase { | ||
|
||
@Override | ||
protected Properties getProperties(String testName) { | ||
return DynamoEnv.getProperties(testName); | ||
} | ||
|
||
@Override | ||
protected Map<String, String> getCreationOptions() { | ||
return DynamoEnv.getCreationOptions(); | ||
} | ||
} |
13 changes: 13 additions & 0 deletions
13
...integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseJapaneseIntegrationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package com.scalar.db.storage.jdbc; | ||
|
||
import com.scalar.db.api.DistributedStorageJapaneseIntegrationTestBase; | ||
import java.util.Properties; | ||
|
||
public class JdbcDatabaseJapaneseIntegrationTest | ||
extends DistributedStorageJapaneseIntegrationTestBase { | ||
|
||
@Override | ||
protected Properties getProperties(String testName) { | ||
return JdbcEnv.getProperties(testName); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.