(iotdb) branch master updated: Fix it which use 'merge' command (#12060)

[haonan]

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new f35b2a5306e Fix it which use 'merge' command (#12060)
f35b2a5306e is described below

commit f35b2a5306e3f4a4302ddb0ad008ab4b3f433f18
Author: shuwenwei <55970239+shuwen...@users.noreply.github.com>
AuthorDate: Wed Feb 21 17:31:35 2024 +0800

    Fix it which use 'merge' command (#12060)
---
 .../org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java   | 20 --------------------
 .../test/java/org/apache/iotdb/spark/it/Utils.java   |  1 -
 .../org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java |  1 -
 3 files changed, 22 deletions(-)

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 0272aaa2eea..930ab8db1b3 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 class IoTDBSimpleQueryIT {
         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 class IoTDBSimpleQueryIT {
         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 ffdd3bd07f0..69ec5c0a5ef 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 @@ public class Utils {
             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 e20a007f096..758453b80ed 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",