Skip to content

Commit 565f1bf

Browse files
CaideyipiCaideyipi
authored
Reorder the show databases / tables dataset by database/table name
1 parent 46e636b commit 565f1bf

File tree

16 files changed

+134
-123
lines changed

16 files changed

+134
-123
lines changed

‎integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBSeriesPermissionIT.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.countTimeSeriesColumnHeaders;
3939
import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showChildNodesColumnHeaders;
4040
import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showChildPathsColumnHeaders;
41+
import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showDatabasesColumnHeaders;
4142
import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showDevicesColumnHeaders;
42-
import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showStorageGroupsColumnHeaders;
4343
import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showTTLColumnHeaders;
4444
import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showTimeSeriesColumnHeaders;
4545
import static org.apache.iotdb.db.it.utils.TestUtils.assertNonQueryTestFail;
@@ -160,9 +160,7 @@ private void testReadSchema() {
160160
// show/count databases
161161
resultSetEqualTest(
162162
"show databases",
163-
showStorageGroupsColumnHeaders.stream()
164-
.map(ColumnHeader::getColumnName)
165-
.toArray(String[]::new),
163+
showDatabasesColumnHeaders.stream().map(ColumnHeader::getColumnName).toArray(String[]::new),
166164
new String[] {"root.test,1,1,0,604800000,"},
167165
"test1",
168166
"test123");

integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteStorageGroupIT.java renamed to integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteDatabaseIT.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
import static org.junit.Assert.assertTrue;
4242

4343
@Category({LocalStandaloneIT.class, ClusterIT.class})
44-
public class IoTDBDeleteStorageGroupIT extends AbstractSchemaIT {
44+
public class IoTDBDeleteDatabaseIT extends AbstractSchemaIT {
4545

46-
public IoTDBDeleteStorageGroupIT(SchemaTestMode schemaTestMode) {
46+
public IoTDBDeleteDatabaseIT(SchemaTestMode schemaTestMode) {
4747
super(schemaTestMode);
4848
}
4949

@@ -65,7 +65,7 @@ public void tearDown() throws Exception {
6565
}
6666

6767
@Test
68-
public void testDeleteStorageGroup() throws Exception {
68+
public void testDeleteDatabase() throws Exception {
6969
try (Connection connection = EnvFactory.getEnv().getConnection();
7070
Statement statement = connection.createStatement()) {
7171
statement.execute("CREATE DATABASE root.ln.wf01.wt01");
@@ -90,7 +90,7 @@ public void testDeleteStorageGroup() throws Exception {
9090
}
9191

9292
@Test
93-
public void testDeleteMultipleStorageGroupWithQuote() throws Exception {
93+
public void testDeleteMultipleDatabasesWithQuote() throws Exception {
9494
try (Connection connection = EnvFactory.getEnv().getConnection();
9595
Statement statement = connection.createStatement()) {
9696
statement.execute("CREATE DATABASE root.ln1.wf01.wt01");
@@ -113,7 +113,7 @@ public void testDeleteMultipleStorageGroupWithQuote() throws Exception {
113113
}
114114

115115
@Test(expected = SQLException.class)
116-
public void deleteNonExistStorageGroup() throws Exception {
116+
public void deleteNonExistDatabase() throws Exception {
117117
try (final Connection connection = EnvFactory.getEnv().getConnection();
118118
final Statement statement = connection.createStatement()) {
119119
statement.execute("CREATE DATABASE root.ln2.wf01.wt01");
@@ -122,7 +122,7 @@ public void deleteNonExistStorageGroup() throws Exception {
122122
}
123123

124124
@Test
125-
public void testDeleteStorageGroupWithStar() throws Exception {
125+
public void testDeleteDatabaseWithStar() throws Exception {
126126
try (Connection connection = EnvFactory.getEnv().getConnection();
127127
Statement statement = connection.createStatement()) {
128128
statement.execute("CREATE DATABASE root.ln3.wf01.wt01");
@@ -145,7 +145,7 @@ public void testDeleteStorageGroupWithStar() throws Exception {
145145
}
146146

147147
@Test
148-
public void testDeleteAllStorageGroups() throws Exception {
148+
public void testDeleteAllDatabases() throws Exception {
149149
try (Connection connection = EnvFactory.getEnv().getConnection();
150150
Statement statement = connection.createStatement()) {
151151
statement.execute("CREATE DATABASE root.ln4.wf01.wt01");
@@ -164,7 +164,7 @@ public void testDeleteAllStorageGroups() throws Exception {
164164
}
165165

166166
@Test
167-
public void testDeleteStorageGroupAndThenQuery() throws Exception {
167+
public void testDeleteDatabaseAndThenQuery() throws Exception {
168168
try (Connection connection = EnvFactory.getEnv().getConnection();
169169
Statement statement = connection.createStatement()) {
170170
statement.execute("insert into root.sg1.d1(time,s1) values(1,1);");
@@ -185,7 +185,7 @@ public void testDeleteStorageGroupAndThenQuery() throws Exception {
185185
}
186186

187187
@Test
188-
public void testDeleteStorageGroupInvalidateCache() throws Exception {
188+
public void testDeleteDatabaseInvalidateCache() throws Exception {
189189
try (final Connection connection = EnvFactory.getEnv().getConnection();
190190
final Statement statement = connection.createStatement()) {
191191
try {

‎integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBMetadataFetchIT.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import java.util.Arrays;
3939
import java.util.Collections;
4040
import java.util.HashSet;
41+
import java.util.List;
4142
import java.util.Set;
4243

4344
import static org.junit.Assert.assertEquals;
@@ -185,37 +186,36 @@ public void showTimeseriesTest() throws SQLException {
185186
}
186187

187188
@Test
188-
public void showStorageGroupTest() throws SQLException {
189-
try (Connection connection = EnvFactory.getEnv().getConnection();
190-
Statement statement = connection.createStatement()) {
191-
String[] sqls =
189+
public void showDatabasesTest() throws SQLException {
190+
try (final Connection connection = EnvFactory.getEnv().getConnection();
191+
final Statement statement = connection.createStatement()) {
192+
final String[] sqls =
192193
new String[] {
193194
"show databases",
194195
"show databases root.ln.wf01.**",
195196
"show databases root.ln.wf01.wt01.status"
196197
};
197-
Set<String>[] standards =
198-
new Set[] {
199-
new HashSet<>(
200-
Arrays.asList(
201-
"root.ln.wf01.wt01",
202-
"root.ln.wf01.wt02",
203-
"root.ln1.wf01.wt01",
204-
"root.ln2.wf01.wt01")),
205-
new HashSet<>(Arrays.asList("root.ln.wf01.wt01", "root.ln.wf01.wt02")),
206-
new HashSet<>()
198+
final List<String>[] standards =
199+
new List[] {
200+
Arrays.asList(
201+
"root.ln.wf01.wt01",
202+
"root.ln.wf01.wt02",
203+
"root.ln1.wf01.wt01",
204+
"root.ln2.wf01.wt01"),
205+
Arrays.asList("root.ln.wf01.wt01", "root.ln.wf01.wt02"),
206+
Collections.emptyList()
207207
};
208208

209209
for (int n = 0; n < sqls.length; n++) {
210-
String sql = sqls[n];
211-
Set<String> standard = standards[n];
212-
try (ResultSet resultSet = statement.executeQuery(sql)) {
210+
final String sql = sqls[n];
211+
final List<String> standard = standards[n];
212+
int i = 0;
213+
try (final ResultSet resultSet = statement.executeQuery(sql)) {
213214
while (resultSet.next()) {
214-
Assert.assertTrue(standard.contains(resultSet.getString(1)));
215-
standard.remove(resultSet.getString(1));
215+
assertEquals(standard.get(i++), resultSet.getString(1));
216216
}
217-
assertEquals(0, standard.size());
218-
} catch (SQLException e) {
217+
assertEquals(i, standard.size());
218+
} catch (final SQLException e) {
219219
e.printStackTrace();
220220
fail(e.getMessage());
221221
}

‎integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
import java.text.DateFormat;
4444
import java.time.ZoneId;
4545
import java.time.ZoneOffset;
46+
import java.util.ArrayList;
47+
import java.util.Collection;
4648
import java.util.Collections;
4749
import java.util.HashMap;
4850
import java.util.HashSet;
@@ -619,16 +621,19 @@ public static void assertResultSetEqual(
619621
}
620622

621623
public static void assertResultSetEqual(
622-
ResultSet actualResultSet, String expectedHeader, Set<String> expectedRetSet) {
624+
final ResultSet actualResultSet,
625+
final String expectedHeader,
626+
final Collection<String> expectedResult) {
623627
try {
624-
ResultSetMetaData resultSetMetaData = actualResultSet.getMetaData();
625-
StringBuilder header = new StringBuilder();
628+
final ResultSetMetaData resultSetMetaData = actualResultSet.getMetaData();
629+
final StringBuilder header = new StringBuilder();
626630
for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
627631
header.append(resultSetMetaData.getColumnName(i)).append(",");
628632
}
629633
assertEquals(expectedHeader, header.toString());
630634

631-
Set<String> actualRetSet = new HashSet<>();
635+
final Collection<String> actualRetSet =
636+
expectedResult instanceof Set ? new HashSet<>() : new ArrayList<>();
632637

633638
while (actualResultSet.next()) {
634639
StringBuilder builder = new StringBuilder();
@@ -637,8 +642,8 @@ public static void assertResultSetEqual(
637642
}
638643
actualRetSet.add(builder.toString());
639644
}
640-
assertEquals(expectedRetSet, actualRetSet);
641-
} catch (Exception e) {
645+
assertEquals(expectedResult, actualRetSet);
646+
} catch (final Exception e) {
642647
e.printStackTrace();
643648
Assert.fail(String.valueOf(e));
644649
}

‎integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java‎

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -298,10 +298,9 @@ public void testDatabaseWithSpecificCharacters() throws SQLException {
298298

299299
try (final ResultSet resultSet = statement.executeQuery("SHOW DATABASES")) {
300300
assertTrue(resultSet.next());
301-
if (resultSet.getString(1).equals("information_schema")) {
302-
assertTrue(resultSet.next());
303-
}
304301
assertEquals("````x", resultSet.getString(1));
302+
assertTrue(resultSet.next());
303+
assertEquals("information_schema", resultSet.getString(1));
305304
assertFalse(resultSet.next());
306305
}
307306

@@ -379,25 +378,24 @@ public void testInformationSchema() throws SQLException {
379378
TestUtils.assertResultSetEqual(
380379
statement.executeQuery("show tables"),
381380
"TableName,TTL(ms),",
382-
new HashSet<>(
383-
Arrays.asList(
384-
"databases,INF,",
385-
"tables,INF,",
386-
"columns,INF,",
387-
"queries,INF,",
388-
"regions,INF,",
389-
"topics,INF,",
390-
"pipe_plugins,INF,",
391-
"pipes,INF,",
392-
"subscriptions,INF,",
393-
"views,INF,",
394-
"models,INF,",
395-
"functions,INF,",
396-
"configurations,INF,",
397-
"keywords,INF,",
398-
"nodes,INF,",
399-
"config_nodes,INF,",
400-
"data_nodes,INF,")));
381+
Arrays.asList(
382+
"columns,INF,",
383+
"config_nodes,INF,",
384+
"configurations,INF,",
385+
"data_nodes,INF,",
386+
"databases,INF,",
387+
"functions,INF,",
388+
"keywords,INF,",
389+
"models,INF,",
390+
"nodes,INF,",
391+
"pipe_plugins,INF,",
392+
"pipes,INF,",
393+
"queries,INF,",
394+
"regions,INF,",
395+
"subscriptions,INF,",
396+
"tables,INF,",
397+
"topics,INF,",
398+
"views,INF,"));
401399

402400
TestUtils.assertResultSetEqual(
403401
statement.executeQuery("desc databases"),
@@ -773,9 +771,8 @@ public void testMixedDatabase() throws SQLException {
773771
final Statement statement = connection.createStatement()) {
774772
try (final ResultSet resultSet = statement.executeQuery("SHOW DATABASES DETAILS")) {
775773
assertTrue(resultSet.next());
776-
if (resultSet.getString(1).equals("information_schema")) {
777-
assertTrue(resultSet.next());
778-
}
774+
assertEquals("information_schema", resultSet.getString(1));
775+
assertTrue(resultSet.next());
779776
assertEquals("test", resultSet.getString(1));
780777
assertFalse(resultSet.next());
781778
}
@@ -858,10 +855,9 @@ public void testDBAuth() throws SQLException {
858855
assertEquals(showDBColumnHeaders.get(i).getColumnName(), metaData.getColumnName(i + 1));
859856
}
860857
Assert.assertTrue(resultSet.next());
861-
if (resultSet.getString(1).equals("information_schema")) {
862-
assertTrue(resultSet.next());
863-
}
864858
assertEquals("db", resultSet.getString(1));
859+
Assert.assertTrue(resultSet.next());
860+
assertEquals("information_schema", resultSet.getString(1));
865861
Assert.assertFalse(resultSet.next());
866862
}
867863

‎integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,8 @@ public void testManageTable() {
309309
// Test create table with only time column
310310
statement.execute("create table table3()");
311311

312-
tableNames = new String[] {"table3", "table2"};
313-
ttls = new String[] {"3000000", "6600000"};
312+
tableNames = new String[] {"table2", "table3"};
313+
ttls = new String[] {"6600000", "3000000"};
314314

315315
// show tables from current database
316316
try (final ResultSet resultSet = statement.executeQuery("SHOW tables")) {
@@ -336,7 +336,7 @@ public void testManageTable() {
336336
statement.execute("alter table table3 set properties ttl=1000000");
337337
statement.execute("alter table table3 set properties ttl=DEFAULT");
338338

339-
ttls = new String[] {"INF", "6600000"};
339+
ttls = new String[] {"6600000", "INF"};
340340
// The table3's ttl shall be "INF"
341341
try (final ResultSet resultSet = statement.executeQuery("SHOW tables")) {
342342
int cnt = 0;
@@ -662,10 +662,9 @@ public void testTableAuth() throws SQLException {
662662
assertEquals(showDBColumnHeaders.get(i).getColumnName(), metaData.getColumnName(i + 1));
663663
}
664664
Assert.assertTrue(resultSet.next());
665-
if (resultSet.getString(1).equals("information_schema")) {
666-
assertTrue(resultSet.next());
667-
}
668665
assertEquals("db", resultSet.getString(1));
666+
Assert.assertTrue(resultSet.next());
667+
assertEquals("information_schema", resultSet.getString(1));
669668
Assert.assertFalse(resultSet.next());
670669
}
671670

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/DatasetHeaderFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ public static DatasetHeader getShowDevicesWithSgHeader() {
5959
return new DatasetHeader(ColumnHeaderConstant.showDevicesWithSgColumnHeaders, true);
6060
}
6161

62-
public static DatasetHeader getShowStorageGroupHeader(final boolean isDetailed) {
62+
public static DatasetHeader getShowDatabaseHeader(final boolean isDetailed) {
6363
return isDetailed
64-
? new DatasetHeader(ColumnHeaderConstant.showStorageGroupsDetailColumnHeaders, true)
65-
: new DatasetHeader(ColumnHeaderConstant.showStorageGroupsColumnHeaders, true);
64+
? new DatasetHeader(ColumnHeaderConstant.showDatabasesDetailColumnHeaders, true)
65+
: new DatasetHeader(ColumnHeaderConstant.showDatabasesColumnHeaders, true);
6666
}
6767

6868
public static DatasetHeader getShowTTLHeader() {

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaContentSupplierFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ private DatabaseSupplier(final List<TSDataType> dataTypes, final String userName
246246
@Override
247247
protected void constructLine() {
248248
if (!hasShownInformationSchema) {
249-
InformationSchemaUtils.buildDatabaseTsBlock(s -> true, resultBuilder, true, false);
249+
InformationSchemaUtils.buildDatabaseTsBlock(resultBuilder, true, false);
250250
hasShownInformationSchema = true;
251251
return;
252252
}

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3136,7 +3136,7 @@ public Analysis visitShowStorageGroup(
31363136
Analysis analysis = new Analysis();
31373137
analysis.setRealStatement(showDatabaseStatement);
31383138
analysis.setRespDatasetHeader(
3139-
DatasetHeaderFactory.getShowStorageGroupHeader(showDatabaseStatement.isDetailed()));
3139+
DatasetHeaderFactory.getShowDatabaseHeader(showDatabaseStatement.isDetailed()));
31403140
return analysis;
31413141
}
31423142

0 commit comments

Comments
 (0)