Merge branch 'master' into strong_password

Author: jt2594838

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

@@ -258,7 +258,7 @@ protected void initEnvironment(
 
     if (addAINode) {
       this.aiNodeWrapperList = new ArrayList<>();
-      startAINode(seedConfigNode, testClassName);
+      startAINode(seedConfigNode, this.dataNodeWrapperList.get(0).getPort(), testClassName);
     }
 
     checkClusterStatusWithoutUnknown();
@@ -307,11 +307,13 @@ private DataNodeWrapper newDataNode() {
     return dataNodeWrapper;
   }
 
-  private void startAINode(final String seedConfigNode, final String testClassName) {
+  private void startAINode(
+      final String seedConfigNode, final int clusterIngressPort, final String testClassName) {
     final String aiNodeEndPoint;
     final AINodeWrapper aiNodeWrapper =
         new AINodeWrapper(
             seedConfigNode,
+            clusterIngressPort,
             testClassName,
             testMethodName,
             index,

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/AINodeWrapper.java

@@ -43,6 +43,7 @@ public class AINodeWrapper extends AbstractNodeWrapper {
   private static final Logger logger = IoTDBTestLogger.logger;
   private final long startTime;
   private final String seedConfigNode;
+  private final int clusterIngressPort;
 
   private static final String SCRIPT_FILE = "start-ainode.sh";
 
@@ -67,13 +68,15 @@ private void replaceAttribute(String[] keys, String[] values, String filePath) {
 
   public AINodeWrapper(
       String seedConfigNode,
+      int clusterIngressPort,
       String testClassName,
       String testMethodName,
       int clusterIndex,
       int[] port,
       long startTime) {
     super(testClassName, testMethodName, port, clusterIndex, false, startTime);
     this.seedConfigNode = seedConfigNode;
+    this.clusterIngressPort = clusterIngressPort;
     this.startTime = startTime;
   }
 
@@ -105,8 +108,12 @@ public void start() {
 
       // set attribute
       replaceAttribute(
-          new String[] {"ain_seed_config_node", "ain_rpc_port"},
-          new String[] {this.seedConfigNode, Integer.toString(getPort())},
+          new String[] {"ain_seed_config_node", "ain_rpc_port", "ain_cluster_ingress_port"},
+          new String[] {
+            this.seedConfigNode,
+            Integer.toString(getPort()),
+            Integer.toString(this.clusterIngressPort)
+          },
           propertiesFile);
 
       // start AINode

integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBWindowFunctionIT.java

@@ -107,6 +107,7 @@ private static void insertData() {
 
   @BeforeClass
   public static void setUp() throws Exception {
+    EnvFactory.getEnv().getConfig().getCommonConfig().setSortBufferSize(1024 * 1024);
     EnvFactory.getEnv().initClusterEnvironment();
     insertData();
   }