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 65011f9427b Remove useless ShardingSphereTable.putColumn (#33785)
65011f9427b is described below
commit 65011f9427b5e9f194ca3889e1afc8ee12b3606e
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Nov 25 00:02:17 2024 +0800
Remove useless ShardingSphereTable.putColumn (#33785)
* Remove useless ShardingSphereTable.putColumn
* Remove useless ShardingSphereTable.putColumn
---
.../schema/model/ShardingSphereTableTest.java | 112 +++++++++------------
...ComStmtPrepareParameterMarkerExtractorTest.java | 10 +-
2 files changed, 51 insertions(+), 71 deletions(-)
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereTableTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereTableTest.java
index b3c9b3e1464..7b70b3f6113 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereTableTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereTableTest.java
@@ -17,10 +17,10 @@
package org.apache.shardingsphere.infra.metadata.database.schema.model;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.sql.Types;
+import java.util.Arrays;
import java.util.Collections;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -33,121 +33,99 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
class ShardingSphereTableTest {
- private ShardingSphereTable shardingSphereTable;
-
- @BeforeEach
- void setUp() {
- shardingSphereTable = new ShardingSphereTable();
- }
-
- @Test
- void assertPutColumn() {
- ShardingSphereColumn column1 = new
ShardingSphereColumn("foo_column_1", Types.INTEGER, true, true, false, true,
false, false);
- ShardingSphereColumn column2 = new
ShardingSphereColumn("foo_column_2", Types.INTEGER, false, true, false, true,
false, false);
- shardingSphereTable.putColumn(column1);
- shardingSphereTable.putColumn(column2);
- assertThat(shardingSphereTable.getColumn("foo_column_1"), is(column1));
- assertThat(shardingSphereTable.getColumn("foo_column_2"), is(column2));
- assertThat(shardingSphereTable.getColumnValues(), hasSize(2));
- }
-
@Test
void assertGetColumn() {
- ShardingSphereColumn column = new ShardingSphereColumn("foo_column",
Types.INTEGER, true, true, false, true, false, false);
- shardingSphereTable.putColumn(column);
- assertThat(shardingSphereTable.getColumn("foo_column"), is(column));
- assertThat(shardingSphereTable.getColumn("FOO_COLUMN"), is(column));
+ ShardingSphereColumn column = new ShardingSphereColumn("foo_col",
Types.INTEGER, true, true, false, true, false, false);
+ ShardingSphereTable shardingSphereTable = new
ShardingSphereTable("foo_tbl", Collections.singleton(column),
Collections.emptyList(), Collections.emptyList());
+ assertThat(shardingSphereTable.getColumn("foo_col"), is(column));
+ assertThat(shardingSphereTable.getColumn("FOO_COL"), is(column));
assertNull(shardingSphereTable.getColumn("invalid"));
}
@Test
- void assertGetColumns() {
- ShardingSphereColumn column1 = new
ShardingSphereColumn("foo_column_1", Types.INTEGER, true, true, false, true,
false, false);
- ShardingSphereColumn column2 = new
ShardingSphereColumn("foo_column_2", Types.INTEGER, false, true, false, true,
false, false);
- shardingSphereTable.putColumn(column1);
- shardingSphereTable.putColumn(column2);
+ void assertGetColumnValues() {
+ ShardingSphereColumn column1 = new ShardingSphereColumn("foo_col_1",
Types.INTEGER, true, true, false, true, false, false);
+ ShardingSphereColumn column2 = new ShardingSphereColumn("foo_col_2",
Types.INTEGER, false, true, false, true, false, false);
+ ShardingSphereTable shardingSphereTable = new
ShardingSphereTable("foo_tbl", Arrays.asList(column1, column2),
Collections.emptyList(), Collections.emptyList());
assertThat(shardingSphereTable.getColumnValues(), hasItems(column1,
column2));
assertThat(shardingSphereTable.getColumnValues(), hasSize(2));
}
@Test
void assertContainsColumn() {
- ShardingSphereColumn column = new ShardingSphereColumn("foo_column",
Types.INTEGER, true, true, false, true, false, false);
- shardingSphereTable.putColumn(column);
- assertTrue(shardingSphereTable.containsColumn("foo_column"));
+ ShardingSphereColumn column = new ShardingSphereColumn("foo_col",
Types.INTEGER, true, true, false, true, false, false);
+ ShardingSphereTable shardingSphereTable = new
ShardingSphereTable("foo_tbl", Collections.singleton(column),
Collections.emptyList(), Collections.emptyList());
+ assertTrue(shardingSphereTable.containsColumn("foo_col"));
assertFalse(shardingSphereTable.containsColumn("invalid"));
}
@Test
void assertPutIndex() {
- ShardingSphereIndex index1 = new ShardingSphereIndex("foo_index_1");
- ShardingSphereIndex index2 = new ShardingSphereIndex("foo_index_2");
- shardingSphereTable.putIndex(index1);
- shardingSphereTable.putIndex(index2);
- assertThat(shardingSphereTable.getIndex("foo_index_1"), is(index1));
- assertThat(shardingSphereTable.getIndex("foo_index_2"), is(index2));
+ ShardingSphereIndex index1 = new ShardingSphereIndex("foo_idx_1");
+ ShardingSphereIndex index2 = new ShardingSphereIndex("foo_idx_2");
+ ShardingSphereTable shardingSphereTable = new
ShardingSphereTable("foo_tbl", Collections.emptyList(), Arrays.asList(index1,
index2), Collections.emptyList());
+ assertThat(shardingSphereTable.getIndex("foo_idx_1"), is(index1));
+ assertThat(shardingSphereTable.getIndex("foo_idx_2"), is(index2));
assertNull(shardingSphereTable.getIndex("invalid"));
assertThat(shardingSphereTable.getIndexValues(), hasSize(2));
}
@Test
void assertGetIndex() {
- ShardingSphereIndex index = new ShardingSphereIndex("foo_index");
- shardingSphereTable.putIndex(index);
- assertThat(shardingSphereTable.getIndex("foo_index"), is(index));
- assertThat(shardingSphereTable.getIndex("FOO_INDEX"), is(index));
+ ShardingSphereIndex index = new ShardingSphereIndex("foo_idx");
+ ShardingSphereTable shardingSphereTable = new
ShardingSphereTable("foo_tbl", Collections.emptyList(),
Collections.singleton(index), Collections.emptyList());
+ assertThat(shardingSphereTable.getIndex("foo_idx"), is(index));
+ assertThat(shardingSphereTable.getIndex("FOO_IDX"), is(index));
assertNull(shardingSphereTable.getIndex("invalid"));
}
@Test
void assertRemoveIndex() {
- ShardingSphereIndex index1 = new ShardingSphereIndex("foo_index_1");
- ShardingSphereIndex index2 = new ShardingSphereIndex("foo_index_2");
- shardingSphereTable.putIndex(index1);
- shardingSphereTable.putIndex(index2);
- shardingSphereTable.removeIndex("foo_index_1");
- assertNull(shardingSphereTable.getIndex("foo_index_1"));
+ ShardingSphereIndex index1 = new ShardingSphereIndex("foo_idx_1");
+ ShardingSphereIndex index2 = new ShardingSphereIndex("foo_idx_2");
+ ShardingSphereTable shardingSphereTable = new
ShardingSphereTable("foo_tbl", Collections.emptyList(), Arrays.asList(index1,
index2), Collections.emptyList());
+ shardingSphereTable.removeIndex("foo_idx_1");
+ assertNull(shardingSphereTable.getIndex("foo_idx_1"));
shardingSphereTable.removeIndex("invalid");
- assertThat(shardingSphereTable.getIndex("foo_index_2"), is(index2));
+ assertThat(shardingSphereTable.getIndex("foo_idx_2"), is(index2));
assertThat(shardingSphereTable.getIndexValues(), hasSize(1));
}
@Test
void assertGetIndexes() {
- ShardingSphereIndex index1 = new ShardingSphereIndex("foo_index_1");
- ShardingSphereIndex index2 = new ShardingSphereIndex("foo_index_2");
- shardingSphereTable.putIndex(index1);
- shardingSphereTable.putIndex(index2);
+ ShardingSphereIndex index1 = new ShardingSphereIndex("foo_idx_1");
+ ShardingSphereIndex index2 = new ShardingSphereIndex("foo_idx_2");
+ ShardingSphereTable shardingSphereTable = new
ShardingSphereTable("foo_tbl", Collections.emptyList(), Arrays.asList(index1,
index2), Collections.emptyList());
assertThat(shardingSphereTable.getIndexValues(), hasItems(index1,
index2));
assertThat(shardingSphereTable.getIndexValues(), hasSize(2));
}
@Test
void assertContainsIndex() {
- ShardingSphereIndex index1 = new ShardingSphereIndex("foo_index_1");
- ShardingSphereIndex index2 = new ShardingSphereIndex("foo_index_2");
- shardingSphereTable.putIndex(index1);
- shardingSphereTable.putIndex(index2);
- assertTrue(shardingSphereTable.containsIndex("foo_index_1"));
- assertTrue(shardingSphereTable.containsIndex("foo_index_2"));
+ ShardingSphereIndex index1 = new ShardingSphereIndex("foo_idx_1");
+ ShardingSphereIndex index2 = new ShardingSphereIndex("foo_idx_2");
+ ShardingSphereTable shardingSphereTable = new
ShardingSphereTable("foo_tbl", Collections.emptyList(), Arrays.asList(index1,
index2), Collections.emptyList());
+ assertTrue(shardingSphereTable.containsIndex("foo_idx_1"));
+ assertTrue(shardingSphereTable.containsIndex("foo_idx_2"));
assertFalse(shardingSphereTable.containsIndex("invalid"));
}
@Test
void assertGetConstraints() {
- ShardingSphereConstraint constraint = new
ShardingSphereConstraint("t_order_foreign_key", "t_user");
- ShardingSphereTable table = new ShardingSphereTable("t_order",
Collections.emptyList(), Collections.emptyList(),
Collections.singletonList(constraint));
+ ShardingSphereConstraint constraint = new
ShardingSphereConstraint("foo_tbl_foreign_key", "foo_tbl");
+ ShardingSphereTable table = new ShardingSphereTable("foo_tbl",
Collections.emptyList(), Collections.emptyList(),
Collections.singletonList(constraint));
assertThat(table.getConstraintValues(), hasItems(constraint));
assertThat(table.getConstraintValues(), hasSize(1));
}
@Test
- void assertTableEquals() {
- shardingSphereTable.putColumn(new ShardingSphereColumn("foo_column_1",
Types.INTEGER, true, true, false, true, false, false));
- shardingSphereTable.putIndex(new ShardingSphereIndex("foo_index_1"));
- ShardingSphereTable otherTable = new ShardingSphereTable();
- otherTable.putColumn(new ShardingSphereColumn("foo_column_1",
Types.INTEGER, true, true, false, true, false, false));
- otherTable.putIndex(new ShardingSphereIndex("foo_index_1"));
- assertThat(shardingSphereTable, is(otherTable));
+ void assertEquals() {
+ ShardingSphereTable table1 = new ShardingSphereTable("foo_tbl",
+ Collections.singleton(new ShardingSphereColumn("foo_col",
Types.INTEGER, true, true, false, true, false, false)),
+ Collections.singleton(new ShardingSphereIndex("foo_idx")),
Collections.emptyList());
+ ShardingSphereTable table2 = new ShardingSphereTable("foo_tbl",
+ Collections.singleton(new ShardingSphereColumn("foo_col",
Types.INTEGER, true, true, false, true, false, false)),
+ Collections.singleton(new ShardingSphereIndex("foo_idx")),
Collections.emptyList());
+ assertThat(table1, is(table2));
}
}
diff --git
a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareParameterMarkerExtractorTest.java
b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareParameterMarkerExtractorTest.java
index e1dd4471571..c994839b59b 100644
---
a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareParameterMarkerExtractorTest.java
+++
b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareParameterMarkerExtractorTest.java
@@ -29,6 +29,8 @@ import
org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatemen
import org.junit.jupiter.api.Test;
import java.sql.Types;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import static org.hamcrest.CoreMatchers.is;
@@ -49,10 +51,10 @@ class MySQLComStmtPrepareParameterMarkerExtractorTest {
}
private ShardingSphereSchema prepareSchema() {
- ShardingSphereTable table = new ShardingSphereTable();
- table.putColumn(new ShardingSphereColumn("id", Types.BIGINT, true,
false, false, false, true, false));
- table.putColumn(new ShardingSphereColumn("name", Types.VARCHAR, false,
false, false, false, false, false));
- table.putColumn(new ShardingSphereColumn("age", Types.SMALLINT, false,
false, false, false, true, false));
+ ShardingSphereTable table = new ShardingSphereTable("user",
Arrays.asList(
+ new ShardingSphereColumn("id", Types.BIGINT, true, false,
false, false, true, false),
+ new ShardingSphereColumn("name", Types.VARCHAR, false, false,
false, false, false, false),
+ new ShardingSphereColumn("age", Types.SMALLINT, false, false,
false, false, true, false)), Collections.emptyList(), Collections.emptyList());
ShardingSphereSchema result = new
ShardingSphereSchema(DefaultDatabase.LOGIC_NAME);
result.getTables().put("user", table);
return result;
