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 9b7c054351f Rename 00-common-init-authority.sql and
99-common-check-ready.sql (#36512)
9b7c054351f is described below
commit 9b7c054351f2ba84672da95080574fd46810574d
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Sep 9 23:48:23 2025 +0800
Rename 00-common-init-authority.sql and 99-common-check-ready.sql (#36512)
* Rename 00-common-init-authority.sql and 99-common-check-ready.sql
* Rename 00-common-init-authority.sql and 99-common-check-ready.sql
---
.../e2e/env/container/atomic/storage/DockerStorageContainer.java | 8 ++++----
.../{00-init-authority.sql => 00-common-init-authority.sql} | 0
.../init-sql/{99-be-ready.sql => 99-common-check-ready.sql} | 0
.../{00-init-authority.sql => 00-common-init-authority.sql} | 0
.../mysql/init-sql/{99-be-ready.sql => 99-common-check-ready.sql} | 0
.../{00-init-authority.sql => 00-common-init-authority.sql} | 0
.../init-sql/{99-be-ready.sql => 99-common-check-ready.sql} | 0
.../{00-init-authority.sql => 00-common-init-authority.sql} | 0
.../init-sql/{99-be-ready.sql => 99-common-check-ready.sql} | 0
9 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/DockerStorageContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/DockerStorageContainer.java
index 1178e2e6452..0d701813aad 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/DockerStorageContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/DockerStorageContainer.java
@@ -44,11 +44,11 @@ import java.util.stream.Collectors;
@Getter
public abstract class DockerStorageContainer extends DockerITContainer
implements StorageContainer {
- private static final String READY_USER = "ready_user";
+ private static final Collection<String> TO_BE_MOUNTED_COMMON_SQL_FILES =
Arrays.asList("00-common-init-authority.sql", "99-common-check-ready.sql");
- private static final String READY_USER_PASSWORD = "Ready@123";
+ private static final String CHECK_READY_USER = "ready_user";
- private static final Collection<String> TO_BE_MOUNTED_COMMON_SQL_FILES =
Arrays.asList("00-init-authority.sql", "99-be-ready.sql");
+ private static final String CHECK_READY_PASSWORD = "Ready@123";
private final DatabaseType databaseType;
@@ -67,7 +67,7 @@ public abstract class DockerStorageContainer extends
DockerITContainer implement
findToBeMountedCommonSQLFile(each).ifPresent(optional ->
withClasspathResourceMapping(optional, "/docker-entrypoint-initdb.d/" + each,
BindMode.READ_ONLY));
}
withExposedPorts(getExposedPort());
- setWaitStrategy(new JdbcConnectionWaitStrategy(() ->
DriverManager.getConnection(getURL(), READY_USER, READY_USER_PASSWORD)));
+ setWaitStrategy(new JdbcConnectionWaitStrategy(() ->
DriverManager.getConnection(getURL(), CHECK_READY_USER, CHECK_READY_PASSWORD)));
}
private Optional<String> findToBeMountedCommonSQLFile(final String
toBeMountedSQLFile) {
diff --git
a/test/e2e/env/src/test/resources/container/mariadb/init-sql/00-init-authority.sql
b/test/e2e/env/src/test/resources/container/mariadb/init-sql/00-common-init-authority.sql
similarity index 100%
rename from
test/e2e/env/src/test/resources/container/mariadb/init-sql/00-init-authority.sql
rename to
test/e2e/env/src/test/resources/container/mariadb/init-sql/00-common-init-authority.sql
diff --git
a/test/e2e/env/src/test/resources/container/mariadb/init-sql/99-be-ready.sql
b/test/e2e/env/src/test/resources/container/mariadb/init-sql/99-common-check-ready.sql
similarity index 100%
rename from
test/e2e/env/src/test/resources/container/mariadb/init-sql/99-be-ready.sql
rename to
test/e2e/env/src/test/resources/container/mariadb/init-sql/99-common-check-ready.sql
diff --git
a/test/e2e/env/src/test/resources/container/mysql/init-sql/00-init-authority.sql
b/test/e2e/env/src/test/resources/container/mysql/init-sql/00-common-init-authority.sql
similarity index 100%
rename from
test/e2e/env/src/test/resources/container/mysql/init-sql/00-init-authority.sql
rename to
test/e2e/env/src/test/resources/container/mysql/init-sql/00-common-init-authority.sql
diff --git
a/test/e2e/env/src/test/resources/container/mysql/init-sql/99-be-ready.sql
b/test/e2e/env/src/test/resources/container/mysql/init-sql/99-common-check-ready.sql
similarity index 100%
rename from
test/e2e/env/src/test/resources/container/mysql/init-sql/99-be-ready.sql
rename to
test/e2e/env/src/test/resources/container/mysql/init-sql/99-common-check-ready.sql
diff --git
a/test/e2e/env/src/test/resources/container/opengauss/init-sql/00-init-authority.sql
b/test/e2e/env/src/test/resources/container/opengauss/init-sql/00-common-init-authority.sql
similarity index 100%
rename from
test/e2e/env/src/test/resources/container/opengauss/init-sql/00-init-authority.sql
rename to
test/e2e/env/src/test/resources/container/opengauss/init-sql/00-common-init-authority.sql
diff --git
a/test/e2e/env/src/test/resources/container/opengauss/init-sql/99-be-ready.sql
b/test/e2e/env/src/test/resources/container/opengauss/init-sql/99-common-check-ready.sql
similarity index 100%
rename from
test/e2e/env/src/test/resources/container/opengauss/init-sql/99-be-ready.sql
rename to
test/e2e/env/src/test/resources/container/opengauss/init-sql/99-common-check-ready.sql
diff --git
a/test/e2e/env/src/test/resources/container/postgresql/init-sql/00-init-authority.sql
b/test/e2e/env/src/test/resources/container/postgresql/init-sql/00-common-init-authority.sql
similarity index 100%
rename from
test/e2e/env/src/test/resources/container/postgresql/init-sql/00-init-authority.sql
rename to
test/e2e/env/src/test/resources/container/postgresql/init-sql/00-common-init-authority.sql
diff --git
a/test/e2e/env/src/test/resources/container/postgresql/init-sql/99-be-ready.sql
b/test/e2e/env/src/test/resources/container/postgresql/init-sql/99-common-check-ready.sql
similarity index 100%
rename from
test/e2e/env/src/test/resources/container/postgresql/init-sql/99-be-ready.sql
rename to
test/e2e/env/src/test/resources/container/postgresql/init-sql/99-common-check-ready.sql
