diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java index 0272aaa2eea3..930ab8db1b3c 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java @@ -389,16 +389,6 @@ public void testSDTEncodingMergeSeq() { count++; } assertEquals(15, count); - - // no sdt encoding when merging - statement.execute("merge"); - resultSet = statement.executeQuery("select s0 from root.sg1.d0"); - count = 0; - while (resultSet.next()) { - count++; - } - assertEquals(15, count); - } catch (SQLException e) { e.printStackTrace(); } @@ -443,16 +433,6 @@ public void testSDTEncodingMergeUnseq() { count++; } assertEquals(18, count); - - // no sdt encoding when merging - statement.execute("merge"); - resultSet = statement.executeQuery("select s0 from root.sg1.d0"); - count = 0; - while (resultSet.next()) { - count++; - } - assertEquals(18, count); - } catch (SQLException e) { e.printStackTrace(); } diff --git a/integration-test/src/test/java/org/apache/iotdb/spark/it/Utils.java b/integration-test/src/test/java/org/apache/iotdb/spark/it/Utils.java index ffdd3bd07f02..69ec5c0a5efd 100644 --- a/integration-test/src/test/java/org/apache/iotdb/spark/it/Utils.java +++ b/integration-test/src/test/java/org/apache/iotdb/spark/it/Utils.java @@ -74,7 +74,6 @@ protected static void prepareData(String jdbcUrl) throws ClassNotFoundException String.format( Locale.ENGLISH, insertTemplate, i, i, i, (double) i, "'" + i + "'", "false")); } - statement.execute("merge"); // prepare BufferWrite cache for (int i = 9000; i < 10000; i++) { diff --git a/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java b/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java index e20a007f0966..758453b80edf 100644 --- a/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java +++ b/iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java @@ -225,7 +225,6 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { "LIKE", "MAX_BY", "METADATA", - "MERGE", "MOVE", "MIN_TIME", "MAX_TIME",