You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by li...@apache.org on 2021/05/13 04:38:40 UTC
[iotdb] branch jdbc_maxrows created (now 944ef95)
This is an automated email from the ASF dual-hosted git repository.
liudw pushed a change to branch jdbc_maxrows
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at 944ef95 add max_rows support
This branch includes the following new commits:
new 944ef95 add max_rows support
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: add max_rows support
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liudw pushed a commit to branch jdbc_maxrows
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 944ef950c3b1fe391c22e2a50c8634e09b02fbd5
Author: liudw <li...@apache.org>
AuthorDate: Thu May 13 11:25:31 2021 +0800
add max_rows support
---
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 66 ++++++++++++++--------
1 file changed, 42 insertions(+), 24 deletions(-)
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 14d36ec..6eacc87 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
@@ -19,6 +19,18 @@
package org.apache.iotdb.jdbc;
+import java.nio.ByteBuffer;
+import java.sql.BatchUpdateException;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Statement;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -32,28 +44,15 @@ import org.apache.iotdb.service.rpc.thrift.TSQueryDataSet;
import org.apache.iotdb.service.rpc.thrift.TSQueryNonAlignDataSet;
import org.apache.iotdb.service.rpc.thrift.TSStatus;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
-
import org.apache.thrift.TException;
-import java.nio.ByteBuffer;
-import java.sql.BatchUpdateException;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
-import java.sql.Statement;
-import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
public class IoTDBStatement implements Statement {
ZoneId zoneId;
private ResultSet resultSet = null;
private IoTDBConnection connection;
private int fetchSize;
+ private int maxRows = 0;
/**
* Timeout of query can be set by users. Unit: s If not set, default value 0 will be used, which
@@ -65,20 +64,28 @@ public class IoTDBStatement implements Statement {
private List<String> batchSQLList;
private static final String NOT_SUPPORT_EXECUTE = "Not support execute";
private static final String NOT_SUPPORT_EXECUTE_UPDATE = "Not support executeUpdate";
- /** Keep state so we can fail certain calls made after close(). */
+ /**
+ * Keep state so we can fail certain calls made after close().
+ */
private boolean isClosed = false;
- /** Keep state so we can fail certain calls made after cancel(). */
+ /**
+ * Keep state so we can fail certain calls made after cancel().
+ */
private boolean isCancelled = false;
- /** Add SQLWarnings to the warningChain if needed. */
+ /**
+ * Add SQLWarnings to the warningChain if needed.
+ */
private SQLWarning warningChain = null;
private long sessionId;
private long stmtId = -1;
private long queryId = -1;
- /** Constructor of IoTDBStatement. */
+ /**
+ * Constructor of IoTDBStatement.
+ */
IoTDBStatement(
IoTDBConnection connection,
TSIService.Iface client,
@@ -249,7 +256,11 @@ public class IoTDBStatement implements Statement {
private boolean executeSQL(String sql) throws TException, SQLException {
isCancelled = false;
TSExecuteStatementReq execReq = new TSExecuteStatementReq(sessionId, sql, stmtId);
- execReq.setFetchSize(fetchSize);
+ int rows = fetchSize;
+ if (maxRows != 0 && fetchSize > maxRows) {
+ rows = maxRows;
+ }
+ execReq.setFetchSize(rows);
execReq.setTimeout((long) queryTimeout * 1000);
TSExecuteStatementResp execResp = client.executeStatement(execReq);
try {
@@ -340,7 +351,7 @@ public class IoTDBStatement implements Statement {
allSuccess =
allSuccess
&& (execResp.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()
- || execResp.getCode() == TSStatusCode.NEED_REDIRECTION.getStatusCode());
+ || execResp.getCode() == TSStatusCode.NEED_REDIRECTION.getStatusCode());
result[i] = execResp.getCode();
message.setLength(0);
message.append(execResp.getMessage());
@@ -386,7 +397,11 @@ public class IoTDBStatement implements Statement {
private ResultSet executeQuerySQL(String sql, long timeoutInMS) throws TException, SQLException {
isCancelled = false;
TSExecuteStatementReq execReq = new TSExecuteStatementReq(sessionId, sql, stmtId);
- execReq.setFetchSize(fetchSize);
+ int rows = fetchSize;
+ if (maxRows != 0 && fetchSize > maxRows) {
+ rows = maxRows;
+ }
+ execReq.setFetchSize(rows);
execReq.setTimeout(timeoutInMS);
TSExecuteStatementResp execResp = client.executeQueryStatement(execReq);
queryId = execResp.getQueryId();
@@ -581,13 +596,16 @@ public class IoTDBStatement implements Statement {
@Override
public int getMaxRows() throws SQLException {
- throw new SQLException("Not support getMaxRows");
+ return this.maxRows;
}
@Override
public void setMaxRows(int num) throws SQLException {
- throw new SQLException(
- "Not support getMaxRows" + ". Please use the LIMIT clause in a query instead.");
+ checkConnection("setMaxRows");
+ if (num <= 0) {
+ throw new SQLException(String.format("maxRows %d must be > 0!", num));
+ }
+ this.maxRows = num;
}
@Override