You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/11/21 03:52:36 UTC
[shardingsphere] branch master updated: Revoke super role permission at migration ci firstly and fix ci error (#22302)
This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 1222066a9ff Revoke super role permission at migration ci firstly and fix ci error (#22302)
1222066a9ff is described below
commit 1222066a9ffe95e66135640e3cad7970381442c7
Author: Xinze Guo <10...@users.noreply.github.com>
AuthorDate: Mon Nov 21 11:52:29 2022 +0800
Revoke super role permission at migration ci firstly and fix ci error (#22302)
* Fix migration ci error
* Revoke super role permission at migration ci first
* Fix ci error
* Fix CreateTableSQLGeneratorIT
* Fix openGauss ci
* Fix
---
.../integration/data/pipeline/cases/base/BaseITCase.java | 3 ++-
.../pipeline/cases/createtable/CreateTableSQLGeneratorIT.java | 9 +--------
.../scaling/src/test/resources/env/mysql/01-initdb.sql | 10 ++++++++--
.../scaling/src/test/resources/env/opengauss/01-initdb.sql | 3 ++-
.../scaling/src/test/resources/env/postgresql/01-initdb.sql | 4 ++--
5 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/test/integration-test/scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java b/test/integration-test/scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
index 88e4e2aa8ff..01ec3f7a1c6 100644
--- a/test/integration-test/scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
+++ b/test/integration-test/scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
@@ -288,7 +288,8 @@ public abstract class BaseITCase {
for (Map<String, Object> each : listJobStatus) {
assertTrue("error_message is not null", Strings.isNullOrEmpty(each.get("error_message").toString()));
actualStatus.add(each.get("status").toString());
- incrementalIdleSecondsList.add(Integer.parseInt(each.getOrDefault("incremental_idle_seconds", "0").toString()));
+ String incrementalIdleSeconds = each.get("incremental_idle_seconds").toString();
+ incrementalIdleSecondsList.add(Strings.isNullOrEmpty(incrementalIdleSeconds) ? 0 : Integer.parseInt(incrementalIdleSeconds));
}
assertFalse("status is JobStatus.PREPARING_FAILURE", actualStatus.contains(JobStatus.PREPARING_FAILURE.name()));
assertFalse("status is JobStatus.EXECUTE_INVENTORY_TASK_FAILURE", actualStatus.contains(JobStatus.EXECUTE_INVENTORY_TASK_FAILURE.name()));
diff --git a/test/integration-test/scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java b/test/integration-test/scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
index 3158d73ec18..bb5c88d4ff5 100644
--- a/test/integration-test/scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
+++ b/test/integration-test/scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
@@ -72,7 +72,7 @@ public final class CreateTableSQLGeneratorIT {
private static final String DEFAULT_SCHEMA = "public";
- private static final String DEFAULT_DATABASE = "ds";
+ private static final String DEFAULT_DATABASE = "scaling_it_0";
private static final Pattern REPLACE_LINE_SPACE = Pattern.compile("\\s*|\t|\r|\n");
@@ -118,7 +118,6 @@ public final class CreateTableSQLGeneratorIT {
@Test
public void assertGenerateCreateTableSQL() throws SQLException {
log.info("generate create table sql, parameterized: {}", parameterized);
- initData();
DataSource dataSource = storageContainer.createAccessDataSource(DEFAULT_DATABASE);
try (
Connection connection = dataSource.getConnection();
@@ -132,12 +131,6 @@ public final class CreateTableSQLGeneratorIT {
}
}
- private void initData() throws SQLException {
- try (Statement statement = storageContainer.createAccessDataSource("").getConnection().createStatement()) {
- statement.execute("CREATE DATABASE " + DEFAULT_DATABASE);
- }
- }
-
private void assertIsCorrect(final Collection<String> actualSQL, final Collection<String> expectedSQL) {
Iterator<String> expected = expectedSQL.iterator();
for (String each : actualSQL) {
diff --git a/test/integration-test/scaling/src/test/resources/env/mysql/01-initdb.sql b/test/integration-test/scaling/src/test/resources/env/mysql/01-initdb.sql
index 02d0c5698da..cb6ceeed6af 100644
--- a/test/integration-test/scaling/src/test/resources/env/mysql/01-initdb.sql
+++ b/test/integration-test/scaling/src/test/resources/env/mysql/01-initdb.sql
@@ -15,12 +15,18 @@
-- limitations under the License.
--
+REVOKE ALL PRIVILEGES ON *.* FROM 'test_user'@'%';
+
CREATE DATABASE scaling_it_0;
CREATE DATABASE scaling_it_1;
CREATE DATABASE scaling_it_2;
CREATE DATABASE scaling_it_3;
CREATE DATABASE scaling_it_4;
-GRANT REPLICATION CLIENT, REPLICATION SLAVE, SELECT, INSERT, UPDATE, DELETE, INDEX ON *.* TO `test_user`@`%`;
-GRANT CREATE, DROP ON TABLE *.* TO test_user;
+GRANT REPLICATION CLIENT, REPLICATION SLAVE ON *.* TO `test_user`@`%`;
+GRANT CREATE, DROP, SELECT, INSERT, UPDATE, DELETE, INDEX ON scaling_it_0.* TO `test_user`@`%`;
+GRANT CREATE, DROP, SELECT, INSERT, UPDATE, DELETE, INDEX ON scaling_it_1.* TO `test_user`@`%`;
+GRANT CREATE, DROP, SELECT, INSERT, UPDATE, DELETE, INDEX ON scaling_it_2.* TO `test_user`@`%`;
+GRANT CREATE, DROP, SELECT, INSERT, UPDATE, DELETE, INDEX ON scaling_it_3.* TO `test_user`@`%`;
+GRANT CREATE, DROP, SELECT, INSERT, UPDATE, DELETE, INDEX ON scaling_it_4.* TO `test_user`@`%`;
ALTER USER `test_user`@`%` IDENTIFIED WITH mysql_native_password by 'Test@123';
diff --git a/test/integration-test/scaling/src/test/resources/env/opengauss/01-initdb.sql b/test/integration-test/scaling/src/test/resources/env/opengauss/01-initdb.sql
index 62ce620fa4d..7e1214847eb 100644
--- a/test/integration-test/scaling/src/test/resources/env/opengauss/01-initdb.sql
+++ b/test/integration-test/scaling/src/test/resources/env/opengauss/01-initdb.sql
@@ -15,12 +15,13 @@
-- limitations under the License.
--
+ALTER USER test_user NOSYSADMIN;
+ALTER USER test_user REPLICATION;
CREATE DATABASE scaling_it_0;
CREATE DATABASE scaling_it_1;
CREATE DATABASE scaling_it_2;
CREATE DATABASE scaling_it_3;
CREATE DATABASE scaling_it_4;
-
GRANT CREATE, CONNECT ON DATABASE scaling_it_0 TO test_user;
GRANT CREATE, CONNECT ON DATABASE scaling_it_1 TO test_user;
GRANT CREATE, CONNECT ON DATABASE scaling_it_2 TO test_user;
diff --git a/test/integration-test/scaling/src/test/resources/env/postgresql/01-initdb.sql b/test/integration-test/scaling/src/test/resources/env/postgresql/01-initdb.sql
index bd8f263008e..0d181f5ac1a 100644
--- a/test/integration-test/scaling/src/test/resources/env/postgresql/01-initdb.sql
+++ b/test/integration-test/scaling/src/test/resources/env/postgresql/01-initdb.sql
@@ -14,13 +14,13 @@
-- See the License for the specific language governing permissions and
-- limitations under the License.
+ALTER USER test_user NOSUPERUSER;
+ALTER USER test_user REPLICATION;
CREATE DATABASE scaling_it_0;
CREATE DATABASE scaling_it_1;
CREATE DATABASE scaling_it_2;
CREATE DATABASE scaling_it_3;
CREATE DATABASE scaling_it_4;
-CREATE DATABASE scaling;
-
GRANT CREATE, CONNECT ON DATABASE scaling_it_0 TO test_user;
GRANT CREATE, CONNECT ON DATABASE scaling_it_1 TO test_user;
GRANT CREATE, CONNECT ON DATABASE scaling_it_2 TO test_user;