You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/05/23 06:06:38 UTC
[incubator-iotdb] 03/03: improve client display
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch refactor_author_query
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit aeaf6703b5afe6202258bc8f074a894c18ec06d2
Author: 江天 <jt...@163.com>
AuthorDate: Thu May 23 14:04:45 2019 +0800
improve client display
---
.../src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java | 1 +
.../src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 9 +++++++++
jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java | 9 +++++++--
service-rpc/src/main/thrift/rpc.thrift | 1 +
4 files changed, 18 insertions(+), 2 deletions(-)
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 21f01e1..63d50c0 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
@@ -592,6 +592,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
private TSExecuteStatementResp executeAuthQuery(PhysicalPlan plan, List<String> columns) {
TSExecuteStatementResp resp = getTSExecuteStatementResp(TS_StatusCode.SUCCESS_STATUS, "");
+ resp.ignoreTimeStamp = true;
AuthorPlan authorPlan = (AuthorPlan) plan;
switch (authorPlan.getAuthorType()) {
case LIST_ROLE:
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java
index c9b2b2c..58ed56e 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java
@@ -87,6 +87,7 @@ public class IoTDBQueryResultSet implements ResultSet {
// 0 means it is not constrained in sql, or the offset position has been reached
private int rowsOffset = 0;
private long queryId;
+ private boolean ignoreTimeStamp = false;
/*
* Combine maxRows and the LIMIT constraints. maxRowsOrRowsLimit = 0 means that neither maxRows
@@ -1245,4 +1246,12 @@ public class IoTDBQueryResultSet implements ResultSet {
}
return null;
}
+
+ public boolean isIgnoreTimeStamp() {
+ return ignoreTimeStamp;
+ }
+
+ public void setIgnoreTimeStamp(boolean ignoreTimeStamp) {
+ this.ignoreTimeStamp = ignoreTimeStamp;
+ }
}
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
index c5e7235..91a1537 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
@@ -252,9 +252,12 @@ public class IoTDBStatement implements Statement {
operationHandle = execResp.getOperationHandle();
Utils.verifySuccess(execResp.getStatus());
if (execResp.getOperationHandle().hasResultSet) {
- resultSet = new IoTDBQueryResultSet(this, execResp.getColumns(), client,
+ IoTDBQueryResultSet resSet = new IoTDBQueryResultSet(this,
+ execResp.getColumns(), client,
operationHandle, sql, execResp.getOperationType(),
getColumnsType(execResp.getColumns()), queryId.getAndIncrement());
+ resSet.setIgnoreTimeStamp(execResp.ignoreTimeStamp);
+ this.resultSet = resSet;
return true;
}
return false;
@@ -348,9 +351,11 @@ public class IoTDBStatement implements Statement {
TSExecuteStatementResp execResp = client.executeQueryStatement(execReq);
operationHandle = execResp.getOperationHandle();
Utils.verifySuccess(execResp.getStatus());
- resultSet = new IoTDBQueryResultSet(this, execResp.getColumns(), client,
+ IoTDBQueryResultSet resSet = new IoTDBQueryResultSet(this, execResp.getColumns(), client,
operationHandle, sql, execResp.getOperationType(), getColumnsType(execResp.getColumns()),
queryId.getAndIncrement());
+ resSet.setIgnoreTimeStamp(execResp.ignoreTimeStamp);
+ this.resultSet = resSet;
return resultSet;
}
diff --git a/service-rpc/src/main/thrift/rpc.thrift b/service-rpc/src/main/thrift/rpc.thrift
index de18cfe..6e857e8 100644
--- a/service-rpc/src/main/thrift/rpc.thrift
+++ b/service-rpc/src/main/thrift/rpc.thrift
@@ -73,6 +73,7 @@ struct TSExecuteStatementResp {
// Column names in select statement of SQL
3: optional list<string> columns
4: optional string operationType
+ 5: optional bool ignoreTimeStamp
}
enum TSProtocolVersion {