Merge branch 'master' into table_data_deletion

# Conflicts:
#	iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/LoadTsFileManager.java

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

@@ -1041,25 +1041,23 @@ public void testInvalidMaxPointNumber() {
 
   @Test
   public void testStorageGroupWithHyphenInName() {
-    try (Connection connection = EnvFactory.getEnv().getConnection();
-        Statement statement = connection.createStatement()) {
+    try (final Connection connection = EnvFactory.getEnv().getConnection();
+        final Statement statement = connection.createStatement()) {
       statement.setFetchSize(5);
       statement.execute("CREATE DATABASE root.group_with_hyphen");
-    } catch (SQLException e) {
+    } catch (final SQLException e) {
       fail();
     }
 
-    try (Connection connection = EnvFactory.getEnv().getConnection();
-        Statement statement = connection.createStatement()) {
-      try (ResultSet resultSet = statement.executeQuery("SHOW DATABASES")) {
-        ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
+    try (final Connection connection = EnvFactory.getEnv().getConnection();
+        final Statement statement = connection.createStatement()) {
+      try (final ResultSet resultSet = statement.executeQuery("SHOW DATABASES DETAILS")) {
         while (resultSet.next()) {
-          StringBuilder builder = new StringBuilder();
-          builder.append(resultSet.getString(1));
-          Assert.assertEquals(builder.toString(), "root.group_with_hyphen");
+          Assert.assertEquals("root.group_with_hyphen", resultSet.getString(1));
+          Assert.assertEquals("TREE", resultSet.getString(12));
         }
       }
-    } catch (SQLException e) {
+    } catch (final SQLException e) {
       fail();
     }
   }

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

@@ -65,6 +65,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -954,7 +955,7 @@ public void testInsertTabletWithTTL()
         Assert.assertTrue(record.getFields().get(0).getLongV() > timeLowerBound);
         count++;
       }
-      Assert.assertTrue(count > 0 && count < 4);
+      Assert.assertEquals(2, count);
     }
   }
 
@@ -1041,6 +1042,39 @@ public void testInsertUnsequenceData()
     }
   }
 
+  @Test
+  public void testInsertAllNullRow() throws SQLException {
+    try (Connection connection = EnvFactory.getEnv().getConnection(BaseEnv.TABLE_SQL_DIALECT);
+        Statement st1 = connection.createStatement()) {
+      st1.execute("use \"test\"");
+      st1.execute("create table table5(d1 string id, s1 int32 measurement, s2 int32 measurement)");
+
+      st1.execute("insert into table5(time, d1,s1,s2) values(1,'a',1,null)");
+      // insert all null row
+      st1.execute("insert into table5(time, d1,s1,s2) values(2,'a',null,null)");
+
+      ResultSet rs1 = st1.executeQuery("select * from table5");
+      assertTrue(rs1.next());
+      assertEquals("1", rs1.getString("s1"));
+      assertNull(rs1.getString("s2"));
+      assertTrue(rs1.next());
+      assertNull(rs1.getString("s1"));
+      assertNull(rs1.getString("s2"));
+      assertFalse(rs1.next());
+
+      st1.execute("flush");
+
+      rs1 = st1.executeQuery("select * from table5");
+      assertTrue(rs1.next());
+      assertEquals("1", rs1.getString("s1"));
+      assertNull(rs1.getString("s2"));
+      assertTrue(rs1.next());
+      assertNull(rs1.getString("s1"));
+      assertNull(rs1.getString("s2"));
+      assertFalse(rs1.next());
+    }
+  }
+
   private List<Integer> checkHeader(
       ResultSetMetaData resultSetMetaData, String expectedHeaderStrings, int[] expectedTypes)
       throws SQLException {