This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 f54bed0cbce Rename NativeStorageEnvironment to
NativeDatabaseEnvironment and update related properties in configuration files
(#36726)
f54bed0cbce is described below
commit f54bed0cbce7d04f0d96ac2b7ee1fd21ad07debe
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Sep 27 12:22:07 2025 +0800
Rename NativeStorageEnvironment to NativeDatabaseEnvironment and update
related properties in configuration files (#36726)
---
.../content/test-manual/integration-test/_index.cn.md | 16 ++++++++--------
.../content/test-manual/integration-test/_index.en.md | 16 ++++++++--------
.../content/test-manual/pipeline-e2e-test/_index.cn.md | 6 +++---
.../content/test-manual/pipeline-e2e-test/_index.en.md | 6 +++---
.../impl/ShardingSphereProxyEmbeddedContainer.java | 6 +++---
.../container/storage/type/NativeStorageContainer.java | 6 +++---
.../test/e2e/env/runtime/E2ETestEnvironment.java | 6 +++---
...geEnvironment.java => NativeDatabaseEnvironment.java} | 14 +++++++-------
.../pipeline/cases/PipelineContainerComposer.java | 6 +++---
.../compose/natived/PipelineNativeContainerComposer.java | 6 +++---
.../pipeline/src/test/resources/env/e2e-env.properties | 10 +++++-----
.../transaction/engine/base/TransactionBaseE2EIT.java | 6 +++---
.../src/test/resources/env/e2e-env.properties | 8 ++++----
test/e2e/sql/src/test/resources/env/e2e-env.properties | 8 ++++----
14 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/docs/document/content/test-manual/integration-test/_index.cn.md
b/docs/document/content/test-manual/integration-test/_index.cn.md
index 0be5dfe62ea..1c243f19c2a 100644
--- a/docs/document/content/test-manual/integration-test/_index.cn.md
+++ b/docs/document/content/test-manual/integration-test/_index.cn.md
@@ -107,10 +107,10 @@ SQL 用例在
`resources/cases/${SQL-TYPE}/e2e-${SQL-TYPE}-${cases-description}.
修改 `e2e-sql` 模块 `src/test/resources/env/e2e-env.properties` 文件中 `e2e.run.type`
为 `NATIVE` 模式，然后修改如下的属性为本地数据库地址和账号。
```properties
-e2e.native.storage.host=127.0.0.1
-e2e.native.storage.port=3306
-e2e.native.storage.username=root
-e2e.native.storage.password=123456
+e2e.native.database.host=127.0.0.1
+e2e.native.database.port=3306
+e2e.native.database.username=root
+e2e.native.database.password=123456
```
修改完成后，可以再调整 `e2e-env.properties` 中其他属性，测试 ShardingSphere 的 Proxy、JDBC
接入端，或者测试单机、集群模式。
@@ -172,10 +172,10 @@ e2e.artifact.databases=H2,MySQL,PostgreSQL,openGauss
e2e.artifact.database.mysql.image=mysql:8.2.0
# NATIVE 模式下数据库连接信息及账号
-e2e.native.storage.host=127.0.0.1
-e2e.native.storage.port=3306
-e2e.native.storage.username=root
-e2e.native.storage.password=123456
+e2e.native.database.host=127.0.0.1
+e2e.native.database.port=3306
+e2e.native.database.username=root
+e2e.native.database.password=123456
```
#### 运行调试模式
diff --git a/docs/document/content/test-manual/integration-test/_index.en.md
b/docs/document/content/test-manual/integration-test/_index.en.md
index 134a1590f71..4f737ff9bc5 100644
--- a/docs/document/content/test-manual/integration-test/_index.en.md
+++ b/docs/document/content/test-manual/integration-test/_index.en.md
@@ -109,10 +109,10 @@ The assertion file format is as follows:
Modify `e2e.run.type` in `src/test/resources/env/e2e-env.properties` file of
`e2e-sql` module to `NATIVE` mode, and then modify the following properties to
the local database address and account.
```properties
-e2e.native.storage.host=127.0.0.1
-e2e.native.storage.port=3306
-e2e.native.storage.username=root
-e2e.native.storage.password=123456
+e2e.native.database.host=127.0.0.1
+e2e.native.database.port=3306
+e2e.native.database.username=root
+e2e.native.database.password=123456
```
After the modification is completed, you can adjust other properties in
`e2e-env.properties` to test ShardingSphere's Proxy, JDBC access terminal, or
test the stand-alone and cluster modes.
@@ -171,10 +171,10 @@ e2e.artifact.databases=H2,MySQL,PostgreSQL,openGauss
e2e.artifact.database.mysql.image=mysql:8.2.0
# Database connection information and account in NATIVE mode
-e2e.native.storage.host=127.0.0.1
-e2e.native.storage.port=3306
-e2e.native.storage.username=root
-e2e.native.storage.password=123456
+e2e.native.database.host=127.0.0.1
+e2e.native.database.port=3306
+e2e.native.database.username=root
+e2e.native.database.password=123456
```
#### Run debugging mode
diff --git a/docs/document/content/test-manual/pipeline-e2e-test/_index.cn.md
b/docs/document/content/test-manual/pipeline-e2e-test/_index.cn.md
index e1fe3db5a3b..a5191abe850 100644
--- a/docs/document/content/test-manual/pipeline-e2e-test/_index.cn.md
+++ b/docs/document/content/test-manual/pipeline-e2e-test/_index.cn.md
@@ -65,9 +65,9 @@ Proxy 配置可以参考：
```
e2e.run.type=NATIVE
-e2e.native.storage.port=3306
-e2e.native.storage.username=root
-e2e.native.storage.password=root
+e2e.native.database.port=3306
+e2e.native.database.username=root
+e2e.native.database.password=root
```
4. 找到对应的测试类，在 IDE 启动运行。
diff --git a/docs/document/content/test-manual/pipeline-e2e-test/_index.en.md
b/docs/document/content/test-manual/pipeline-e2e-test/_index.en.md
index 3c8cc23d722..330573471bf 100644
--- a/docs/document/content/test-manual/pipeline-e2e-test/_index.en.md
+++ b/docs/document/content/test-manual/pipeline-e2e-test/_index.en.md
@@ -64,9 +64,9 @@ Refer to following files for proxy `global.yaml`
configuration:
```
e2e.run.type=NATIVE
-e2e.native.storage.port=3306
-e2e.native.storage.username=root
-e2e.native.storage.password=root
+e2e.native.database.port=3306
+e2e.native.database.username=root
+e2e.native.database.password=root
```
4. Find test class and start it on IDE.
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyEmbeddedContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyEmbeddedContainer.java
index ceedebaa934..8be150c6e9c 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyEmbeddedContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyEmbeddedContainer.java
@@ -159,15 +159,15 @@ public final class ShardingSphereProxyEmbeddedContainer
implements EmbeddedE2ECo
result.putAll(getStorageConnectionInfoMap((NativeStorageContainer) each));
}
}
- result.put("username: " + StorageContainerConstants.OPERATION_USER,
"username: " +
E2ETestEnvironment.getInstance().getNativeStorageEnvironment().getUser());
- result.put("password: " +
StorageContainerConstants.OPERATION_PASSWORD, "password: " +
E2ETestEnvironment.getInstance().getNativeStorageEnvironment().getPassword());
+ result.put("username: " + StorageContainerConstants.OPERATION_USER,
"username: " +
E2ETestEnvironment.getInstance().getNativeDatabaseEnvironment().getUser());
+ result.put("password: " +
StorageContainerConstants.OPERATION_PASSWORD, "password: " +
E2ETestEnvironment.getInstance().getNativeDatabaseEnvironment().getPassword());
return result;
}
private Map<String, String> getStorageConnectionInfoMap(final
NativeStorageContainer container) {
return container.getNetworkAliases().stream().collect(Collectors.toMap(
each -> each + ":" + container.getExposedPort(),
- each ->
E2ETestEnvironment.getInstance().getNativeStorageEnvironment().getHost() + ":"
+
E2ETestEnvironment.getInstance().getNativeStorageEnvironment().getPort(databaseType)));
+ each ->
E2ETestEnvironment.getInstance().getNativeDatabaseEnvironment().getHost() + ":"
+
E2ETestEnvironment.getInstance().getNativeDatabaseEnvironment().getPort(databaseType)));
}
private File createTempDirectory() {
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/NativeStorageContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/NativeStorageContainer.java
index 0741fd5656f..fb13d6211fc 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/NativeStorageContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/NativeStorageContainer.java
@@ -28,7 +28,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageCo
import org.apache.shardingsphere.test.e2e.env.container.util.SQLScriptUtils;
import
org.apache.shardingsphere.test.e2e.env.container.util.StorageContainerUtils;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
-import
org.apache.shardingsphere.test.e2e.env.runtime.type.NativeStorageEnvironment;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.NativeDatabaseEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.type.scenario.database.DatabaseEnvironmentManager;
import
org.apache.shardingsphere.test.e2e.env.runtime.type.scenario.path.ScenarioDataPath.Type;
@@ -46,7 +46,7 @@ import java.util.stream.Collectors;
*/
public final class NativeStorageContainer implements StorageContainer {
- private final NativeStorageEnvironment env;
+ private final NativeDatabaseEnvironment env;
private final DatabaseType databaseType;
@@ -65,7 +65,7 @@ public final class NativeStorageContainer implements
StorageContainer {
private List<String> networkAliases;
public NativeStorageContainer(final DatabaseType databaseType, final
String scenario) {
- env = E2ETestEnvironment.getInstance().getNativeStorageEnvironment();
+ env = E2ETestEnvironment.getInstance().getNativeDatabaseEnvironment();
this.databaseType = databaseType;
this.scenario = scenario;
option =
DatabaseTypedSPILoader.findService(StorageContainerOption.class,
databaseType).orElse(null);
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
index 10cac11c319..d2ecec851c9 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.env.runtime;
import lombok.Getter;
import org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment;
-import
org.apache.shardingsphere.test.e2e.env.runtime.type.NativeStorageEnvironment;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.NativeDatabaseEnvironment;
import org.apache.shardingsphere.test.e2e.env.runtime.type.RunEnvironment;
import java.util.Collection;
@@ -40,7 +40,7 @@ public final class E2ETestEnvironment {
private final ArtifactEnvironment artifactEnvironment;
- private final NativeStorageEnvironment nativeStorageEnvironment;
+ private final NativeDatabaseEnvironment nativeDatabaseEnvironment;
private E2ETestEnvironment() {
Properties props = EnvironmentPropertiesLoader.loadProperties();
@@ -48,7 +48,7 @@ public final class E2ETestEnvironment {
scenarios = EnvironmentPropertiesLoader.getListValue(props,
"e2e.scenarios");
runEnvironment = new RunEnvironment(props);
artifactEnvironment = new ArtifactEnvironment(props);
- nativeStorageEnvironment = new NativeStorageEnvironment(props);
+ nativeDatabaseEnvironment = new NativeDatabaseEnvironment(props);
}
/**
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/NativeStorageEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/NativeDatabaseEnvironment.java
similarity index 77%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/NativeStorageEnvironment.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/NativeDatabaseEnvironment.java
index 8f5aa3edfc8..e5490abdcb0 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/NativeStorageEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/NativeDatabaseEnvironment.java
@@ -27,10 +27,10 @@ import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageCo
import java.util.Properties;
/**
- * Native storage environment.
+ * Native database environment.
*/
@Getter
-public final class NativeStorageEnvironment {
+public final class NativeDatabaseEnvironment {
private final String host;
@@ -41,11 +41,11 @@ public final class NativeStorageEnvironment {
private final String password;
- public NativeStorageEnvironment(final Properties props) {
- host = props.getProperty("e2e.native.storage.host", "127.0.0.1");
- port = Integer.parseInt(props.getProperty("e2e.native.storage.port",
"0"));
- user = props.getProperty("e2e.native.storage.username",
StorageContainerConstants.OPERATION_USER);
- password = props.getProperty("e2e.native.storage.password",
StorageContainerConstants.OPERATION_PASSWORD);
+ public NativeDatabaseEnvironment(final Properties props) {
+ host = props.getProperty("e2e.native.database.host", "127.0.0.1");
+ port = Integer.parseInt(props.getProperty("e2e.native.database.port",
"0"));
+ user = props.getProperty("e2e.native.database.username",
StorageContainerConstants.OPERATION_USER);
+ password = props.getProperty("e2e.native.database.password",
StorageContainerConstants.OPERATION_PASSWORD);
}
/**
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
index 2d3bb673513..7f79a51f05f 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
@@ -132,8 +132,8 @@ public final class PipelineContainerComposer implements
AutoCloseable {
username = StorageContainerConstants.OPERATION_USER;
password = StorageContainerConstants.OPERATION_PASSWORD;
} else {
- username =
E2ETestEnvironment.getInstance().getNativeStorageEnvironment().getUser();
- password =
E2ETestEnvironment.getInstance().getNativeStorageEnvironment().getPassword();
+ username =
E2ETestEnvironment.getInstance().getNativeDatabaseEnvironment().getUser();
+ password =
E2ETestEnvironment.getInstance().getNativeDatabaseEnvironment().getPassword();
}
extraSQLCommand =
JAXB.unmarshal(Objects.requireNonNull(Thread.currentThread().getContextClassLoader().getResource(testParam.getScenario())),
ExtraSQLCommand.class);
containerComposer.start();
@@ -296,7 +296,7 @@ public final class PipelineContainerComposer implements
AutoCloseable {
}
return option.getConnectOption().getURL(host, port,
toBeConnectedDataSourceName);
}
- return option.getConnectOption().getURL("127.0.0.1",
E2ETestEnvironment.getInstance().getNativeStorageEnvironment().getPort(databaseType),
databaseName);
+ return option.getConnectOption().getURL("127.0.0.1",
E2ETestEnvironment.getInstance().getNativeDatabaseEnvironment().getPort(databaseType),
databaseName);
}
/**
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/natived/PipelineNativeContainerComposer.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/natived/PipelineNativeContainerComposer.java
index 5de42695ed1..04b27a66cc2 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/natived/PipelineNativeContainerComposer.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/natived/PipelineNativeContainerComposer.java
@@ -54,9 +54,9 @@ public final class PipelineNativeContainerComposer extends
PipelineBaseContainer
@SneakyThrows(SQLException.class)
@Override
public void cleanUpDatabase(final String databaseName) {
- int port = ENV.getNativeStorageEnvironment().getPort(databaseType);
- String username = ENV.getNativeStorageEnvironment().getUser();
- String password = ENV.getNativeStorageEnvironment().getPassword();
+ int port = ENV.getNativeDatabaseEnvironment().getPort(databaseType);
+ String username = ENV.getNativeDatabaseEnvironment().getUser();
+ String password = ENV.getNativeDatabaseEnvironment().getPassword();
String jdbcUrl =
dropTableOption.getJdbcUrl(DatabaseTypedSPILoader.getService(StorageContainerOption.class,
databaseType).getConnectOption(), port, databaseName);
try (Connection connection = DriverManager.getConnection(jdbcUrl,
username, password)) {
dropTable(connection, databaseName);
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/e2e-env.properties
b/test/e2e/operation/pipeline/src/test/resources/env/e2e-env.properties
index cbbddf5a460..6c719d21438 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/operation/pipeline/src/test/resources/env/e2e-env.properties
@@ -26,8 +26,8 @@ e2e.artifact.database.postgresql.image=
#e2e.artifact.database.opengauss.image=opengauss/opengauss:3.1.0
e2e.artifact.database.opengauss.image=
-#e2e.native.storage.port= MySQL is 3306, PostgreSQL is 5432, openGauss is 5432
-e2e.native.storage.port=3306
-#e2e.native.storage.username= MySQL is root, PostgreSQL is postgres, openGauss
is gaussdb
-e2e.native.storage.username=root
-e2e.native.storage.password=Test@9876
+#e2e.native.database.port= MySQL is 3306, PostgreSQL is 5432, openGauss is 5432
+e2e.native.database.port=3306
+#e2e.native.database.username= MySQL is root, PostgreSQL is postgres,
openGauss is gaussdb
+e2e.native.database.username=root
+e2e.native.database.password=Test@9876
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
index 947b1a2eae5..36c5b149563 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
@@ -270,8 +270,8 @@ public abstract class TransactionBaseE2EIT {
*/
public void addResource(final Connection connection, final String
databaseName, final TransactionContainerComposer containerComposer) throws
SQLException {
String addSourceResource = commonSQL.getSourceAddNewResourceTemplate()
- .replace("${user}",
ENV.getNativeStorageEnvironment().getUser())
- .replace("${password}",
ENV.getNativeStorageEnvironment().getPassword())
+ .replace("${user}",
ENV.getNativeDatabaseEnvironment().getUser())
+ .replace("${password}",
ENV.getNativeDatabaseEnvironment().getPassword())
.replace("${ds2}", getActualJdbcUrlTemplate(databaseName,
containerComposer));
executeWithLog(connection, addSourceResource);
int resourceCount = countWithLog("SHOW STORAGE UNITS FROM
sharding_db", containerComposer);
@@ -285,7 +285,7 @@ public abstract class TransactionBaseE2EIT {
DockerStorageContainer storageContainer = (DockerStorageContainer)
((TransactionDockerContainerComposer)
containerComposer.getContainerComposer()).getStorageContainer();
return
option.getURL(containerComposer.getDatabaseType().getType().toLowerCase() +
".host", storageContainer.getExposedPort(), databaseName);
}
- return option.getURL("127.0.0.1",
ENV.getNativeStorageEnvironment().getPort(containerComposer.getDatabaseType()),
databaseName);
+ return option.getURL("127.0.0.1",
ENV.getNativeDatabaseEnvironment().getPort(containerComposer.getDatabaseType()),
databaseName);
}
/**
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
b/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
index df49922aab9..897b1054e50 100644
--- a/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
@@ -37,7 +37,7 @@ e2e.artifact.database.postgresql.image=
#e2e.artifact.database.opengauss.image=opengauss/opengauss:3.1.0
e2e.artifact.database.opengauss.image=
-e2e.native.storage.host=127.0.0.1
-e2e.native.storage.port=3306
-e2e.native.storage.username=root
-e2e.native.storage.password=root
+e2e.native.database.host=127.0.0.1
+e2e.native.database.port=3306
+e2e.native.database.username=root
+e2e.native.database.password=root
diff --git a/test/e2e/sql/src/test/resources/env/e2e-env.properties
b/test/e2e/sql/src/test/resources/env/e2e-env.properties
index 91d35e2c32a..81e640b9bd3 100644
--- a/test/e2e/sql/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/sql/src/test/resources/env/e2e-env.properties
@@ -40,7 +40,7 @@ e2e.artifact.databases=
#e2e.artifact.proxy.port.bindings=63308:3308
-e2e.native.storage.host=127.0.0.1
-e2e.native.storage.port=3306
-e2e.native.storage.username=root
-e2e.native.storage.password=root
+e2e.native.database.host=127.0.0.1
+e2e.native.database.port=3306
+e2e.native.database.username=root
+e2e.native.database.password=root
