You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by su...@apache.org on 2020/07/09 07:22:05 UTC
[incubator-iotdb] branch jira_791 created (now 83766af)
This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a change to branch jira_791
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 83766af [IOTDB-791] Remove unused PathException
This branch includes the following new commits:
new 83766af [IOTDB-791] Remove unused PathException
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-iotdb] 01/01: [IOTDB-791] Remove unused PathException
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a commit to branch jira_791
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 83766af8a48f16b3b458aa915fbe595fb7bcc42c
Author: samperson1997 <sz...@mails.tsinghua.edu.cn>
AuthorDate: Thu Jul 9 15:21:40 2020 +0800
[IOTDB-791] Remove unused PathException
---
.../iotdb/db/exception/query/PathException.java | 38 ----------------------
.../db/exception/runtime/SQLParserException.java | 7 ++--
.../iotdb/db/metadata/MManagerBasicTest.java | 3 +-
.../query/executor/GroupByEngineDataSetTest.java | 9 +++--
.../reader/series/SeriesAggregateReaderTest.java | 3 +-
.../reader/series/SeriesReaderByTimestampTest.java | 3 +-
.../db/query/reader/series/SeriesReaderTest.java | 3 +-
.../query/reader/series/SeriesReaderTestUtil.java | 5 ++-
.../iotdb/tsfile/read/filter/TimeFilter.java | 2 +-
9 files changed, 14 insertions(+), 59 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/query/PathException.java b/server/src/main/java/org/apache/iotdb/db/exception/query/PathException.java
deleted file mode 100644
index 5fd792b..0000000
--- a/server/src/main/java/org/apache/iotdb/db/exception/query/PathException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.iotdb.db.exception.query;
-
-import org.apache.iotdb.rpc.TSStatusCode;
-
-public class PathException extends QueryProcessException {
-
- private static final long serialVersionUID = 2141197032898163234L;
-
- public PathException() {
- super("Timeseries is null", TSStatusCode.PATH_ERROR.getStatusCode());
- }
-
- public PathException(String message) {
- super(message, TSStatusCode.PATH_ERROR.getStatusCode());
- }
-
- public PathException(String message, int errorCode) {
- super(message, errorCode);
- }
-}
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/runtime/SQLParserException.java b/server/src/main/java/org/apache/iotdb/db/exception/runtime/SQLParserException.java
index f0d0d67..8677f88 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/runtime/SQLParserException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/runtime/SQLParserException.java
@@ -18,11 +18,10 @@
*/
package org.apache.iotdb.db.exception.runtime;
-public class SQLParserException extends RuntimeException{
+public class SQLParserException extends RuntimeException {
+
private static final long serialVersionUID = 3249707655860110299L;
- public SQLParserException() {
- super("Error format in SQL statement, please check whether SQL statement is correct.");
- }
+
public SQLParserException(String message) {
super(message);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
index 29c942f..ea00cf1 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
@@ -20,7 +20,6 @@ package org.apache.iotdb.db.metadata;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.metadata.MetadataException;
-import org.apache.iotdb.db.exception.query.PathException;
import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
@@ -275,7 +274,7 @@ public class MManagerBasicTest {
}
@Test
- public void testMaximalSeriesNumberAmongStorageGroup() throws MetadataException, PathException {
+ public void testMaximalSeriesNumberAmongStorageGroup() throws MetadataException {
MManager manager = IoTDB.metaManager;
assertEquals(0, manager.getMaximalSeriesNumberAmongStorageGroups());
manager.setStorageGroup("root.laptop");
diff --git a/server/src/test/java/org/apache/iotdb/db/query/executor/GroupByEngineDataSetTest.java b/server/src/test/java/org/apache/iotdb/db/query/executor/GroupByEngineDataSetTest.java
index 96af121..0804827 100644
--- a/server/src/test/java/org/apache/iotdb/db/query/executor/GroupByEngineDataSetTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/query/executor/GroupByEngineDataSetTest.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.db.query.executor;
import java.io.IOException;
import java.util.ArrayList;
import org.apache.iotdb.db.exception.StorageEngineException;
-import org.apache.iotdb.db.exception.query.PathException;
import org.apache.iotdb.db.qp.physical.crud.GroupByTimePlan;
import org.apache.iotdb.db.query.aggregation.impl.CountAggrResult;
import org.apache.iotdb.db.query.dataset.groupby.GroupByEngineDataSet;
@@ -62,7 +61,7 @@ public class GroupByEngineDataSetTest {
}
@Test
- public void test2() throws IOException, PathException, StorageEngineException {
+ public void test2() throws IOException, StorageEngineException {
long queryId = 1000L;
long unit = 3;
long slidingStep = 5;
@@ -90,7 +89,7 @@ public class GroupByEngineDataSetTest {
}
@Test
- public void test3() throws IOException, PathException, StorageEngineException {
+ public void test3() throws IOException, StorageEngineException {
long queryId = 1000L;
long unit = 3;
long slidingStep = 3;
@@ -118,7 +117,7 @@ public class GroupByEngineDataSetTest {
}
@Test
- public void test4() throws IOException, PathException, StorageEngineException {
+ public void test4() throws IOException, StorageEngineException {
long queryId = 1000L;
long unit = 3;
long slidingStep = 3;
@@ -146,7 +145,7 @@ public class GroupByEngineDataSetTest {
}
@Test
- public void test5() throws IOException, PathException, StorageEngineException {
+ public void test5() throws IOException, StorageEngineException {
long queryId = 1000L;
long unit = 3;
long slidingStep = 3;
diff --git a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReaderTest.java b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReaderTest.java
index a7f920b..d2c4943 100644
--- a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReaderTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReaderTest.java
@@ -23,7 +23,6 @@ import org.apache.iotdb.db.engine.querycontext.QueryDataSource;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.metadata.MetadataException;
-import org.apache.iotdb.db.exception.query.PathException;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.query.aggregation.AggregateResult;
import org.apache.iotdb.db.query.context.QueryContext;
@@ -59,7 +58,7 @@ public class SeriesAggregateReaderTest {
@Before
- public void setUp() throws MetadataException, PathException, IOException, WriteProcessException {
+ public void setUp() throws MetadataException, IOException, WriteProcessException {
SeriesReaderTestUtil.setUp(measurementSchemas, deviceIds, seqResources, unseqResources);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestampTest.java b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestampTest.java
index 03bf2bf..b879685 100644
--- a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestampTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestampTest.java
@@ -23,7 +23,6 @@ import org.apache.iotdb.db.engine.querycontext.QueryDataSource;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.metadata.MetadataException;
-import org.apache.iotdb.db.exception.query.PathException;
import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -52,7 +51,7 @@ public class SeriesReaderByTimestampTest {
private List<TsFileResource> unseqResources = new ArrayList<>();
@Before
- public void setUp() throws MetadataException, PathException, IOException, WriteProcessException {
+ public void setUp() throws MetadataException, IOException, WriteProcessException {
SeriesReaderTestUtil.setUp(measurementSchemas, deviceIds, seqResources, unseqResources);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTest.java b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTest.java
index 41bca61..861ef47 100644
--- a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTest.java
@@ -22,7 +22,6 @@ package org.apache.iotdb.db.query.reader.series;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.metadata.MetadataException;
-import org.apache.iotdb.db.exception.query.PathException;
import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -57,7 +56,7 @@ public class SeriesReaderTest {
@Before
- public void setUp() throws MetadataException, PathException, IOException, WriteProcessException {
+ public void setUp() throws MetadataException, IOException, WriteProcessException {
SeriesReaderTestUtil.setUp(measurementSchemas, deviceIds, seqResources, unseqResources);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java
index 3eb5544..9091c18 100644
--- a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java
+++ b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java
@@ -25,7 +25,6 @@ import org.apache.iotdb.db.engine.cache.ChunkMetadataCache;
import org.apache.iotdb.db.engine.merge.manage.MergeManager;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.exception.metadata.MetadataException;
-import org.apache.iotdb.db.exception.query.PathException;
import org.apache.iotdb.db.query.control.FileReaderManager;
import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
@@ -60,7 +59,7 @@ public class SeriesReaderTestUtil {
public static void setUp(List<MeasurementSchema> measurementSchemas, List<String> deviceIds,
List<TsFileResource> seqResources, List<TsFileResource> unseqResources)
- throws MetadataException, PathException, IOException, WriteProcessException {
+ throws MetadataException, IOException, WriteProcessException {
IoTDB.metaManager.init();
prepareSeries(measurementSchemas, deviceIds);
prepareFiles(seqResources, unseqResources, measurementSchemas, deviceIds);
@@ -150,7 +149,7 @@ public class SeriesReaderTestUtil {
private static void prepareSeries(List<MeasurementSchema> measurementSchemas,
- List<String> deviceIds) throws MetadataException, PathException {
+ List<String> deviceIds) throws MetadataException {
for (int i = 0; i < measurementNum; i++) {
measurementSchemas.add(new MeasurementSchema("sensor" + i, TSDataType.INT32,
encoding, CompressionType.UNCOMPRESSED));
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/TimeFilter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/TimeFilter.java
index 307c694..ba93419 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/TimeFilter.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/filter/TimeFilter.java
@@ -70,7 +70,7 @@ public class TimeFilter {
public static class TimeIn extends In {
private TimeIn(Set<Long> values, boolean not) {
- super(values, FilterType.TIME_FILTER,not);
+ super(values, FilterType.TIME_FILTER, not);
}
}