Merge branch 'DisableObjectType' of https://github.com/apache/iotdb into DisableObjectType

Author: JackieTien97

integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBSimpleQueryTableIT.java

@@ -658,19 +658,18 @@ public void testNewDataType() {
       statement.execute("USE " + DATABASE_NAME);
       statement.execute(
           "CREATE TABLE table1(device STRING TAG, "
-              + "s4 DATE FIELD, s5 TIMESTAMP FIELD, s6 BLOB FIELD, s7 STRING FIELD, s8 OBJECT FIELD)");
+              + "s4 DATE FIELD, s5 TIMESTAMP FIELD, s6 BLOB FIELD, s7 STRING FIELD)");
 
       for (int i = 1; i <= 10; i++) {
         statement.execute(
             String.format(
-                "insert into table1(time, device, s4, s5, s6, s7, s8) "
-                    + "values(%d, 'd1', '%s', %d, %s, '%s', %s)",
+                "insert into table1(time, device, s4, s5, s6, s7) "
+                    + "values(%d, 'd1', '%s', %d, %s, '%s')",
                 i,
                 LocalDate.of(2024, 5, i % 31 + 1),
                 i,
                 "X'cafebabe'",
-                i,
-                "to_object(true, 0, X'cafebabe')"));
+                i));
       }
 
       try (ResultSet resultSet = statement.executeQuery("select * from table1")) {
@@ -687,8 +686,6 @@ public void testNewDataType() {
             columnType.put(i, TSDataType.BLOB);
           } else if (metaData.getColumnLabel(i).equals("s7")) {
             columnType.put(i, TSDataType.TEXT);
-          } else if (metaData.getColumnLabel(i).equals("s8")) {
-            columnType.put(i, TSDataType.OBJECT);
           }
         }
         byte[] byteArray = new byte[] {(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE};
@@ -698,58 +695,12 @@ public void testNewDataType() {
           long timestamp = resultSet.getLong(4);
           byte[] blob = resultSet.getBytes(5);
           String text = resultSet.getString(6);
-          String objectSizeString = resultSet.getString(7);
           assertEquals(2024 - 1900, date.getYear());
           assertEquals(5 - 1, date.getMonth());
           assertEquals(time % 31 + 1, date.getDate());
           assertEquals(time, timestamp);
           assertArrayEquals(byteArray, blob);
           assertEquals(String.valueOf(time), text);
-          assertEquals("(Object) 4 B", objectSizeString);
-        }
-      }
-      try (ResultSet resultSet = statement.executeQuery("select read_object(s8) from table1")) {
-        final ResultSetMetaData metaData = resultSet.getMetaData();
-        final int columnCount = metaData.getColumnCount();
-        assertEquals(1, columnCount);
-        byte[] byteArray = new byte[] {(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE};
-        while (resultSet.next()) {
-          byte[] blob = resultSet.getBytes(1);
-          assertArrayEquals(byteArray, blob);
-        }
-      }
-
-    } catch (SQLException e) {
-      fail();
-    }
-  }
-
-  @Test
-  public void testObjectDataType() {
-    try (Connection connection = EnvFactory.getEnv().getConnection(BaseEnv.TABLE_SQL_DIALECT);
-        Statement statement = connection.createStatement()) {
-      statement.execute("CREATE DATABASE test");
-      statement.execute("USE " + DATABASE_NAME);
-      statement.execute("CREATE TABLE table1(device STRING TAG, s8 OBJECT FIELD)");
-      statement.execute(
-          "insert into table1(time, device, s8) values(1, 'd1', to_object(false, 0, X'cafe'))");
-      statement.execute(
-          "insert into table1(time, device, s8) values(1, 'd1', to_object(true, 2, X'babe'))");
-
-      try (ResultSet resultSet = statement.executeQuery("select * from table1")) {
-        while (resultSet.next()) {
-          String objectSizeString = resultSet.getString(3);
-          assertEquals("(Object) 4 B", objectSizeString);
-        }
-      }
-      try (ResultSet resultSet = statement.executeQuery("select read_object(s8) from table1")) {
-        final ResultSetMetaData metaData = resultSet.getMetaData();
-        final int columnCount = metaData.getColumnCount();
-        assertEquals(1, columnCount);
-        byte[] byteArray = new byte[] {(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE};
-        while (resultSet.next()) {
-          byte[] blob = resultSet.getBytes(1);
-          assertArrayEquals(byteArray, blob);
         }
       }
 

integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java

@@ -19,7 +19,6 @@
 
 package org.apache.iotdb.relational.it.schema;
 
-import org.apache.iotdb.commons.utils.WindowsOSUtils;
 import org.apache.iotdb.db.it.utils.TestUtils;
 import org.apache.iotdb.isession.ITableSession;
 import org.apache.iotdb.it.env.EnvFactory;
@@ -32,7 +31,6 @@
 
 import org.apache.tsfile.enums.ColumnCategory;
 import org.apache.tsfile.enums.TSDataType;
-import org.apache.tsfile.external.commons.lang3.SystemUtils;
 import org.apache.tsfile.write.record.Tablet;
 import org.apache.tsfile.write.schema.IMeasurementSchema;
 import org.apache.tsfile.write.schema.MeasurementSchema;
@@ -43,9 +41,6 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -783,142 +778,6 @@ public void testConcurrentAutoCreateAndDropColumn() throws Exception {
     }
   }
 
-  @Test
-  public void testTableObjectCheck() throws Exception {
-    final Set<String> illegal = new HashSet<>(Arrays.asList("./", ".", "..", ".\\", "../hack"));
-    if (SystemUtils.IS_OS_WINDOWS) {
-      illegal.add("C.");
-      illegal.add("a:b<|");
-      illegal.add("COM1");
-    }
-    for (final String single : illegal) {
-      testObject4SingleIllegalPath(single);
-    }
-  }
-
-  private void testObject4SingleIllegalPath(final String illegal) throws Exception {
-    try (final Connection connection =
-            EnvFactory.getEnv().getConnection(BaseEnv.TABLE_SQL_DIALECT);
-        final Statement statement = connection.createStatement();
-        final ITableSession session = EnvFactory.getEnv().getTableSessionConnection()) {
-      statement.execute("create database if not exists db2");
-      statement.execute("use db2");
-
-      // Test auto-create table
-      final String testObject =
-          System.getProperty("user.dir")
-              + File.separator
-              + "target"
-              + File.separator
-              + "test-classes"
-              + File.separator
-              + "object-example.pt";
-
-      final List<IMeasurementSchema> schemaList = new ArrayList<>();
-      schemaList.add(new MeasurementSchema("a", TSDataType.STRING));
-      schemaList.add(new MeasurementSchema("b", TSDataType.STRING));
-      schemaList.add(new MeasurementSchema("c", TSDataType.INT32));
-      schemaList.add(new MeasurementSchema(illegal, TSDataType.OBJECT));
-      final List<ColumnCategory> columnTypes =
-          Arrays.asList(
-              ColumnCategory.TAG,
-              ColumnCategory.ATTRIBUTE,
-              ColumnCategory.FIELD,
-              ColumnCategory.FIELD);
-      final Tablet tablet =
-          new Tablet(
-              illegal,
-              IMeasurementSchema.getMeasurementNameList(schemaList),
-              IMeasurementSchema.getDataTypeList(schemaList),
-              columnTypes,
-              1);
-      tablet.addTimestamp(0, System.currentTimeMillis());
-      tablet.addValue(schemaList.get(0).getMeasurementName(), 0, "d1");
-      tablet.addValue(schemaList.get(1).getMeasurementName(), 0, "a1");
-      tablet.addValue(schemaList.get(2).getMeasurementName(), 0, 0);
-      tablet.addValue(0, 3, true, 0, Files.readAllBytes(Paths.get(testObject)));
-
-      final String expectedTableError =
-          String.format(
-              "701: When there are object fields, the tableName %s shall not be '.', '..' or contain './', '.\\'."
-                  + (SystemUtils.IS_OS_WINDOWS ? " " + WindowsOSUtils.OS_SEGMENT_ERROR : ""),
-              illegal.toLowerCase());
-      final String expectedObjectError =
-          String.format(
-              "701: When there are object fields, the objectName %s shall not be '.', '..' or contain './', '.\\'."
-                  + (SystemUtils.IS_OS_WINDOWS ? " " + WindowsOSUtils.OS_SEGMENT_ERROR : ""),
-              illegal.toLowerCase());
-
-      try {
-        session.executeNonQueryStatement("use db2");
-        session.insert(tablet);
-      } catch (final Exception e) {
-        Assert.assertEquals(expectedTableError, e.getMessage());
-      }
-
-      statement.execute(String.format("create table \"%s\" ()", illegal));
-
-      try {
-        statement.execute(String.format("alter table \"%s\" add column a object", illegal));
-        fail();
-      } catch (final SQLException e) {
-        Assert.assertEquals(expectedTableError, e.getMessage());
-      }
-
-      // Test auto-create column
-      try {
-        session.executeNonQueryStatement("use db2");
-        session.insert(tablet);
-      } catch (final Exception e) {
-        Assert.assertEquals(expectedTableError, e.getMessage());
-      }
-
-      try {
-        statement.execute(String.format("create table test (\"%s\" object)", illegal));
-        fail();
-      } catch (final SQLException e) {
-        Assert.assertEquals(expectedObjectError, e.getMessage());
-      }
-
-      statement.execute("create table test (a tag, b attribute, c int32, d object)");
-
-      // Cannot auto-extend illegal column
-      tablet.setTableName("test");
-      try {
-        session.executeNonQueryStatement("use db2");
-        session.insert(tablet);
-      } catch (final Exception e) {
-        Assert.assertEquals(expectedObjectError, e.getMessage());
-      }
-
-      // It's OK if you don't write object
-      statement.execute(String.format("insert into test (a, b, c) values ('%s', 1, 1)", illegal));
-      try {
-        statement.execute(
-            String.format(
-                "insert into test (a, b, c, d) values ('%s', 1, 1, to_object(true, 0, X'aa'))",
-                illegal));
-        fail();
-      } catch (final SQLException e) {
-        Assert.assertEquals(
-            String.format(
-                "507: When there are object fields, the deviceId [test, %s] shall not be '.', '..' or contain './', '.\\'."
-                    + (SystemUtils.IS_OS_WINDOWS ? " " + WindowsOSUtils.OS_SEGMENT_ERROR : ""),
-                illegal),
-            e.getMessage());
-      }
-
-      try {
-        statement.execute(String.format("alter table test add column \"%s\" object", illegal));
-        fail();
-      } catch (final SQLException e) {
-        Assert.assertEquals(expectedObjectError, e.getMessage());
-      }
-
-      statement.execute("drop database db2");
-    }
-  }
-
   @Test
   public void testTreeViewTable() throws Exception {
     try (final Connection connection = EnvFactory.getEnv().getConnection();