Merge branch 'master' of https://github.com/apache/iotdb into session-last-bug

Author: Caideyipi

example/mqtt/src/main/java/org/apache/iotdb/mqtt/MQTTClient.java

@@ -27,6 +27,7 @@
 public class MQTTClient {
 
   private static final String DATABASE = "myMqttTest";
+  private static final String MY_TOPIC = "/myTopic";
 
   public static void main(String[] args) throws Exception {
     MQTT mqtt = new MQTT();
@@ -74,39 +75,39 @@ private static void jsonPayloadFormatter(BlockingConnection connection) throws E
   private static void linePayloadFormatter(BlockingConnection connection) throws Exception {
     // myTable,tag1=t1,tag2=t2 fieldKey1="1,2,3" 1740109006001
     String payload = "myTable,tag1=t1,tag2=t2 fieldKey1=\"1,2,3\" 1740109006001";
-    connection.publish(DATABASE + "/myTopic", payload.getBytes(), QoS.AT_LEAST_ONCE, false);
+    connection.publish(DATABASE + MY_TOPIC, payload.getBytes(), QoS.AT_LEAST_ONCE, false);
     Thread.sleep(10);
 
     payload = "myTable,tag1=t1,tag2=t2 fieldKey1=\"1,2,3\" 1740109006002";
-    connection.publish(DATABASE + "/myTopic", payload.getBytes(), QoS.AT_LEAST_ONCE, false);
+    connection.publish(DATABASE + MY_TOPIC, payload.getBytes(), QoS.AT_LEAST_ONCE, false);
     Thread.sleep(10);
 
     payload = "myTable,tag1=t1,tag2=t2 fieldKey1=\"1,2,3\" 1740109006003";
-    connection.publish(DATABASE + "/myTopic", payload.getBytes(), QoS.AT_LEAST_ONCE, false);
+    connection.publish(DATABASE + MY_TOPIC, payload.getBytes(), QoS.AT_LEAST_ONCE, false);
     Thread.sleep(10);
     payload =
         "test1,tag1=t1,tag2=t2 attr3=a5,attr4=a4 field1=\"fieldValue1\",field2=1i,field3=1u 1";
-    connection.publish(DATABASE + "/myTopic", payload.getBytes(), QoS.AT_LEAST_ONCE, false);
+    connection.publish(DATABASE + MY_TOPIC, payload.getBytes(), QoS.AT_LEAST_ONCE, false);
     Thread.sleep(10);
 
     payload = "test1,tag1=t1,tag2=t2  field4=2,field5=2i32,field6=2f 2";
-    connection.publish(DATABASE, payload.getBytes(), QoS.AT_LEAST_ONCE, false);
+    connection.publish(DATABASE + MY_TOPIC, payload.getBytes(), QoS.AT_LEAST_ONCE, false);
     Thread.sleep(10);
 
     payload =
         "test1,tag1=t1,tag2=t2  field7=t,field8=T,field9=true 3 \n "
             + "test1,tag1=t1,tag2=t2  field7=f,field8=F,field9=FALSE 4";
-    connection.publish(DATABASE + "/myTopic", payload.getBytes(), QoS.AT_LEAST_ONCE, false);
+    connection.publish(DATABASE + MY_TOPIC, payload.getBytes(), QoS.AT_LEAST_ONCE, false);
     Thread.sleep(10);
 
     payload =
         "test1,tag1=t1,tag2=t2 attr1=a1,attr2=a2 field1=\"fieldValue1\",field2=1i,field3=1u 4 \n "
             + "test1,tag1=t1,tag2=t2 field4=2,field5=2i32,field6=2f 5";
-    connection.publish(DATABASE + "/myTopic", payload.getBytes(), QoS.AT_LEAST_ONCE, false);
+    connection.publish(DATABASE + MY_TOPIC, payload.getBytes(), QoS.AT_LEAST_ONCE, false);
     Thread.sleep(10);
 
     payload = "# It's a remark\n " + "test1,tag1=t1,tag2=t2 field4=2,field5=2i32,field6=2f 6";
-    connection.publish(DATABASE + "/myTopic", payload.getBytes(), QoS.AT_LEAST_ONCE, false);
+    connection.publish(DATABASE + MY_TOPIC, payload.getBytes(), QoS.AT_LEAST_ONCE, false);
     Thread.sleep(10);
   }
 }

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

@@ -103,7 +103,7 @@ public DataNodeWrapper(
     this.schemaRegionConsensusPort = portList[4];
     this.mqttPort = portList[5];
     this.pipeAirGapReceiverPort = portList[6];
-    this.restServicePort = portList[10] + 6000;
+    this.restServicePort = portList[7];
     this.defaultNodePropertiesFile =
         EnvUtils.getFilePathFromSysVar(DEFAULT_DATA_NODE_PROPERTIES, clusterIndex);
     this.defaultCommonPropertiesFile =

integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBSystemPermissionIT.java

@@ -213,6 +213,7 @@ public void maintainOperationsTest() {
     grantUserSystemPrivileges("test6", PrivilegeType.SYSTEM);
     executeNonQuery("flush", "test6", "test123123456");
     executeNonQuery("clear cache", "test6", "test123123456");
+    executeNonQuery("clear auth cache", "test6", "test123123456");
     executeNonQuery("set system to readonly", "test6", "test123123456");
     executeNonQuery("set system to running", "test6", "test123123456");
     executeNonQuery(

integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSchemaSyntaxIT.java

@@ -0,0 +1,154 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.db.it.schema;
+
+import org.apache.iotdb.isession.ISession;
+import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.itbase.category.ClusterIT;
+import org.apache.iotdb.itbase.category.LocalStandaloneIT;
+import org.apache.iotdb.util.AbstractSchemaIT;
+
+import org.apache.tsfile.enums.TSDataType;
+import org.apache.tsfile.file.metadata.enums.CompressionType;
+import org.apache.tsfile.file.metadata.enums.TSEncoding;
+import org.apache.tsfile.write.record.Tablet;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runners.Parameterized;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.sql.Connection;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+@Category({LocalStandaloneIT.class, ClusterIT.class})
+public class IoTDBSchemaSyntaxIT extends AbstractSchemaIT {
+  public IoTDBSchemaSyntaxIT(SchemaTestMode schemaTestMode) {
+    super(schemaTestMode);
+  }
+
+  @Parameterized.BeforeParam
+  public static void before() throws Exception {
+    setUpEnvironment();
+    EnvFactory.getEnv().initClusterEnvironment();
+  }
+
+  @Parameterized.AfterParam
+  public static void after() throws Exception {
+    EnvFactory.getEnv().cleanClusterEnvironment();
+    tearDownEnvironment();
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    clearSchema();
+  }
+
+  @Test
+  public void testInvalidCreation() throws Exception {
+    final List<String> invalidSQLs =
+        Arrays.asList(
+            "CREATE TIMESERIES root.sg1.d1.s1 OBJECT",
+            "CREATE ALIGNED TIMESERIES root.sg1.d1.vector1(s1 OBJECT encoding=PLAIN compressor=UNCOMPRESSED,s2 INT64 encoding=RLE)",
+            "create schema template t1 (s2 OBJECT encoding=RLE, s3 INT64 encoding=RLE compression=SNAPPY)");
+
+    try (final Connection connection = EnvFactory.getEnv().getConnection();
+        final Statement statement = connection.createStatement()) {
+      for (final String invalidSQL : invalidSQLs) {
+        try {
+          statement.execute(invalidSQL);
+          Assert.fail();
+        } catch (final Exception ignore) {
+          // Expected
+        }
+      }
+    }
+
+    final String testObject =
+        System.getProperty("user.dir")
+            + File.separator
+            + "target"
+            + File.separator
+            + "test-classes"
+            + File.separator
+            + "object-example.pt";
+    final byte[] objectBytes = Files.readAllBytes(Paths.get(testObject));
+    final List<byte[]> objectSegments = new ArrayList<>();
+    for (int i = 0; i < objectBytes.length; i += 512) {
+      objectSegments.add(Arrays.copyOfRange(objectBytes, i, Math.min(i + 512, objectBytes.length)));
+    }
+    try (final ISession session = EnvFactory.getEnv().getSessionConnection()) {
+      // insert table data by tablet
+      final List<String> columnNameList =
+          Arrays.asList("region_id", "plant_id", "device_id", "temperature", "file");
+      final List<TSDataType> dataTypeList =
+          Arrays.asList(
+              TSDataType.STRING,
+              TSDataType.STRING,
+              TSDataType.STRING,
+              TSDataType.FLOAT,
+              TSDataType.OBJECT);
+      final Tablet tablet = new Tablet(columnNameList, dataTypeList);
+      tablet.setDeviceId("root.test.objectDevice");
+      for (int i = 0; i < columnNameList.size() - 1; i++) {
+        int rowIndex = tablet.getRowSize();
+        tablet.addTimestamp(rowIndex, 1);
+        tablet.addValue(rowIndex, 0, "1");
+        tablet.addValue(rowIndex, 1, "5");
+        tablet.addValue(rowIndex, 2, "3");
+        tablet.addValue(rowIndex, 3, 37.6F);
+        tablet.addValue(rowIndex, 4, false, i * 512L, objectSegments.get(i));
+      }
+      try {
+        session.insertTablet(tablet);
+        Assert.fail();
+      } catch (final Exception ignore) {
+        // Expected
+      }
+      try {
+        session.insertAlignedTablet(tablet);
+        Assert.fail();
+      } catch (final Exception ignore) {
+        // Expected
+      }
+      try {
+        session.createMultiTimeseries(
+            Collections.singletonList("root.sg1.d1.s1"),
+            Collections.singletonList(TSDataType.OBJECT),
+            Collections.singletonList(TSEncoding.PLAIN),
+            Collections.singletonList(CompressionType.LZ4),
+            null,
+            null,
+            null,
+            null);
+      } catch (final Exception ignore) {
+        // Expected
+      }
+      tablet.reset();
+    }
+  }
+}