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/13 14:05:44 UTC
[iotdb] branch master updated: [IOTDB-2903] fix last value fetch failure during show timesereis (#5508)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 984f1986d1 [IOTDB-2903] fix last value fetch failure during show timesereis (#5508)
984f1986d1 is described below
commit 984f1986d1530f7ed9f15c13ef1eba6a44d42230
Author: Marcos_Zyk <38...@users.noreply.github.com>
AuthorDate: Wed Apr 13 22:05:38 2022 +0800
[IOTDB-2903] fix last value fetch failure during show timesereis (#5508)
---
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 38 ++++++++++++++++++++++
.../db/metadata/lastCache/LastCacheManager.java | 8 +++--
2 files changed, 43 insertions(+), 3 deletions(-)
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 251a6e9b15..f87265c7e6 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
@@ -619,4 +619,42 @@ public class IoTDBMetadataFetchIT {
Assert.assertEquals(2, num);
}
}
+
+ @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/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 980c2f6aa1..2b682c76c2 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
@@ -25,6 +25,7 @@ import org.apache.iotdb.db.metadata.lastCache.container.ILastCacheContainer;
import org.apache.iotdb.db.metadata.mnode.IEntityMNode;
import org.apache.iotdb.db.metadata.mnode.IMNode;
import org.apache.iotdb.db.metadata.mnode.IMeasurementMNode;
+import org.apache.iotdb.db.metadata.path.MeasurementPath;
import org.apache.iotdb.db.metadata.path.PartialPath;
import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.query.control.QueryResourceManager;
@@ -222,14 +223,15 @@ public class LastCacheManager {
try {
// for the parameter "ascending": true or false both ok here,
// because LastPointReader will do itself sort logic instead of depending on fillOrderIndex.
+ MeasurementPath measurementPath = node.getMeasurementPath();
QueryDataSource dataSource =
QueryResourceManager.getInstance()
- .getQueryDataSource(node.getMeasurementPath(), queryContext, null, false);
+ .getQueryDataSource(measurementPath, queryContext, null, false);
Set<String> measurementSet = new HashSet<>();
- measurementSet.add(node.getPartialPath().getFullPath());
+ measurementSet.add(node.getName());
LastPointReader lastReader =
new LastPointReader(
- node.getPartialPath(),
+ measurementPath,
node.getSchema().getType(),
measurementSet,
queryContext,