Skip to content

Commit 45d189e

Browse files
CaideyipiCaideyipi
authored
Disabled some unsupportted operations
1 parent 041d292 commit 45d189e

File tree

4 files changed

+82
-80
lines changed

4 files changed

+82
-80
lines changed

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -247,18 +247,21 @@ public void testDevice() throws SQLException {
247247
TestUtils.assertResultSetSize(
248248
statement.executeQuery("show devices from table0 offset 1 limit 1"), 1);
249249

250-
// Test delete devices
251-
statement.execute("delete devices from table0 where region_id = '1' and plant_id = '5'");
252-
TestUtils.assertResultSetSize(statement.executeQuery("show devices from table0"), 1);
250+
// TODO: Reopen
251+
if (false) {
252+
// Test delete devices
253+
statement.execute("delete devices from table0 where region_id = '1' and plant_id = '5'");
254+
TestUtils.assertResultSetSize(statement.executeQuery("show devices from table0"), 1);
253255

254-
// Test successfully invalidate cache
255-
statement.execute(
256-
"insert into table0(region_id, plant_id, device_id, model, temperature, humidity) values('1', '5', '3', 'A', 37.6, 111.1)");
257-
TestUtils.assertResultSetSize(statement.executeQuery("show devices from table0"), 2);
256+
// Test successfully invalidate cache
257+
statement.execute(
258+
"insert into table0(region_id, plant_id, device_id, model, temperature, humidity) values('1', '5', '3', 'A', 37.6, 111.1)");
259+
TestUtils.assertResultSetSize(statement.executeQuery("show devices from table0"), 2);
258260

259-
// Test successfully delete data
260-
TestUtils.assertResultSetSize(
261-
statement.executeQuery("select * from table0 where region_id = '1'"), 1);
261+
// Test successfully delete data
262+
TestUtils.assertResultSetSize(
263+
statement.executeQuery("select * from table0 where region_id = '1'"), 1);
264+
}
262265
}
263266
}
264267
}

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

