Merge branch 'master' into showConfigurationSQL

Author: shuwenwei

example/client-cpp-example/pom.xml

@@ -64,6 +64,10 @@
                                     <sourceFile>${project.basedir}/src/TableModelSessionExample.cpp</sourceFile>
                                     <destinationFile>${project.build.directory}/TableModelSessionExample.cpp</destinationFile>
                                 </fileSet>
+                                <fileSet>
+                                    <sourceFile>${project.basedir}/src/MultiSvrNodeClient.cpp</sourceFile>
+                                    <destinationFile>${project.build.directory}/MultiSvrNodeClient.cpp</destinationFile>
+                                </fileSet>
                                 <fileSet>
                                     <sourceFile>${project.basedir}/src/CMakeLists.txt</sourceFile>
                                     <destinationFile>${project.build.directory}/CMakeLists.txt</destinationFile>

example/client-cpp-example/src/CMakeLists.txt

@@ -39,13 +39,16 @@ LINK_DIRECTORIES(${CMAKE_SOURCE_DIR}/client/lib)
 ADD_EXECUTABLE(SessionExample SessionExample.cpp)
 ADD_EXECUTABLE(AlignedTimeseriesSessionExample AlignedTimeseriesSessionExample.cpp)
 ADD_EXECUTABLE(TableModelSessionExample TableModelSessionExample.cpp)
+ADD_EXECUTABLE(MultiSvrNodeClient MultiSvrNodeClient.cpp)
 
 IF(MSVC)
     TARGET_LINK_LIBRARIES(SessionExample iotdb_session "${CMAKE_SOURCE_DIR}/thrift/lib/Release/thriftmd.lib")
     TARGET_LINK_LIBRARIES(AlignedTimeseriesSessionExample iotdb_session "${CMAKE_SOURCE_DIR}/thrift/lib/Release/thriftmd.lib")
     TARGET_LINK_LIBRARIES(TableModelSessionExample iotdb_session "${CMAKE_SOURCE_DIR}/thrift/lib/Release/thriftmd.lib")
+    TARGET_LINK_LIBRARIES(MultiSvrNodeClient iotdb_session "${CMAKE_SOURCE_DIR}/thrift/lib/Release/thriftmd.lib")
 ELSE()
     TARGET_LINK_LIBRARIES(SessionExample iotdb_session pthread)
     TARGET_LINK_LIBRARIES(AlignedTimeseriesSessionExample iotdb_session pthread)
     TARGET_LINK_LIBRARIES(TableModelSessionExample iotdb_session pthread)
-ENDIF()
+    TARGET_LINK_LIBRARIES(MultiSvrNodeClient iotdb_session pthread)
+ENDIF()

…t-cpp/src/example/MultiSvrNodeClient.cpp …t-cpp-example/src/MultiSvrNodeClient.cppiotdb-client/client-cpp/src/example/MultiSvrNodeClient.cpp renamed to example/client-cpp-example/src/MultiSvrNodeClient.cpp iotdb-client/client-cpp/src/example/MultiSvrNodeClient.cpp renamed to example/client-cpp-example/src/MultiSvrNodeClient.cpp

@@ -103,12 +103,6 @@ public CommonConfig setEncryptType(String encryptType) {
     return this;
   }
 
