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 fd8cb31a336 Delete unused ExtraSQLCommand and related XML (#37891)
fd8cb31a336 is described below
commit fd8cb31a3369a04dc471e3c0d3816704ead8c38c
Author: Hongsheng Zhong <[email protected]>
AuthorDate: Fri Jan 30 13:30:04 2026 +0800
Delete unused ExtraSQLCommand and related XML (#37891)
* Delete ExtraSQLCommand
* Delete env/common/none.xml
* Delete env/scenario/general/ xml
* Delete env/scenario/primary_key/text_primary_key/ xml
---
.../pipeline/cases/PipelineContainerComposer.java | 8 --
.../pipeline/command/ExtraSQLCommand.java | 67 -----------------
.../src/test/resources/env/common/none.xml | 19 -----
.../test/resources/env/scenario/general/mysql.xml | 77 -------------------
.../resources/env/scenario/general/opengauss.xml | 87 ----------------------
.../resources/env/scenario/general/postgresql.xml | 78 -------------------
.../primary_key/text_primary_key/mysql.xml | 28 -------
.../primary_key/text_primary_key/postgresql.xml | 26 -------
8 files changed, 390 deletions(-)
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 b75f3c91966..e571ebfb887 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
@@ -49,7 +49,6 @@ import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStora
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.RunEnvironment.Type;
-import
org.apache.shardingsphere.test.e2e.operation.pipeline.command.ExtraSQLCommand;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.framework.container.compose.PipelineBaseContainerComposer;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.framework.container.compose.docker.PipelineDockerContainerComposer;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.framework.container.compose.natived.PipelineNativeContainerComposer;
@@ -58,7 +57,6 @@ import
org.apache.shardingsphere.test.e2e.operation.pipeline.util.ProxyDatabaseT
import org.awaitility.Awaitility;
import javax.sql.DataSource;
-import javax.xml.bind.JAXB;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
@@ -72,7 +70,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -105,8 +102,6 @@ public final class PipelineContainerComposer implements
AutoCloseable {
private final PipelineBaseContainerComposer containerComposer;
- private final ExtraSQLCommand extraSQLCommand;
-
private final DatabaseType databaseType;
private final String username;
@@ -132,9 +127,6 @@ public final class PipelineContainerComposer implements
AutoCloseable {
username =
E2ETestEnvironment.getInstance().getNativeDatabaseEnvironment().getUser();
password =
E2ETestEnvironment.getInstance().getNativeDatabaseEnvironment().getPassword();
}
- extraSQLCommand = null != testParam.getScenario()
- ?
JAXB.unmarshal(Objects.requireNonNull(Thread.currentThread().getContextClassLoader().getResource(testParam.getScenario())),
ExtraSQLCommand.class)
- : null;
containerComposer.start();
sourceDataSource =
StorageContainerUtils.generateDataSource(getActualJdbcUrlTemplate(DS_0, false),
username, password, 2);
proxyDataSource = StorageContainerUtils.generateDataSource(
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/command/ExtraSQLCommand.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/command/ExtraSQLCommand.java
deleted file mode 100644
index 34abbce949b..00000000000
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/command/ExtraSQLCommand.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.e2e.operation.pipeline.command;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "command")
-@XmlAccessorType(XmlAccessType.FIELD)
-@Setter
-public final class ExtraSQLCommand {
-
- @XmlElement(name = "create-table-order")
- private String createTableOrder;
-
- @XmlElement(name = "create-table-order-item")
- @Getter
- private String createTableOrderItem;
-
- @XmlElement(name = "full-insert-order")
- private String fullInsertOrder;
-
- @XmlElement(name = "full-insert-order-item")
- @Getter
- // TODO Delete
- private String fullInsertOrderItem;
-
- /**
- * Get full insert order sql.
- *
- * @param orderTableName order table name
- * @return migration single table DistSQL
- */
- public String getFullInsertOrder(final String orderTableName) {
- return String.format(fullInsertOrder, orderTableName);
- }
-
- /**
- * Get create table order.
- *
- * @param orderTableName order table name
- * @return Get create table order sql
- */
- public String getCreateTableOrder(final String orderTableName) {
- return String.format(createTableOrder, orderTableName);
- }
-}
diff --git a/test/e2e/operation/pipeline/src/test/resources/env/common/none.xml
b/test/e2e/operation/pipeline/src/test/resources/env/common/none.xml
deleted file mode 100644
index ce00c632cb3..00000000000
--- a/test/e2e/operation/pipeline/src/test/resources/env/common/none.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<!-- TODO remove it later -->
-<command>
-</command>
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/scenario/general/mysql.xml
b/test/e2e/operation/pipeline/src/test/resources/env/scenario/general/mysql.xml
deleted file mode 100644
index b6cce175614..00000000000
---
a/test/e2e/operation/pipeline/src/test/resources/env/scenario/general/mysql.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<command>
- <create-table-order>
- CREATE TABLE `%s` (
- `order_id` bigint NOT NULL,
- `user_id` int NOT NULL,
- `status` varchar ( 255 ) NULL,
- `t_mediumint` mediumint NULL,
- `t_smallint` smallint NULL,
- `t_tinyint` tinyint ( 3 ) NULL,
- `t_unsigned_int` int UNSIGNED NULL,
- `t_unsigned_mediumint` mediumint UNSIGNED NULL,
- `t_unsigned_smallint` smallint UNSIGNED NULL,
- `t_unsigned_tinyint` tinyint UNSIGNED NULL,
- `t_float` float NULL,
- `t_double` double NULL,
- `t_decimal` decimal ( 10, 2 ) NULL,
- `t_timestamp` timestamp(3) NULL,
- `t_datetime` datetime(6) NULL,
- `t_date` date NULL,
- `t_time` time(1) NULL,
- `t_year` year NULL,
- `t_bit` bit(32) NULL,
- `t_binary` binary(128) NULL,
- `t_varbinary` varbinary(255) NULL,
- `t_blob` blob NULL,
- `t_mediumblob` mediumblob NULL,
- `t_char` char ( 128 ) NULL,
- `t_text` text NULL,
- `t_mediumtext` mediumtext NULL,
- `t_enum` enum ('1', '2', '3') NULL,
- `t_set` set ('1', '2', '3') NULL,
- `t_json` json NULL COMMENT 'json test',
- PRIMARY KEY ( `order_id` ),
- KEY `idx_user_id` (`user_id`),
- KEY `idx_mulit` (`t_mediumint`,`t_unsigned_mediumint`)
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
- </create-table-order>
-
- <create-table-order-item>
- CREATE TABLE t_order_item (
- item_id bigint NOT NULL,
- order_id bigint NOT NULL,
- user_id int NOT NULL,
- status varchar(50) DEFAULT NULL,
- PRIMARY KEY (item_id)
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
- </create-table-order-item>
-
- <full-insert-order>
- INSERT INTO
-
%s(order_id,user_id,status,t_mediumint,t_smallint,t_tinyint,t_unsigned_int,t_unsigned_mediumint,
- t_unsigned_smallint,t_unsigned_tinyint,t_float,t_double,t_decimal,
t_timestamp,t_datetime,t_date,t_time,t_year,
-
t_bit,t_binary,t_varbinary,t_blob,t_mediumblob,t_char,t_text,t_mediumtext,t_enum,t_set,
t_json)
- VALUES
- (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
- </full-insert-order>
-
- <full-insert-order-item>
- INSERT INTO t_order_item(item_id,order_id,user_id,status)
VALUES(?,?,?,?)
- </full-insert-order-item>
-</command>
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/scenario/general/opengauss.xml
b/test/e2e/operation/pipeline/src/test/resources/env/scenario/general/opengauss.xml
deleted file mode 100644
index 87fdc0d33d3..00000000000
---
a/test/e2e/operation/pipeline/src/test/resources/env/scenario/general/opengauss.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<command>
- <create-table-order>
- create table test.t_order (
- order_id bigint,
- user_id integer,
- status character varying(50),
- c_int integer,
- c_smallint smallint,
- c_float real,
- c_double double precision,
- c_numeric numeric(10,2),
- c_boolean boolean,
- c_char character(32),
- c_text text,
- c_bytea bytea,
- c_raw bytea,
- c_date date,
- c_time time without time zone,
- c_smalldatetime smalldatetime,
- c_timestamp timestamp without time zone,
- c_timestamptz timestamp with time zone,
- c_interval interval,
- c_array integer[],
- c_json json,
- c_jsonb jsonb,
- c_uuid uuid,
- c_hash32 hash32,
- c_tsvector tsvector,
- c_tsquery tsquery,
- c_bit bit(4),
- c_int4range int4range,
- c_daterange daterange,
- c_tsrange tsrange,
- c_reltime reltime,
- c_abstime abstime,
- c_point point,
- c_lseg lseg,
- c_box box,
- c_circle circle,
- c_bitvarying bit varying(32),
- c_cidr cidr,
- c_inet inet,
- c_macaddr macaddr,
- c_hll hll(14,10,12,0),
- c_money money,
- PRIMARY KEY ( order_id )
- );
- </create-table-order>
-
- <full-insert-order>
- INSERT INTO test.t_order (
- order_id, user_id, status, c_int, c_smallint, c_float, c_double,
c_numeric, c_boolean, c_char, c_text, c_bytea, c_raw, c_date, c_time,
- c_smalldatetime, c_timestamp, c_timestamptz, c_interval, c_array,
c_json, c_jsonb, c_uuid, c_hash32, c_tsvector, c_tsquery, c_bit,
- c_int4range, c_daterange, c_tsrange, c_reltime, c_abstime, c_point,
c_lseg, c_box, c_circle, c_bitvarying, c_cidr, c_inet, c_macaddr, c_hll, c_money
- ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
- </full-insert-order>
-
- <create-table-order-item>
- CREATE TABLE test.t_order_item (
- item_id int8 NOT NULL,
- order_id int8 NOT NULL,
- user_id int4 NOT NULL,
- status varchar(50),
- PRIMARY KEY (item_id)
- )
- </create-table-order-item>
-
- <full-insert-order-item>
- INSERT INTO test.t_order_item(item_id,order_id,user_id,status)
VALUES(?,?,?,?)
- </full-insert-order-item>
-</command>
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/scenario/general/postgresql.xml
b/test/e2e/operation/pipeline/src/test/resources/env/scenario/general/postgresql.xml
deleted file mode 100644
index 1ecdbf243d0..00000000000
---
a/test/e2e/operation/pipeline/src/test/resources/env/scenario/general/postgresql.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<command>
- <create-table-order>
- CREATE TABLE test.%s (
- order_id int8 NOT NULL,
- user_id int4 NOT NULL,
- status varchar ( 50 ) NULL,
- t_int2 int2 NULL,
- t_numeric numeric(10,2) NULL,
- t_bool boolean NULL,
- t_bytea bytea NULL,
- t_char char(10) NULL,
- t_varchar varchar(128) NULL,
- t_float float4 NULL,
- t_double float8 NULL,
- t_json json NULL,
- t_jsonb jsonb NULL,
- t_text TEXT NULL,
- t_date date NULL,
- t_time TIME NULL,
- t_timestamp timestamp NULL,
- t_timestamptz timestamptz NULL,
- PRIMARY KEY ( order_id )
- )
- </create-table-order>
-
- <create-table-order-item>
- CREATE TABLE test.t_order_item (
- item_id int8 NOT NULL,
- order_id int8 NOT NULL,
- user_id int4 NOT NULL,
- status varchar(50),
- PRIMARY KEY (item_id)
- )
- </create-table-order-item>
-
- <full-insert-order>
- INSERT INTO
- test.%s(order_id,
- user_id,
- status,
- t_int2,
- t_numeric,
- t_bool,
- t_bytea,
- t_char,
- t_varchar,
- t_float,
- t_double,
- t_json,
- t_jsonb,
- t_text,
- t_date,
- t_time,
- t_timestamp,
- t_timestamptz)
- VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
- </full-insert-order>
-
- <full-insert-order-item>
- INSERT INTO test.t_order_item(item_id,order_id,user_id,status)
VALUES(?,?,?,?)
- </full-insert-order-item>
-</command>
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/scenario/primary_key/text_primary_key/mysql.xml
b/test/e2e/operation/pipeline/src/test/resources/env/scenario/primary_key/text_primary_key/mysql.xml
deleted file mode 100644
index 86a16a4203b..00000000000
---
a/test/e2e/operation/pipeline/src/test/resources/env/scenario/primary_key/text_primary_key/mysql.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<command>
- <create-table-order>
- CREATE TABLE `%s` (
- `order_id` varchar(255) NOT NULL COMMENT 'pk id',
- `user_id` INT NOT NULL,
- `status` varchar(255) NULL,
- `t_unsigned_int` int UNSIGNED NULL,
- PRIMARY KEY ( `order_id` ),
- INDEX ( `user_id` )
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
- </create-table-order>
-</command>
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/scenario/primary_key/text_primary_key/postgresql.xml
b/test/e2e/operation/pipeline/src/test/resources/env/scenario/primary_key/text_primary_key/postgresql.xml
deleted file mode 100644
index c00b3d80ec0..00000000000
---
a/test/e2e/operation/pipeline/src/test/resources/env/scenario/primary_key/text_primary_key/postgresql.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<command>
- <create-table-order>
- CREATE TABLE %s (
- order_id varchar(255) NOT NULL,
- user_id int NOT NULL,
- status varchar(255) NULL,
- PRIMARY KEY (order_id)
- )
- </create-table-order>
-</command>
