You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2022/07/23 22:20:52 UTC
[shardingsphere] branch master updated: Refactor EmbeddedStorageContainer (#19496)
This is an automated email from the ASF dual-hosted git repository.
menghaoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new bb105c35cf3 Refactor EmbeddedStorageContainer (#19496)
bb105c35cf3 is described below
commit bb105c35cf3328440c8ec48c204dd337753931ea
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Jul 24 06:20:38 2022 +0800
Refactor EmbeddedStorageContainer (#19496)
---
...eryAndPlainInsertColumnsTokenGeneratorTest.java | 31 ++++++++++------------
.../atomic/storage/EmbeddedStorageContainer.java | 5 ++++
.../atomic/storage/StorageContainerFactory.java | 5 +++-
.../container/atomic/storage/impl/H2Container.java | 5 ----
.../env/enums/TransactionITEnvTypeEnum.java | 2 +-
5 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/AssistQueryAndPlainInsertColumnsTokenGeneratorTest.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/AssistQueryAndPlainInsertColumnsTokenGeneratorTest.java
index 0f5117334fb..a500d4a2ca5 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/AssistQueryAndPlainInsertColumnsTokenGeneratorTest.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/AssistQueryAndPlainInsertColumnsTokenGeneratorTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.encrypt.rewrite.token;
-import java.util.Iterator;
import org.apache.shardingsphere.encrypt.rewrite.token.generator.AssistQueryAndPlainInsertColumnsTokenGenerator;
import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import org.apache.shardingsphere.encrypt.rule.EncryptTable;
@@ -31,6 +30,7 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.util.Collection;
import java.util.Collections;
+import java.util.Iterator;
import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
@@ -42,48 +42,45 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
-public class AssistQueryAndPlainInsertColumnsTokenGeneratorTest {
-
+public final class AssistQueryAndPlainInsertColumnsTokenGeneratorTest {
+
@Test
public void assertIsNotGenerateSQLTokenWithNotInsertStatementContext() {
assertFalse(new AssistQueryAndPlainInsertColumnsTokenGenerator().isGenerateSQLToken(mock(SQLStatementContext.class)));
}
-
+
@Test
public void assertIsNotGenerateSQLTokenWithoutInsertColumns() {
- InsertStatementContext insertStatementContext = mock(InsertStatementContext.class, RETURNS_DEEP_STUBS);
- assertFalse(new AssistQueryAndPlainInsertColumnsTokenGenerator().isGenerateSQLToken(insertStatementContext));
+ assertFalse(new AssistQueryAndPlainInsertColumnsTokenGenerator().isGenerateSQLToken(mock(InsertStatementContext.class, RETURNS_DEEP_STUBS)));
}
-
+
@Test
public void assertIsGenerateSQLTokenWithInsertColumns() {
InsertStatementContext insertStatementContext = mock(InsertStatementContext.class, RETURNS_DEEP_STUBS);
when(insertStatementContext.containsInsertColumns()).thenReturn(true);
assertTrue(new AssistQueryAndPlainInsertColumnsTokenGenerator().isGenerateSQLToken(insertStatementContext));
}
-
+
@Test
public void assertGenerateSQLTokensNotContainColumns() {
AssistQueryAndPlainInsertColumnsTokenGenerator tokenGenerator = new AssistQueryAndPlainInsertColumnsTokenGenerator();
tokenGenerator.setEncryptRule(mockEncryptRule());
InsertStatementContext insertStatementContext = mock(InsertStatementContext.class, RETURNS_DEEP_STUBS);
when(insertStatementContext.getSqlStatement().getTable().getTableName().getIdentifier().getValue()).thenReturn("foo_tbl");
- Collection<InsertColumnsToken> actual = tokenGenerator.generateSQLTokens(insertStatementContext);
- assertTrue(actual.isEmpty());
+ assertTrue(tokenGenerator.generateSQLTokens(insertStatementContext).isEmpty());
}
-
+
@Test
public void assertGenerateSQLTokensNotExistColumns() {
AssistQueryAndPlainInsertColumnsTokenGenerator tokenGenerator = new AssistQueryAndPlainInsertColumnsTokenGenerator();
tokenGenerator.setEncryptRule(mockEncryptRule());
- InsertStatementContext insertStatementContext = mockInsertStatementContext();
ColumnSegment columnSegment = mock(ColumnSegment.class, RETURNS_DEEP_STUBS);
when(columnSegment.getIdentifier().getValue()).thenReturn("bar_col");
+ InsertStatementContext insertStatementContext = mockInsertStatementContext();
when(insertStatementContext.getSqlStatement().getColumns()).thenReturn(Collections.singleton(columnSegment));
- Collection<InsertColumnsToken> actual = tokenGenerator.generateSQLTokens(insertStatementContext);
- assertTrue(actual.isEmpty());
+ assertTrue(tokenGenerator.generateSQLTokens(insertStatementContext).isEmpty());
}
-
+
@Test
public void assertGenerateSQLTokensExistColumns() {
AssistQueryAndPlainInsertColumnsTokenGenerator tokenGenerator = new AssistQueryAndPlainInsertColumnsTokenGenerator();
@@ -94,7 +91,7 @@ public class AssistQueryAndPlainInsertColumnsTokenGeneratorTest {
InsertColumnsToken insertColumnsToken = iterator.next();
assertThat(insertColumnsToken.getStartIndex(), is(1));
}
-
+
private EncryptRule mockEncryptRule() {
EncryptRule result = mock(EncryptRule.class);
EncryptTable encryptTable = mock(EncryptTable.class);
@@ -103,7 +100,7 @@ public class AssistQueryAndPlainInsertColumnsTokenGeneratorTest {
when(result.findEncryptTable("foo_tbl")).thenReturn(Optional.of(encryptTable));
return result;
}
-
+
private InsertStatementContext mockInsertStatementContext() {
InsertStatementContext result = mock(InsertStatementContext.class, RETURNS_DEEP_STUBS);
when(result.getSqlStatement().getTable().getTableName().getIdentifier().getValue()).thenReturn("foo_tbl");
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/EmbeddedStorageContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/EmbeddedStorageContainer.java
index e5bb38b9e73..b1f0f70eb33 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/EmbeddedStorageContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/EmbeddedStorageContainer.java
@@ -79,4 +79,9 @@ public abstract class EmbeddedStorageContainer implements EmbeddedITContainer, S
result.setTransactionIsolation("TRANSACTION_READ_COMMITTED");
return result;
}
+
+ @Override
+ public final String getAbbreviation() {
+ return databaseType.getType().toLowerCase();
+ }
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/StorageContainerFactory.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/StorageContainerFactory.java
index 9a26723b518..a78e3a856c7 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/StorageContainerFactory.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/StorageContainerFactory.java
@@ -22,6 +22,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.integration.env.container.atomic.storage.impl.H2Container;
import org.apache.shardingsphere.test.integration.env.container.atomic.storage.impl.MySQLContainer;
+import org.apache.shardingsphere.test.integration.env.container.atomic.storage.impl.OpenGaussContainer;
import org.apache.shardingsphere.test.integration.env.container.atomic.storage.impl.PostgreSQLContainer;
/**
@@ -43,10 +44,12 @@ public final class StorageContainerFactory {
return new MySQLContainer(scenario);
case "PostgreSQL":
return new PostgreSQLContainer(scenario);
+ case "openGauss":
+ return new OpenGaussContainer(scenario);
case "H2":
return new H2Container(scenario);
default:
- throw new RuntimeException(String.format("Database [%s] is unknown.", databaseType.getType()));
+ throw new RuntimeException(String.format("Database `%s` is unknown.", databaseType.getType()));
}
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/H2Container.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/H2Container.java
index b0162b97934..3e75f674b0d 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/H2Container.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/storage/impl/H2Container.java
@@ -74,9 +74,4 @@ public final class H2Container extends EmbeddedStorageContainer {
RunScript.execute(connection, reader);
}
}
-
- @Override
- public String getAbbreviation() {
- return "h2";
- }
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/env/enums/TransactionITEnvTypeEnum.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/env/enums/TransactionITEnvTypeEnum.java
index b3ac01047ee..af258133855 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/env/enums/TransactionITEnvTypeEnum.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/env/enums/TransactionITEnvTypeEnum.java
@@ -19,5 +19,5 @@ package org.apache.shardingsphere.integration.transaction.env.enums;
public enum TransactionITEnvTypeEnum {
- NONE, DOCKER, NATIVE;
+ NONE, DOCKER, NATIVE
}