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 03:55:39 UTC
[iotdb] branch master updated: Fix compile error (#5500)
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 fc0313ed8b Fix compile error (#5500)
fc0313ed8b is described below
commit fc0313ed8bc6abfb6e7c815df2dbafef898401ce
Author: YongzaoDan <33...@users.noreply.github.com>
AuthorDate: Wed Apr 13 11:55:34 2022 +0800
Fix compile error (#5500)
---
.../service/thrift/impl/DataNodeManagementServiceImpl.java | 13 +++++++++++--
.../iotdb/db/mpp/operator/SchemaScanOperatorTest.java | 11 ++++++++---
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeManagementServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeManagementServiceImpl.java
index 8728421d79..7e83ddcb81 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeManagementServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeManagementServiceImpl.java
@@ -45,6 +45,8 @@ import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
@@ -59,9 +61,12 @@ public class DataNodeManagementServiceImpl implements ManagementIService.Iface {
try {
PartialPath storageGroupPartitionPath = new PartialPath(req.getStorageGroup());
TRegionReplicaSet regionReplicaSet = req.getRegionReplicaSet();
- SchemaRegionId schemaRegionId = new SchemaRegionId(regionReplicaSet.getRegionId());
+ SchemaRegionId schemaRegionId =
+ (SchemaRegionId)
+ ConsensusGroupId.Factory.create(ByteBuffer.wrap(regionReplicaSet.getRegionId()));
schemaEngine.createSchemaRegion(storageGroupPartitionPath, schemaRegionId);
- ConsensusGroupId consensusGroupId = new SchemaRegionId(regionReplicaSet.getRegionId());
+ ConsensusGroupId consensusGroupId =
+ ConsensusGroupId.Factory.create(ByteBuffer.wrap(regionReplicaSet.getRegionId()));
List<Peer> peers = new ArrayList<>();
for (EndPoint endPoint : regionReplicaSet.getEndpoint()) {
Endpoint endpoint = new Endpoint(endPoint.getIp(), endPoint.getPort());
@@ -86,6 +91,10 @@ public class DataNodeManagementServiceImpl implements ManagementIService.Iface {
tsStatus = new TSStatus(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
tsStatus.setMessage(
String.format("Create Schema Region failed because of %s", e2.getMessage()));
+ } catch (IOException e3) {
+ LOGGER.error("Can't deserialize regionId", e3);
+ tsStatus = new TSStatus(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
+ tsStatus.setMessage(String.format("Can't deserialize regionId %s", e3));
}
return tsStatus;
}
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/operator/SchemaScanOperatorTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/operator/SchemaScanOperatorTest.java
index ab960f0d22..09a1f89f13 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/operator/SchemaScanOperatorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/operator/SchemaScanOperatorTest.java
@@ -20,9 +20,10 @@ package org.apache.iotdb.db.mpp.operator;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.exception.metadata.MetadataException;
-import org.apache.iotdb.db.metadata.LocalConfigManager;
+import org.apache.iotdb.db.metadata.LocalConfigNode;
import org.apache.iotdb.db.metadata.path.PartialPath;
import org.apache.iotdb.db.metadata.schemaregion.ISchemaRegion;
+import org.apache.iotdb.db.metadata.schemaregion.SchemaEngine;
import org.apache.iotdb.db.mpp.common.FragmentInstanceId;
import org.apache.iotdb.db.mpp.common.PlanFragmentId;
import org.apache.iotdb.db.mpp.common.QueryId;
@@ -103,7 +104,9 @@ public class SchemaScanOperatorTest {
1, new PlanNodeId("1"), SchemaScanOperator.class.getSimpleName());
PartialPath partialPath = new PartialPath(META_SCAN_OPERATOR_TEST_SG + ".device0");
ISchemaRegion schemaRegion =
- LocalConfigManager.getInstance().getBelongedSchemaRegion(partialPath);
+ SchemaEngine.getInstance()
+ .getSchemaRegion(
+ LocalConfigNode.getInstance().getBelongedSchemaRegionId(partialPath));
operatorContext
.getInstanceContext()
.setDriverContext(new SchemaDriverContext(fragmentInstanceContext, schemaRegion));
@@ -164,7 +167,9 @@ public class SchemaScanOperatorTest {
1, new PlanNodeId("1"), SchemaScanOperator.class.getSimpleName());
PartialPath partialPath = new PartialPath(META_SCAN_OPERATOR_TEST_SG + ".device0.*");
ISchemaRegion schemaRegion =
- LocalConfigManager.getInstance().getBelongedSchemaRegion(partialPath);
+ SchemaEngine.getInstance()
+ .getSchemaRegion(
+ LocalConfigNode.getInstance().getBelongedSchemaRegionId(partialPath));
operatorContext
.getInstanceContext()
.setDriverContext(new SchemaDriverContext(fragmentInstanceContext, schemaRegion));