Lines changed: 64 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -385,66 +385,69 @@ public void testManageTable() {
385385
statement.execute(
386386
"insert into table2(region_id, plant_id, color, temperature, speed) values(1, 1, 1, 1, 1)");
387387

388-
// Test drop column
389-
statement.execute("alter table table2 drop column color");
390-
391-
columnNames = new String[] {"time", "region_id", "plant_id", "temperature", "speed"};
392-
dataTypes = new String[] {"TIMESTAMP", "STRING", "STRING", "FLOAT", "DOUBLE"};
393-
categories = new String[] {"TIME", "ID", "ID", "MEASUREMENT", "MEASUREMENT"};
394-
final String[] statuses = new String[] {"USING", "USING", "USING", "USING", "USING"};
395-
try (final ResultSet resultSet = statement.executeQuery("describe table2 details")) {
396-
int cnt = 0;
397-
ResultSetMetaData metaData = resultSet.getMetaData();
398-
assertEquals(describeTableDetailsColumnHeaders.size(), metaData.getColumnCount());
399-
for (int i = 0; i < describeTableDetailsColumnHeaders.size(); i++) {
400-
assertEquals(
401-
describeTableDetailsColumnHeaders.get(i).getColumnName(),
402-
metaData.getColumnName(i + 1));
403-
}
404-
while (resultSet.next()) {
405-
assertEquals(columnNames[cnt], resultSet.getString(1));
406-
assertEquals(dataTypes[cnt], resultSet.getString(2));
407-
assertEquals(categories[cnt], resultSet.getString(3));
408-
assertEquals(statuses[cnt], resultSet.getString(4));
409-
cnt++;
388+
// TODO: Reopen
389+
if (false) {
390+
// Test drop column
391+
statement.execute("alter table table2 drop column color");
392+
393+
columnNames = new String[] {"time", "region_id", "plant_id", "temperature", "speed"};
394+
dataTypes = new String[] {"TIMESTAMP", "STRING", "STRING", "FLOAT", "DOUBLE"};
395+
categories = new String[] {"TIME", "ID", "ID", "MEASUREMENT", "MEASUREMENT"};
396+
final String[] statuses = new String[] {"USING", "USING", "USING", "USING", "USING"};
397+
try (final ResultSet resultSet = statement.executeQuery("describe table2 details")) {
398+
int cnt = 0;
399+
ResultSetMetaData metaData = resultSet.getMetaData();
400+
assertEquals(describeTableDetailsColumnHeaders.size(), metaData.getColumnCount());
401+
for (int i = 0; i < describeTableDetailsColumnHeaders.size(); i++) {
402+
assertEquals(
403+
describeTableDetailsColumnHeaders.get(i).getColumnName(),
404+
metaData.getColumnName(i + 1));
405+
}
406+
while (resultSet.next()) {
407+
assertEquals(columnNames[cnt], resultSet.getString(1));
408+
assertEquals(dataTypes[cnt], resultSet.getString(2));
409+
assertEquals(categories[cnt], resultSet.getString(3));
410+
assertEquals(statuses[cnt], resultSet.getString(4));
411+
cnt++;
412+
}
413+
assertEquals(columnNames.length, cnt);
410414
}
411-
assertEquals(columnNames.length, cnt);
412-
}
413415

414-
statement.execute("alter table table2 drop column speed");
416+
statement.execute("alter table table2 drop column speed");
415417

416-
try {
417-
statement.executeQuery("select color from table2");
418-
fail();
419-
} catch (final SQLException e) {
420-
assertEquals("701: Column 'color' cannot be resolved", e.getMessage());
421-
}
418+
try {
419+
statement.executeQuery("select color from table2");
420+
fail();
421+
} catch (final SQLException e) {
422+
assertEquals("701: Column 'color' cannot be resolved", e.getMessage());
423+
}
422424

423-
try {
424-
statement.executeQuery("select speed from table2");
425-
fail();
426-
} catch (final SQLException e) {
427-
assertEquals("701: Column 'speed' cannot be resolved", e.getMessage());
428-
}
425+
try {
426+
statement.executeQuery("select speed from table2");
427+
fail();
428+
} catch (final SQLException e) {
429+
assertEquals("701: Column 'speed' cannot be resolved", e.getMessage());
430+
}
429431

430-
try {
431-
statement.execute("alter table table2 drop column speed");
432-
} catch (final SQLException e) {
433-
assertEquals("616: Column speed in table 'test2.table2' does not exist.", e.getMessage());
434-
}
432+
try {
433+
statement.execute("alter table table2 drop column speed");
434+
} catch (final SQLException e) {
435+
assertEquals("616: Column speed in table 'test2.table2' does not exist.", e.getMessage());
436+
}
435437

436-
try {
437-
statement.execute("alter table table2 drop column time");
438-
} catch (final SQLException e) {
439-
assertEquals("701: Dropping id or time column is not supported.", e.getMessage());
440-
}
438+
try {
439+
statement.execute("alter table table2 drop column time");
440+
} catch (final SQLException e) {
441+
assertEquals("701: Dropping id or time column is not supported.", e.getMessage());
442+
}
441443

442-
// test data deletion by drop column
443-
statement.execute("alter table table2 add column speed double");
444-
TestUtils.assertResultSetEqual(
445-
statement.executeQuery("select speed from table2"),
446-
"speed,",
447-
Collections.singleton("null,"));
444+
// test data deletion by drop column
445+
statement.execute("alter table table2 add column speed double");
446+
TestUtils.assertResultSetEqual(
447+
statement.executeQuery("select speed from table2"),
448+
"speed,",
449+
Collections.singleton("null,"));
450+
}
448451

449452
statement.execute("drop table table2");
450453
try {
@@ -496,11 +499,14 @@ public void testManageTable() {
496499
assertEquals("500: Unknown database test1", e.getMessage());
497500
}
498501

499-
try {
500-
statement.execute("alter table test1.test drop column a");
501-
fail();
502-
} catch (final SQLException e) {
503-
assertEquals("500: Unknown database test1", e.getMessage());
502+
// TODO: Reopen
503+
if (false) {
504+
try {
505+
statement.execute("alter table test1.test drop column a");
506+
fail();
507+
} catch (final SQLException e) {
508+
assertEquals("500: Unknown database test1", e.getMessage());
509+
}
504510
}
505511

506512
try {

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DeleteDevice.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.apache.iotdb.commons.path.PartialPath;
2323
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
2424
import org.apache.iotdb.commons.schema.table.TsTable;
25+
import org.apache.iotdb.db.exception.sql.SemanticException;
2526
import org.apache.iotdb.db.queryengine.common.SessionInfo;
2627
import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
2728
import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceBlackListConstructor;
@@ -67,6 +68,7 @@ public class DeleteDevice extends AbstractTraverseDevice {
6768

6869
public DeleteDevice(final NodeLocation location, final Table table, final Expression where) {
6970
super(location, table, where);
71+
throw new SemanticException("Delete device is unsupported yet.");
7072
}
7173

7274
public void parseModEntries(final TsTable table) {

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DropColumn.java‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
package org.apache.iotdb.db.queryengine.plan.relational.sql.ast;
2121

22+
import org.apache.iotdb.db.exception.sql.SemanticException;
23+
2224
import com.google.common.collect.ImmutableList;
2325

2426
import java.util.List;
@@ -35,18 +37,6 @@ public class DropColumn extends Statement {
3537
private final boolean tableIfExists;
3638
private final boolean columnIfExists;
3739

38-
public DropColumn(
39-
final QualifiedName table,
40-
final Identifier field,
41-
final boolean tableIfExists,
42-
final boolean columnIfExists) {
43-
super(null);
44-
this.table = requireNonNull(table, "table is null");
45-
this.field = requireNonNull(field, "field is null");
46-
this.tableIfExists = tableIfExists;
47-
this.columnIfExists = columnIfExists;
48-
}
49-
5040
public DropColumn(
5141
final NodeLocation location,
5242
final QualifiedName table,
@@ -58,6 +48,7 @@ public DropColumn(
5848
this.field = requireNonNull(field, "field is null");
5949
this.tableIfExists = tableIfExists;
6050
this.columnIfExists = columnIfExists;
51+
throw new SemanticException("Drop column is unsupported yet.");
6152
}
6253

6354
public QualifiedName getTable() {

0 commit comments

Comments
 (0)