-  @Override
-  public CommonConfig setEncryptKeyPath(String encryptKeyPath) {
-    setProperty("encrypt_key_path", encryptKeyPath);
-    return this;
-  }
-
   @Override
   public CommonConfig setEnableGrantOption(boolean enableGrantOption) {
     setProperty("enable_grant_option", String.valueOf(enableGrantOption));

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java

@@ -82,13 +82,6 @@ public CommonConfig setEncryptType(String encryptType) {
     return this;
   }
 
-  @Override
-  public CommonConfig setEncryptKeyPath(String encryptKeyPath) {
-    cnConfig.setProperty("encrypt_key_path", encryptKeyPath);
-    dnConfig.setProperty("encrypt_key_path", encryptKeyPath);
-    return this;
-  }
-
   @Override
   public CommonConfig setEnableGrantOption(boolean enableGrantOption) {
     cnConfig.setEnableGrantOption(enableGrantOption);

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java

@@ -59,11 +59,6 @@ public CommonConfig setEncryptType(String encryptType) {
     return this;
   }
 
-  @Override
-  public CommonConfig setEncryptKeyPath(String encryptKeyPath) {
-    return this;
-  }
-
   @Override
   public CommonConfig setEnableGrantOption(boolean enableGrantOption) {
     return this;

integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java

@@ -38,8 +38,6 @@ public interface CommonConfig {
 
   CommonConfig setEncryptType(String encryptType);
 
-  CommonConfig setEncryptKeyPath(String encryptKeyPath);
-
   CommonConfig setEnableGrantOption(boolean enableGrantOption);
 
   CommonConfig setConfigRegionRatisRPCLeaderElectionTimeoutMaxMs(int maxMs);

integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java

@@ -40,6 +40,7 @@
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.sql.Types;
 import java.text.DateFormat;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
@@ -51,6 +52,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
@@ -233,6 +235,18 @@ public static void tableResultSetEqualTest(
         "+00:00");
   }
 
+  public static void tableResultSetEqualByDataTypeTest(
+      String sql, String[] expectedHeader, String[] expectedRetArray, String database) {
+    tableResultSetEqualByDataTypeTest(
+        sql,
+        expectedHeader,
+        expectedRetArray,
+        SessionConfig.DEFAULT_USER,
+        SessionConfig.DEFAULT_PASSWORD,
+        database,
+        "+00:00");
+  }
+
   public static void tableResultSetEqualTest(
       String sql,
       String timeZone,
@@ -298,6 +312,57 @@ public static void tableResultSetEqualTest(
     }
   }
 
+  public static void tableResultSetEqualByDataTypeTest(
+      String sql,
+      String[] expectedHeader,
+      String[] expectedRetArray,
+      String userName,
+      String password,
+      String database,
+      String timeZone) {
+    try (Connection connection =
+        EnvFactory.getEnv().getConnection(userName, password, BaseEnv.TABLE_SQL_DIALECT)) {
+      connection.setClientInfo("time_zone", timeZone);
+      try (Statement statement = connection.createStatement()) {
+        statement.execute("use " + database);
+        try (ResultSet resultSet = statement.executeQuery(sql)) {
+          ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
+          for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
+            assertEquals(expectedHeader[i - 1], resultSetMetaData.getColumnName(i));
+          }
+          assertEquals(expectedHeader.length, resultSetMetaData.getColumnCount());
+
+          int cnt = 0;
+          while (resultSet.next()) {
+            for (int i = 1; i <= expectedHeader.length; i++) {
+              if (resultSetMetaData.getColumnType(i) == Types.BOOLEAN) {
+                assertEquals(
+                    Boolean.valueOf(expectedRetArray[cnt].split(",")[i - 1]),
+                    resultSet.getBoolean(i));
+              } else if (resultSetMetaData.getColumnType(i) == Types.INTEGER) {
+                assertEquals(
+                    Optional.of(Integer.valueOf(expectedRetArray[cnt].split(",")[i - 1])),
+                    Optional.of(resultSet.getInt(i)));
+              } else if (resultSetMetaData.getColumnType(i) == Types.DOUBLE) {
+                assertEquals(
+                    Double.valueOf(expectedRetArray[cnt].split(",")[i - 1]),
+                    resultSet.getDouble(i),
+                    DELTA);
+              } else if (resultSetMetaData.getColumnType(i) == Types.VARCHAR) {
+                assertEquals(expectedRetArray[cnt].split(",")[i - 1], resultSet.getString(i));
+              }
+            }
+            cnt++;
+          }
+          assertEquals(expectedRetArray.length, cnt);
+        }
+      }
+    } catch (SQLException e) {
+      e.printStackTrace();
+      fail(e.getMessage());
+    }
+  }
+
   public static void tableExecuteTest(String sql, String userName, String password) {
     try (Connection connection =
         EnvFactory.getEnv().getConnection(userName, password, BaseEnv.TABLE_SQL_DIALECT)) {