You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/04/14 11:14:04 UTC
[iotdb] branch double_live updated: Merge remote-tracking branch 'upstream/rel/0.13' into double_live (#5545)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch double_live
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/double_live by this push:
new 7352a9ef05 Merge remote-tracking branch 'upstream/rel/0.13' into double_live (#5545)
7352a9ef05 is described below
commit 7352a9ef052be4c6250841509c281e2fbfd029b6
Author: YongzaoDan <33...@users.noreply.github.com>
AuthorDate: Thu Apr 14 19:13:58 2022 +0800
Merge remote-tracking branch 'upstream/rel/0.13' into double_live (#5545)
Co-authored-by: CRZbulabula <cr...@gmail.com>
---
.../db/integration/IoTDBDeleteStorageGroupIT.java | 23 +++++++++++++
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 38 ++++++++++++++++++++++
pom.xml | 2 +-
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 3 +-
.../storagegroup/VirtualStorageGroupProcessor.java | 8 ++---
.../db/metadata/lastCache/LastCacheManager.java | 6 ++--
.../iotdb/db/metadata/logfile/MLogTxtWriter.java | 11 ++++---
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 4 ++-
8 files changed, 80 insertions(+), 15 deletions(-)
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBDeleteStorageGroupIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBDeleteStorageGroupIT.java
index a303b5bc33..ac5873b0b6 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBDeleteStorageGroupIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBDeleteStorageGroupIT.java
@@ -157,4 +157,27 @@ public class IoTDBDeleteStorageGroupIT {
assertEquals(0, result.size());
}
}
+
+ @Test
+ public void testDeleteStorageGroupAndThenQuery() throws Exception {
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("insert into root.sg1.d1(time,s1) values(1,1);");
+ statement.execute("flush");
+ statement.execute("select count(*) from root.**;");
+ statement.execute("delete storage group root.sg1");
+ statement.execute("insert into root.sg1.sdhkajhd(time,s1) values(1,1);");
+ statement.execute("flush");
+ boolean hasResult = statement.execute("select count(*) from root.**");
+ assertTrue(hasResult);
+ int count = 0;
+ try (ResultSet resultSet = statement.getResultSet()) {
+ while (resultSet.next()) {
+ count++;
+ assertEquals(1, resultSet.getLong("count(root.sg1.sdhkajhd.s1)"));
+ }
+ }
+ assertEquals(1, count);
+ }
+ }
}
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
index 52210d2ec9..4f6cd885a9 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
@@ -623,4 +623,42 @@ public class IoTDBMetadataFetchIT {
Assert.assertEquals(expected, actual);
}
+
+ @Test
+ @Category({LocalStandaloneTest.class, ClusterTest.class, RemoteTest.class})
+ public void showLatestTimeseriesTest() throws SQLException {
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+
+ statement.execute("insert into root.ln.wf01.wt01(time, status) values(1, 1)");
+ statement.execute("insert into root.ln.wf01.wt01(time, temperature) values(2, 1)");
+ String sql = "show latest timeseries root.ln.wf01.wt01.*";
+ Set<String> standard =
+ new HashSet<>(
+ Arrays.asList(
+ "root.ln.wf01.wt01.temperature,null,root.ln.wf01.wt01,FLOAT,RLE,SNAPPY,null,null,",
+ "root.ln.wf01.wt01.status,null,root.ln.wf01.wt01,BOOLEAN,PLAIN,SNAPPY,null,null,"));
+ try {
+ boolean hasResultSet = statement.execute(sql);
+ if (hasResultSet) {
+ try (ResultSet resultSet = statement.getResultSet()) {
+ ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
+ while (resultSet.next()) {
+ StringBuilder builder = new StringBuilder();
+ for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
+ builder.append(resultSet.getString(i)).append(",");
+ }
+ String string = builder.toString();
+ Assert.assertTrue(standard.contains(string));
+ standard.remove(string);
+ }
+ assertEquals(0, standard.size());
+ }
+ }
+ } catch (SQLException e) {
+ logger.error("showTimeseriesTest() failed", e);
+ fail(e.getMessage());
+ }
+ }
+ }
}
diff --git a/pom.xml b/pom.xml
index 4db4709328..53da67406d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
<commons.collections4>4.4</commons.collections4>
<!-- keep consistent with client-cpp/tools/thrift/pom.xml-->
<thrift.version>0.14.1</thrift.version>
- <airline.version>0.8</airline.version>
+ <airline.version>0.9</airline.version>
<jackson.version>2.10.5</jackson.version>
<antlr4.version>4.8-1</antlr4.version>
<common.cli.version>1.3.1</common.cli.version>
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
index d4492c7cea..c9bc95a803 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
@@ -256,6 +256,7 @@ public class IoTDBConfigCheck {
properties.setProperty(k, v);
}
});
+ properties.setProperty(IOTDB_VERSION_STRING, IoTDBConstant.VERSION);
properties.store(tmpFOS, SYSTEM_PROPERTIES_STRING);
// upgrade finished, delete old system.properties file
@@ -284,7 +285,7 @@ public class IoTDBConfigCheck {
properties.setProperty(k, v);
}
});
-
+ properties.setProperty(IOTDB_VERSION_STRING, IoTDBConstant.VERSION);
properties.store(tmpFOS, SYSTEM_PROPERTIES_STRING);
// upgrade finished, delete old system.properties file
if (propertiesFile.exists()) {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/VirtualStorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/VirtualStorageGroupProcessor.java
index 678477401f..5f3fc23774 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/VirtualStorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/VirtualStorageGroupProcessor.java
@@ -25,8 +25,6 @@ import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.directories.DirectoryManager;
import org.apache.iotdb.db.engine.StorageEngine;
-import org.apache.iotdb.db.engine.cache.ChunkCache;
-import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache;
import org.apache.iotdb.db.engine.compaction.CompactionScheduler;
import org.apache.iotdb.db.engine.compaction.CompactionTaskManager;
import org.apache.iotdb.db.engine.compaction.task.CompactionRecoverManager;
@@ -121,6 +119,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import static org.apache.iotdb.db.conf.IoTDBConstant.FILE_NAME_SEPARATOR;
import static org.apache.iotdb.db.engine.storagegroup.TsFileResource.TEMP_SUFFIX;
+import static org.apache.iotdb.db.qp.executor.PlanExecutor.operateClearCache;
import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TSFILE_SUFFIX;
/**
@@ -2169,9 +2168,8 @@ public class VirtualStorageGroupProcessor {
.recoverSettleFileMap
.remove(oldTsFileResource.getTsFile().getAbsolutePath());
}
- // clear Cache , including chunk cache and timeseriesMetadata cache
- ChunkCache.getInstance().clear();
- TimeSeriesMetadataCache.getInstance().clear();
+ // clear Cache , including chunk cache, timeseriesMetadata cache and bloom filter cache
+ operateClearCache();
// if old tsfile is being deleted in the process due to its all data's being deleted.
if (!oldTsFileResource.getTsFile().exists()) {
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/lastCache/LastCacheManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/lastCache/LastCacheManager.java
index 6f57d912f0..117f5cec07 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/lastCache/LastCacheManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/lastCache/LastCacheManager.java
@@ -224,12 +224,12 @@ public class LastCacheManager {
// because LastPointReader will do itself sort logic instead of depending on fillOrderIndex.
QueryDataSource dataSource =
QueryResourceManager.getInstance()
- .getQueryDataSource(node.getPartialPath(), queryContext, null, false);
+ .getQueryDataSource(node.getMeasurementPath(), queryContext, null, false);
Set<String> measurementSet = new HashSet<>();
- measurementSet.add(node.getPartialPath().getFullPath());
+ measurementSet.add(node.getName());
LastPointReader lastReader =
new LastPointReader(
- node.getPartialPath(),
+ node.getMeasurementPath(),
node.getSchema().getType(),
measurementSet,
queryContext,
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/logfile/MLogTxtWriter.java b/server/src/main/java/org/apache/iotdb/db/metadata/logfile/MLogTxtWriter.java
index f4b85f95ba..c9660562df 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/logfile/MLogTxtWriter.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/logfile/MLogTxtWriter.java
@@ -58,6 +58,7 @@ import java.nio.file.Paths;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
public class MLogTxtWriter implements AutoCloseable {
@@ -140,12 +141,14 @@ public class MLogTxtWriter implements AutoCloseable {
buf.append(
String.format(
"%s,%s,%s,%s,%s,%s",
- MetadataOperationType.CREATE_TIMESERIES,
+ MetadataOperationType.CREATE_ALIGNED_TIMESERIES,
plan.getPrefixPath().getFullPath(),
plan.getMeasurements(),
- plan.getDataTypes().stream().map(TSDataType::serialize),
- plan.getEncodings().stream().map(TSEncoding::serialize),
- plan.getCompressors().stream().map(CompressionType::serialize)));
+ plan.getDataTypes().stream().map(TSDataType::serialize).collect(Collectors.toList()),
+ plan.getEncodings().stream().map(TSEncoding::serialize).collect(Collectors.toList()),
+ plan.getCompressors().stream()
+ .map(CompressionType::serialize)
+ .collect(Collectors.toList())));
buf.append(",[");
if (plan.getAliasList() != null) {
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
index 75ad7e084e..a0571f71d3 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/executor/PlanExecutor.java
@@ -31,6 +31,7 @@ import org.apache.iotdb.db.concurrent.ThreadName;
import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.StorageEngine;
+import org.apache.iotdb.db.engine.cache.BloomFilterCache;
import org.apache.iotdb.db.engine.cache.ChunkCache;
import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache;
import org.apache.iotdb.db.engine.cq.ContinuousQueryService;
@@ -509,9 +510,10 @@ public class PlanExecutor implements IPlanExecutor {
StorageEngine.getInstance().mergeAll();
}
- private void operateClearCache() {
+ public static void operateClearCache() {
ChunkCache.getInstance().clear();
TimeSeriesMetadataCache.getInstance().clear();
+ BloomFilterCache.getInstance().clear();
}
private void operateCreateSnapshot() {