This is an automated email from the ASF dual-hosted git repository. chaow pushed a commit to branch fix_pull_schema_bug in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a8c74322f6093ef9ef41b2ee704162fa9ecc20c9 Author: chaow <[email protected]> AuthorDate: Wed Mar 24 10:45:21 2021 +0800 fix pull schema bug --- .../src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java | 5 +++-- .../apache/iotdb/db/engine/compaction/utils/CompactionUtils.java | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java index 97904bf..e11c0c5 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java @@ -78,7 +78,6 @@ import org.apache.iotdb.tsfile.read.TimeValuePair; import org.apache.iotdb.tsfile.utils.Pair; import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; import org.apache.iotdb.tsfile.write.schema.TimeseriesSchema; - import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -285,6 +284,8 @@ public class CMManager extends MManager { List<MeasurementSchema> schemas = metaPuller.pullMeasurementSchemas(schemasToPull); for (MeasurementSchema schema : schemas) { // TODO-Cluster: also pull alias? + // take care, the pulled schema's measurement Id is the full path + schema.setMeasurementId(new PartialPath(schema.getMeasurementId()).getMeasurement()); MeasurementMNode measurementMNode = new MeasurementMNode(null, schema.getMeasurementId(), schema, null); cacheMeta(deviceId.concatNode(schema.getMeasurementId()), measurementMNode); @@ -1391,7 +1392,7 @@ public class CMManager extends MManager { public Set<String> getAllDevices(List<String> paths) throws MetadataException { Set<String> results = new HashSet<>(); for (String path : paths) { - getAllTimeseriesPath(new PartialPath(path)).stream() + getDevices(new PartialPath(path)).stream() .map(PartialPath::getFullPath) .forEach(results::add); } diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/utils/CompactionUtils.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/utils/CompactionUtils.java index 059b07b..8614d3d 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/utils/CompactionUtils.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/utils/CompactionUtils.java @@ -19,6 +19,8 @@ package org.apache.iotdb.db.engine.compaction.utils; +import com.google.common.util.concurrent.RateLimiter; +import org.apache.commons.collections4.keyvalue.DefaultMapEntry; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.engine.compaction.TsFileManagement; import org.apache.iotdb.db.engine.merge.manage.MergeManager; @@ -41,9 +43,6 @@ import org.apache.iotdb.tsfile.utils.Pair; import org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl; import org.apache.iotdb.tsfile.write.chunk.IChunkWriter; import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter; - -import com.google.common.util.concurrent.RateLimiter; -import org.apache.commons.collections4.keyvalue.DefaultMapEntry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -190,7 +189,7 @@ public class CompactionUtils { IoTDB.metaManager.getSeriesSchema(new PartialPath(device), entry.getKey()), true); } catch (MetadataException e) { // this may caused in IT by restart - logger.error("{} get schema {} error,skip this sensor", device, entry.getKey()); + logger.error("{} get schema {} error, skip this sensor", device, entry.getKey(), e); return; } for (TimeValuePair timeValuePair : timeValuePairMap.values()) {
