You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/12/19 03:27:04 UTC
[iotdb] branch SessionCompatible created (now 8320dc297d)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch SessionCompatible
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 8320dc297d Keep Session interface compatible
This branch includes the following new commits:
new 8320dc297d Keep Session interface compatible
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.
[iotdb] 01/01: Keep Session interface compatible
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch SessionCompatible
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8320dc297d8dcd990fa72e905fee624ed1e91e7e
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Mon Dec 19 11:23:49 2022 +0800
Keep Session interface compatible
---
.../java/org/apache/iotdb/session/ISession.java | 8 +++++++-
.../java/org/apache/iotdb/session/Session.java | 22 +++++++++++++++++-----
2 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/session/src/main/java/org/apache/iotdb/session/ISession.java b/session/src/main/java/org/apache/iotdb/session/ISession.java
index 3ea579b5c1..015b7199ec 100644
--- a/session/src/main/java/org/apache/iotdb/session/ISession.java
+++ b/session/src/main/java/org/apache/iotdb/session/ISession.java
@@ -147,7 +147,13 @@ public interface ISession extends AutoCloseable {
SessionDataSet executeRawDataQuery(List<String> paths, long startTime, long endTime, long timeOut)
throws StatementExecutionException, IoTDBConnectionException;
- SessionDataSet executeLastDataQuery(List<String> paths, long LastTime, long timeOut)
+ SessionDataSet executeRawDataQuery(List<String> paths, long startTime, long endTime)
+ throws StatementExecutionException, IoTDBConnectionException;
+
+ SessionDataSet executeLastDataQuery(List<String> paths, long lastTime)
+ throws StatementExecutionException, IoTDBConnectionException;
+
+ SessionDataSet executeLastDataQuery(List<String> paths, long lastTime, long timeOut)
throws StatementExecutionException, IoTDBConnectionException;
SessionDataSet executeLastDataQuery(List<String> paths)
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 3f7fd803ce..4acd3fbdbc 100644
--- a/session/src/main/java/org/apache/iotdb/session/Session.java
+++ b/session/src/main/java/org/apache/iotdb/session/Session.java
@@ -780,24 +780,36 @@ public class Session implements ISession {
}
}
+ @Override
+ public SessionDataSet executeRawDataQuery(List<String> paths, long startTime, long endTime)
+ throws StatementExecutionException, IoTDBConnectionException {
+ return executeRawDataQuery(paths, startTime, endTime, queryTimeoutInMs);
+ }
+
+ @Override
+ public SessionDataSet executeLastDataQuery(List<String> paths, long lastTime)
+ throws StatementExecutionException, IoTDBConnectionException {
+ return executeLastDataQuery(paths, lastTime, queryTimeoutInMs);
+ }
+
/**
* query e.g. select last data from paths where time >= lastTime
*
* @param paths timeSeries eg. root.ln.d1.s1,root.ln.d1.s2
- * @param LastTime get the last data, whose timestamp is greater than or equal LastTime e.g.
+ * @param lastTime get the last data, whose timestamp is greater than or equal lastTime e.g.
* 1621326244168
*/
@Override
- public SessionDataSet executeLastDataQuery(List<String> paths, long LastTime, long timeOut)
+ public SessionDataSet executeLastDataQuery(List<String> paths, long lastTime, long timeOut)
throws StatementExecutionException, IoTDBConnectionException {
try {
- return defaultSessionConnection.executeLastDataQuery(paths, LastTime, timeOut);
+ return defaultSessionConnection.executeLastDataQuery(paths, lastTime, timeOut);
} catch (RedirectException e) {
handleQueryRedirection(e.getEndPoint());
if (enableQueryRedirection) {
// retry
try {
- return defaultSessionConnection.executeLastDataQuery(paths, LastTime, timeOut);
+ return defaultSessionConnection.executeLastDataQuery(paths, lastTime, timeOut);
} catch (RedirectException redirectException) {
logger.error("redirect twice", redirectException);
throw new StatementExecutionException("redirect twice, please try again.");
@@ -817,7 +829,7 @@ public class Session implements ISession {
public SessionDataSet executeLastDataQuery(List<String> paths)
throws StatementExecutionException, IoTDBConnectionException {
long time = 0L;
- return executeLastDataQuery(paths, time, 60000);
+ return executeLastDataQuery(paths, time, queryTimeoutInMs);
}
/**