This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch delete_timeseries_in_session in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 8195a0853878f1f4ac242d17d130739639a0b76f Author: qiaojialin <[email protected]> AuthorDate: Sat Sep 21 19:07:52 2019 +0800 rename delete to deleteData in session --- .../src/main/java/org/apache/iotdb/SessionExample.java | 2 +- .../src/main/java/org/apache/iotdb/session/Session.java | 7 ++++++- .../test/java/org/apache/iotdb/session/IoTDBSessionIT.java | 6 +++--- .../org/apache/iotdb/session/utils/EnvironmentUtils.java | 14 +++++++------- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/example/session/src/main/java/org/apache/iotdb/SessionExample.java b/example/session/src/main/java/org/apache/iotdb/SessionExample.java index 982061e..3c43e1a 100644 --- a/example/session/src/main/java/org/apache/iotdb/SessionExample.java +++ b/example/session/src/main/java/org/apache/iotdb/SessionExample.java @@ -67,7 +67,7 @@ public class SessionExample { private static void delete() throws IoTDBSessionException { String path = "root.sg1.d1.s1"; long deleteTime = 99; - session.delete(path, deleteTime); + session.deleteData(path, deleteTime); } private static void insertRowBatch() throws IoTDBSessionException { diff --git a/session/src/main/java/org/apache/iotdb/session/Session.java b/session/src/main/java/org/apache/iotdb/session/Session.java index c988dce..272ffea 100644 --- a/session/src/main/java/org/apache/iotdb/session/Session.java +++ b/session/src/main/java/org/apache/iotdb/session/Session.java @@ -176,7 +176,12 @@ public class Session { } } - public synchronized TSStatus delete(String path, long time) throws IoTDBSessionException { + /** + * @param path data of whose time series to delete + * @param time data with time stamp less than or equal to time will be deleted + * @return result statue + */ + public synchronized TSStatus deleteData(String path, long time) throws IoTDBSessionException { TSDeleteReq request = new TSDeleteReq(); request.setPath(path); request.setTimestamp(time); diff --git a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionIT.java b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionIT.java index 67fce4e..740d7e5 100644 --- a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionIT.java +++ b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionIT.java @@ -128,9 +128,9 @@ public class IoTDBSessionIT { String path3 = "root.sg1.d1.s3"; long deleteTime = 99; - session.delete(path1, deleteTime); - session.delete(path2, deleteTime); - session.delete(path3, deleteTime); + session.deleteData(path1, deleteTime); + session.deleteData(path2, deleteTime); + session.deleteData(path3, deleteTime); } public void queryTest() throws ClassNotFoundException, SQLException { diff --git a/session/src/test/java/org/apache/iotdb/session/utils/EnvironmentUtils.java b/session/src/test/java/org/apache/iotdb/session/utils/EnvironmentUtils.java index dbdbc79..344563c 100644 --- a/session/src/test/java/org/apache/iotdb/session/utils/EnvironmentUtils.java +++ b/session/src/test/java/org/apache/iotdb/session/utils/EnvironmentUtils.java @@ -91,7 +91,7 @@ public class EnvironmentUtils { } // close metadata MManager.getInstance().clear(); - // delete all directory + // deleteData all directory cleanAllDir(); config.setMaxMemtableNumber(oldMaxMemTableNumber); @@ -101,22 +101,22 @@ public class EnvironmentUtils { } public static void cleanAllDir() throws IOException { - // delete sequential files + // deleteData sequential files for (String path : directoryManager.getAllSequenceFileFolders()) { cleanDir(path); } - // delete unsequence files + // deleteData unsequence files for (String path : directoryManager.getAllUnSequenceFileFolders()) { cleanDir(path); } - // delete system info + // deleteData system info cleanDir(config.getSystemDir()); - // delete wal + // deleteData wal cleanDir(config.getWalFolder()); - // delete index + // deleteData index cleanDir(config.getIndexFileDir()); cleanDir(config.getBaseDir()); - // delete data files + // deleteData data files for (String dataDir : config.getDataDirs()) { cleanDir(dataDir); }
