You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/06/28 01:19:01 UTC
[incubator-iotdb] branch feature_async_close_tsfile updated: rename
executeWithoutValueFilter in some places to execute (#209)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch feature_async_close_tsfile
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/feature_async_close_tsfile by this push:
new db6c22f rename executeWithoutValueFilter in some places to execute (#209)
db6c22f is described below
commit db6c22f24d32675b13637978d1edfd7642d5c8cb
Author: RUI, LEI <33...@users.noreply.github.com>
AuthorDate: Fri Jun 28 09:18:57 2019 +0800
rename executeWithoutValueFilter in some places to execute (#209)
---
.../apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java | 4 ++--
.../org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java | 2 +-
.../org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java | 8 ++++----
.../apache/iotdb/db/query/executor/AggregateEngineExecutor.java | 4 ++--
.../java/org/apache/iotdb/db/query/executor/EngineExecutor.java | 2 +-
.../org/apache/iotdb/db/query/executor/FillEngineExecutor.java | 2 +-
.../src/main/java/org/apache/iotdb/db/service/StartupChecks.java | 2 +-
.../src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java | 4 ++--
.../org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java | 2 +-
.../java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java | 4 ++--
.../java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java | 4 ++--
.../java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java | 4 ++--
.../java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java | 2 +-
iotdb/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java | 2 +-
14 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java
index fdb453c..99e4169 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java
@@ -223,7 +223,7 @@ public class BufferWriteProcessor extends Processor {
LOGGER.info("BufferWriteProcessor.insert step2 of SAFE cost: {}", start2);
Map<MemTableWriteTimeCostType, long[]> map = MemTableWriteTimeCost.getInstance().getTimeCostMaps().get(Thread.currentThread().getName());
for(MemTableWriteTimeCostType type: MemTableWriteTimeCostType.values()){
- LOGGER.info("In BufferWriteProcessor.insert step2 of SAFE, {} cost {} ms, executeWithoutValueFilter {} times", type, map.get(type)[1], map.get(type)[0]);
+ LOGGER.info("In BufferWriteProcessor.insert step2 of SAFE, {} cost {} ms, execute {} times", type, map.get(type)[1], map.get(type)[0]);
}
}
checkMemThreshold4Flush(memUsage);
@@ -242,7 +242,7 @@ public class BufferWriteProcessor extends Processor {
LOGGER.info("BufferWriteProcessor.insert step2 of WARNING cost: {}", start2);
Map<MemTableWriteTimeCostType, long[]> map = MemTableWriteTimeCost.getInstance().getTimeCostMaps().get(Thread.currentThread().getName());
for(MemTableWriteTimeCostType type: MemTableWriteTimeCostType.values()){
- LOGGER.info("In BufferWriteProcessor.insert step2 of WARNING, {} cost {} ms, executeWithoutValueFilter {} times", type, map.get(type)[1], map.get(type)[0]);
+ LOGGER.info("In BufferWriteProcessor.insert step2 of WARNING, {} cost {} ms, execute {} times", type, map.get(type)[1], map.get(type)[0]);
}
}
try {
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
index 430ae1f..d23ff73 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
@@ -456,7 +456,7 @@
// }
//
// /**
-// * executeWithoutValueFilter filenode recovery.
+// * execute filenode recovery.
// */
// public void recover() throws FileNodeProcessorException {
// // restore sequential files
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java
index 56710b2..2ffab93 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/executor/IQueryProcessExecutor.java
@@ -78,7 +78,7 @@ public interface IQueryProcessExecutor {
throws ProcessorException, IOException, PathErrorException, FileNodeManagerException;
/**
- * executeWithoutValueFilter update command and return whether the operator is successful.
+ * execute update command and return whether the operator is successful.
*
* @param path : update series seriesPath
* @param startTime start time in update command
@@ -90,7 +90,7 @@ public interface IQueryProcessExecutor {
throws ProcessorException;
/**
- * executeWithoutValueFilter delete command and return whether the operator is successful.
+ * execute delete command and return whether the operator is successful.
*
* @param deletePlan physical delete plan
* @return - whether the operator is successful.
@@ -98,7 +98,7 @@ public interface IQueryProcessExecutor {
boolean delete(DeletePlan deletePlan) throws ProcessorException;
/**
- * executeWithoutValueFilter delete command and return whether the operator is successful.
+ * execute delete command and return whether the operator is successful.
*
* @param path : delete series seriesPath
* @param deleteTime end time in delete command
@@ -107,7 +107,7 @@ public interface IQueryProcessExecutor {
boolean delete(Path path, long deleteTime) throws ProcessorException;
/**
- * executeWithoutValueFilter insert command and return whether the operator is successful.
+ * execute insert command and return whether the operator is successful.
*
* @return - Operate Type.
*/
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
index 867aaa7..074b587 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/AggregateEngineExecutor.java
@@ -76,7 +76,7 @@ public class AggregateEngineExecutor {
}
/**
- * executeWithoutValueFilter aggregate function with only time filter or no filter.
+ * execute aggregate function with only time filter or no filter.
*
* @param context query context
*/
@@ -253,7 +253,7 @@ public class AggregateEngineExecutor {
/**
- * executeWithoutValueFilter aggregate function with value filter.
+ * execute aggregate function with value filter.
*
* @param context query context.
*/
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutor.java b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutor.java
index 2898fc7..ff59ca6 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/EngineExecutor.java
@@ -90,7 +90,7 @@ public class EngineExecutor {
}
/**
- * executeWithoutValueFilter query.
+ * executeWithValueFilter query.
*
* @return QueryDataSet object
* @throws FileNodeManagerException FileNodeManagerException
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/FillEngineExecutor.java b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/FillEngineExecutor.java
index 33980dd..85f6f7b 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/query/executor/FillEngineExecutor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/query/executor/FillEngineExecutor.java
@@ -52,7 +52,7 @@ public class FillEngineExecutor {
}
/**
- * executeWithoutValueFilter fill.
+ * execute fill.
*
* @param context query context
*/
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/StartupChecks.java b/iotdb/src/main/java/org/apache/iotdb/db/service/StartupChecks.java
index 31e6d7c..ce64f0f 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/service/StartupChecks.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/service/StartupChecks.java
@@ -84,7 +84,7 @@ public class StartupChecks {
}
/**
- * executeWithoutValueFilter every pretests.
+ * execute every pretests.
*/
public void verify() throws StartupException {
for (StartupCheck check : preChecks) {
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index 6e80350..6104f2c 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -413,7 +413,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
}
/**
- * Judge whether the statement is ADMIN COMMAND and if true, executeWithoutValueFilter it.
+ * Judge whether the statement is ADMIN COMMAND and if true, execute it.
*
* @param statement command
* @return true if the statement is ADMIN COMMAND
@@ -481,7 +481,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
}
} catch (Exception e) {
String errMessage = String.format(
- "Fail to generate physcial plan and executeWithoutValueFilter for statement "
+ "Fail to generate physcial plan and execute for statement "
+ "%s beacuse %s",
statement, e.getMessage());
LOGGER.warn("Error occurred when executing {}", statement, e);
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java
index ce2df28..d9385ff 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBAuthorizationIT.java
@@ -563,7 +563,7 @@ public class IoTDBAuthorizationIT {
userStmt.execute("CREATE TIMESERIES root.a.b WITH DATATYPE=INT32,ENCODING=PLAIN");
userStmt.execute("CREATE TIMESERIES root.a.c WITH DATATYPE=INT32,ENCODING=PLAIN");
userStmt.execute("INSERT INTO root.a(timestamp,b,c) VALUES (1,100,1000)");
- // userStmt.executeWithoutValueFilter("DELETE FROM root.a.b WHERE TIME <= 1000000000");
+ // userStmt.execute("DELETE FROM root.a.b WHERE TIME <= 1000000000");
userStmt.execute("SELECT * FROM root");
userStmt.getResultSet().close();
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java
index 9c5902f..6889253 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBLargeDataIT.java
@@ -136,7 +136,7 @@ public class IoTDBLargeDataIT {
}
statement.execute("flush");
- // statement.executeWithoutValueFilter("merge");
+ // statement.execute("merge");
Thread.sleep(5000);
@@ -208,7 +208,7 @@ public class IoTDBLargeDataIT {
}
// overflow delete
- // statement.executeWithoutValueFilter("DELETE FROM root.vehicle.d0.s1 WHERE time < 3200");
+ // statement.execute("DELETE FROM root.vehicle.d0.s1 WHERE time < 3200");
statement.close();
} catch (Exception e) {
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
index 67dc511..f97e6c1 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
@@ -137,7 +137,7 @@ public class IoTDBMultiSeriesIT {
}
statement.execute("flush");
- // statement.executeWithoutValueFilter("merge");
+ // statement.execute("merge");
Thread.sleep(5000);
@@ -209,7 +209,7 @@ public class IoTDBMultiSeriesIT {
}
// overflow delete
- // statement.executeWithoutValueFilter("DELETE FROM root.vehicle.d0.s1 WHERE time < 3200");
+ // statement.execute("DELETE FROM root.vehicle.d0.s1 WHERE time < 3200");
statement.close();
} catch (Exception e) {
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
index 5424ef6..aa2ef7c 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
@@ -138,7 +138,7 @@ public class IoTDBSeriesReaderIT {
statement.execute(sql);
}
- // statement.executeWithoutValueFilter("flush");
+ // statement.execute("flush");
// insert large amount of data time range : 13700 ~ 24000
for (int time = 13700; time < 24000; time++) {
@@ -226,7 +226,7 @@ public class IoTDBSeriesReaderIT {
}
// overflow update
- // statement.executeWithoutValueFilter("UPDATE root.vehicle SET d0.s1 = 11111111 WHERE time > 23000 and time < 100100");
+ // statement.execute("UPDATE root.vehicle SET d0.s1 = 11111111 WHERE time > 23000 and time < 100100");
statement.close();
} catch (Exception e) {
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java
index eb68eaf..76d6734 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/integration/IoTDBTimeZoneIT.java
@@ -67,7 +67,7 @@ public class IoTDBTimeZoneIT {
}
/**
- * // executeWithoutValueFilter in cli-tool SET STORAGE GROUP TO root.timezone CREATE TIMESERIES root.timezone.tz1 WITH DATATYPE =
+ * // execute in cli-tool SET STORAGE GROUP TO root.timezone CREATE TIMESERIES root.timezone.tz1 WITH DATATYPE =
* INT32, ENCODING = PLAIN set time_zone=+08:00 insert into root.timezone(timestamp,tz1) values(1514779200000,1)
* insert into root.timezone(timestamp,tz1) values(2018-1-1T12:00:01,2) insert into root.timezone(timestamp,tz1)
* values(2018-1-1T12:00:02+08:00,3) insert into root.timezone(timestamp,tz1) values(2018-1-1T12:00:03+09:00,4)
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java b/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java
index cf0b3da..7baf34c 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java
@@ -188,7 +188,7 @@ public class QPUpdateTest {
String sqlStr = "insert into root.qp_update_test.device_1 (timestamp, sensor_1, sensor_2) values (13, 50, 40)";
PhysicalPlan plan1 = processor.parseSQLToPhysicalPlan(sqlStr);
- // executeWithoutValueFilter insert
+ // execute insert
boolean upRet = processor.getExecutor().processNonQuery(plan1);
assertTrue(upRet);