This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch feature/continue_query
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/feature/continue_query by this
push:
new ae377fb fix Exception error in cluster (#3034)
ae377fb is described below
commit ae377fb684a1720b881e6a4b65a8c61e78272462
Author: mzp0514 <[email protected]>
AuthorDate: Tue Apr 20 17:44:11 2021 +0800
fix Exception error in cluster (#3034)
---
.../apache/iotdb/cluster/log/applier/DataLogApplier.java | 7 ++++---
.../java/org/apache/iotdb/cluster/common/IoTDBTest.java | 5 ++---
.../apache/iotdb/cluster/common/TestAsyncDataClient.java | 6 +++---
.../java/org/apache/iotdb/cluster/common/TestUtils.java | 4 ++--
.../iotdb/cluster/server/member/DataGroupMemberTest.java | 12 ++++++------
.../iotdb/cluster/server/member/MetaGroupMemberTest.java | 14 ++++++--------
6 files changed, 23 insertions(+), 25 deletions(-)
diff --git
a/cluster/src/main/java/org/apache/iotdb/cluster/log/applier/DataLogApplier.java
b/cluster/src/main/java/org/apache/iotdb/cluster/log/applier/DataLogApplier.java
index 7d11d3e..e24c59d 100644
---
a/cluster/src/main/java/org/apache/iotdb/cluster/log/applier/DataLogApplier.java
+++
b/cluster/src/main/java/org/apache/iotdb/cluster/log/applier/DataLogApplier.java
@@ -30,6 +30,7 @@ import org.apache.iotdb.cluster.server.member.MetaGroupMember;
import org.apache.iotdb.cluster.utils.IOUtils;
import org.apache.iotdb.db.engine.StorageEngine;
import org.apache.iotdb.db.exception.StorageEngineException;
+import org.apache.iotdb.db.exception.metadata.MetadataException;
import org.apache.iotdb.db.exception.metadata.PathNotExistException;
import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException;
import org.apache.iotdb.db.exception.query.QueryProcessException;
@@ -99,21 +100,21 @@ public class DataLogApplier extends BaseApplier {
}
private void applyInsert(InsertMultiTabletPlan plan)
- throws StorageGroupNotSetException, QueryProcessException,
StorageEngineException {
+ throws MetadataException, QueryProcessException, StorageEngineException {
for (InsertTabletPlan insertTabletPlan : plan.getInsertTabletPlanList()) {
applyInsert(insertTabletPlan);
}
}
private void applyInsert(InsertRowsPlan plan)
- throws StorageGroupNotSetException, QueryProcessException,
StorageEngineException {
+ throws MetadataException, QueryProcessException, StorageEngineException {
for (InsertRowPlan insertRowPlan : plan.getInsertRowPlanList()) {
applyInsert(insertRowPlan);
}
}
private void applyInsert(InsertPlan plan)
- throws StorageGroupNotSetException, QueryProcessException,
StorageEngineException {
+ throws MetadataException, QueryProcessException, StorageEngineException {
// check if the corresponding slot is being pulled
PartialPath sg;
long time = plan.getMinTime();
diff --git
a/cluster/src/test/java/org/apache/iotdb/cluster/common/IoTDBTest.java
b/cluster/src/test/java/org/apache/iotdb/cluster/common/IoTDBTest.java
index e7b1b7b..6b255a8 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/common/IoTDBTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/common/IoTDBTest.java
@@ -148,9 +148,8 @@ public abstract class IoTDBTest {
Collections.emptyMap(),
null));
} catch (QueryProcessException
- | StorageGroupNotSetException
- | StorageEngineException
- | IllegalPathException e) {
+ | MetadataException
+ | StorageEngineException e) {
// ignore
}
}
diff --git
a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestAsyncDataClient.java
b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestAsyncDataClient.java
index c5461dc..c758302 100644
---
a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestAsyncDataClient.java
+++
b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestAsyncDataClient.java
@@ -39,6 +39,7 @@ import org.apache.iotdb.cluster.utils.IOUtils;
import org.apache.iotdb.cluster.utils.StatusUtils;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.metadata.IllegalPathException;
+import org.apache.iotdb.db.exception.metadata.MetadataException;
import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.qp.executor.PlanExecutor;
@@ -170,9 +171,8 @@ public class TestAsyncDataClient extends AsyncDataClient {
resultHandler.onComplete(StatusUtils.OK);
} catch (IOException
| QueryProcessException
- | StorageGroupNotSetException
- | StorageEngineException
- | IllegalPathException e) {
+ | MetadataException
+ | StorageEngineException e) {
resultHandler.onError(e);
}
})
diff --git
a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestUtils.java
b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestUtils.java
index d8aebfc..04f5ad9 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestUtils.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestUtils.java
@@ -34,6 +34,7 @@ import org.apache.iotdb.db.engine.StorageEngine;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.metadata.IllegalPathException;
+import org.apache.iotdb.db.exception.metadata.MetadataException;
import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.metadata.PartialPath;
@@ -281,8 +282,7 @@ public class TestUtils {
}
public static void prepareData()
- throws QueryProcessException, StorageGroupNotSetException,
StorageEngineException,
- IllegalPathException {
+ throws QueryProcessException, MetadataException, StorageEngineException {
InsertRowPlan insertPlan = new InsertRowPlan();
// data for raw data query and aggregation
// 10 devices (storage groups)
diff --git
a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/DataGroupMemberTest.java
b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/DataGroupMemberTest.java
index 77e72b2..d5b84ca 100644
---
a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/DataGroupMemberTest.java
+++
b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/DataGroupMemberTest.java
@@ -66,6 +66,7 @@ import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.WriteProcessException;
import org.apache.iotdb.db.exception.metadata.IllegalPathException;
+import org.apache.iotdb.db.exception.metadata.MetadataException;
import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.metadata.PartialPath;
@@ -695,7 +696,7 @@ public class DataGroupMemberTest extends BaseMember {
@Test
public void testQuerySingleSeries()
- throws QueryProcessException, StorageGroupNotSetException,
StorageEngineException,
+ throws QueryProcessException, MetadataException, StorageEngineException,
IllegalPathException {
System.out.println("Start testQuerySingleSeries()");
InsertRowPlan insertPlan = new InsertRowPlan();
@@ -757,7 +758,7 @@ public class DataGroupMemberTest extends BaseMember {
@Test
public void testQuerySingleSeriesWithValueFilter()
- throws QueryProcessException, StorageGroupNotSetException,
StorageEngineException,
+ throws QueryProcessException, MetadataException, StorageEngineException,
IllegalPathException {
System.out.println("Start testQuerySingleSeriesWithValueFilter()");
InsertRowPlan insertPlan = new InsertRowPlan();
@@ -819,7 +820,7 @@ public class DataGroupMemberTest extends BaseMember {
@Test
public void testQuerySingleSeriesByTimestamp()
- throws QueryProcessException, StorageGroupNotSetException,
StorageEngineException,
+ throws QueryProcessException, MetadataException, StorageEngineException,
IllegalPathException {
System.out.println("Start testQuerySingleSeriesByTimestamp()");
InsertRowPlan insertPlan = new InsertRowPlan();
@@ -882,7 +883,7 @@ public class DataGroupMemberTest extends BaseMember {
@Test
public void testQuerySingleSeriesByTimestampWithValueFilter()
- throws QueryProcessException, StorageGroupNotSetException,
StorageEngineException,
+ throws QueryProcessException, MetadataException, StorageEngineException,
IllegalPathException {
System.out.println("Start
testQuerySingleSeriesByTimestampWithValueFilter()");
InsertRowPlan insertPlan = new InsertRowPlan();
@@ -1092,8 +1093,7 @@ public class DataGroupMemberTest extends BaseMember {
@Test
public void testGroupBy()
- throws QueryProcessException, StorageGroupNotSetException,
StorageEngineException,
- IllegalPathException {
+ throws QueryProcessException, MetadataException, StorageEngineException {
System.out.println("Start testGroupBy()");
TestUtils.prepareData();
diff --git
a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java
b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java
index f98bc22..e5acdb7 100644
---
a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java
+++
b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java
@@ -204,7 +204,7 @@ public class MetaGroupMemberTest extends BaseMember {
planExecutor.processNonQuery(plan);
return StatusUtils.OK;
} catch (QueryProcessException
- | StorageGroupNotSetException
+ | MetadataException
| StorageEngineException e) {
return
StatusUtils.getStatus(StatusUtils.EXECUTE_STATEMENT_ERROR, e.getMessage());
}
@@ -453,9 +453,8 @@ public class MetaGroupMemberTest extends BaseMember {
resultHandler.onComplete(StatusUtils.OK);
} catch (IOException
| QueryProcessException
- | StorageGroupNotSetException
- | StorageEngineException
- | IllegalPathException e) {
+ | MetadataException
+ | StorageEngineException e) {
resultHandler.onError(e);
}
})
@@ -532,8 +531,7 @@ public class MetaGroupMemberTest extends BaseMember {
@Test
public void testClosePartition()
- throws QueryProcessException, StorageEngineException,
StorageGroupNotSetException,
- IllegalPathException {
+ throws QueryProcessException, StorageEngineException, MetadataException {
System.out.println("Start testClosePartition()");
// the operation is accepted
dummyResponse.set(Response.RESPONSE_AGREE);
@@ -847,7 +845,7 @@ public class MetaGroupMemberTest extends BaseMember {
@Test
public void testGetReaderByTimestamp()
throws QueryProcessException, StorageEngineException, IOException,
- StorageGroupNotSetException, IllegalPathException {
+ MetadataException {
System.out.println("Start testGetReaderByTimestamp()");
RaftServer.setReadOperationTimeoutMS(10000);
mockDataClusterServer = true;
@@ -908,7 +906,7 @@ public class MetaGroupMemberTest extends BaseMember {
@Test
public void testGetReader()
throws QueryProcessException, StorageEngineException, IOException,
- StorageGroupNotSetException, IllegalPathException,
EmptyIntervalException {
+ MetadataException, EmptyIntervalException {
System.out.println("Start testGetReader()");
mockDataClusterServer = true;
InsertRowPlan insertPlan = new InsertRowPlan();
