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/09/19 10:45:20 UTC
[incubator-iotdb] branch master updated: Rename some varaible names
and struct names in RPC (#404)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 2b5da1a Rename some varaible names and struct names in RPC (#404)
2b5da1a is described below
commit 2b5da1a07da756a506aa5eba3aef21a41a942907
Author: Zesong Sun <24...@qq.com>
AuthorDate: Thu Sep 19 18:45:13 2019 +0800
Rename some varaible names and struct names in RPC (#404)
* Rename some varaible names and struct names in RPC
---
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 4 +-
.../jdbc/IoTDBPreparedInsertionStatement.java | 4 +-
.../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 6 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 14 +-
.../test/java/org/apache/iotdb/jdbc/BatchTest.java | 10 +-
.../org/apache/iotdb/jdbc/IoTDBConnectionTest.java | 8 +-
.../iotdb/jdbc/IoTDBDatabaseMetadataTest.java | 6 +-
.../iotdb/jdbc/IoTDBPreparedStatementTest.java | 9 +-
.../apache/iotdb/jdbc/IoTDBQueryResultSetTest.java | 11 +-
.../org/apache/iotdb/jdbc/IoTDBStatementTest.java | 6 +-
.../test/java/org/apache/iotdb/jdbc/UtilsTest.java | 15 +-
.../engine/storagegroup/StorageGroupProcessor.java | 6 +-
.../db/engine/storagegroup/TsFileProcessor.java | 4 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 231 ++++++++++-----------
service-rpc/rpc-changelist.md | 10 +-
.../main/java/org/apache/iotdb/rpc/RpcUtils.java | 6 +-
.../rpc/{TSStatusType.java => TSStatusCode.java} | 4 +-
service-rpc/src/main/thrift/rpc.thrift | 44 ++--
.../java/org/apache/iotdb/session/Session.java | 22 +-
19 files changed, 207 insertions(+), 213 deletions(-)
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
index 85270e1..4449141 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
@@ -483,9 +483,9 @@ public class IoTDBConnection implements Connection {
public void setTimeZone(String zoneId) throws TException, IoTDBSQLException {
TSSetTimeZoneReq req = new TSSetTimeZoneReq(zoneId);
- TSRPCResp resp = client.setTimeZone(req);
+ TSStatus resp = client.setTimeZone(req);
try {
- RpcUtils.verifySuccess(resp.getStatus());
+ RpcUtils.verifySuccess(resp);
} catch (IoTDBRPCException e) {
throw new IoTDBSQLException(e.getMessage());
}
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBPreparedInsertionStatement.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBPreparedInsertionStatement.java
index 2fe0370..4cf4a31 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBPreparedInsertionStatement.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBPreparedInsertionStatement.java
@@ -23,7 +23,7 @@ import java.sql.SQLException;
import java.time.ZoneId;
import java.util.List;
-import org.apache.iotdb.rpc.TSStatusType;
+import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.TSExecuteStatementResp;
import org.apache.iotdb.service.rpc.thrift.TSIService.Iface;
import org.apache.iotdb.service.rpc.thrift.TSInsertionReq;
@@ -50,7 +50,7 @@ public class IoTDBPreparedInsertionStatement extends IoTDBPreparedStatement {
req.unsetMeasurements();
req.unsetTimestamp();
req.unsetValues();
- return resp.getStatus().getStatusType().getCode() == TSStatusType.SUCCESS_STATUS.getStatusCode();
+ return resp.getStatus().getStatusType().getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode();
} catch (TException e) {
throw new SQLException(e);
}
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 c63413e..29a75cb 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java
@@ -54,7 +54,7 @@ import org.apache.iotdb.service.rpc.thrift.TSFetchResultsResp;
import org.apache.iotdb.service.rpc.thrift.TSIService;
import org.apache.iotdb.service.rpc.thrift.TSOperationHandle;
import org.apache.iotdb.service.rpc.thrift.TSQueryDataSet;
-import org.apache.iotdb.service.rpc.thrift.TSRPCResp;
+import org.apache.iotdb.service.rpc.thrift.TSStatus;
import org.apache.iotdb.tsfile.read.common.Field;
import org.apache.iotdb.tsfile.read.common.RowRecord;
import org.apache.thrift.TException;
@@ -216,8 +216,8 @@ public class IoTDBQueryResultSet implements ResultSet {
try {
if (operationHandle != null) {
TSCloseOperationReq closeReq = new TSCloseOperationReq(operationHandle, queryId);
- TSRPCResp closeResp = client.closeOperation(closeReq);
- RpcUtils.verifySuccess(closeResp.getStatus());
+ TSStatus closeResp = client.closeOperation(closeReq);
+ RpcUtils.verifySuccess(closeResp);
}
} catch (IoTDBRPCException e) {
throw new SQLException("Error occurs for close opeation in server side becasuse " + e);
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 d89c5eb..a786cb3 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
@@ -32,7 +32,7 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.iotdb.rpc.IoTDBRPCException;
import org.apache.iotdb.rpc.RpcUtils;
-import org.apache.iotdb.rpc.TSStatusType;
+import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.TSCancelOperationReq;
import org.apache.iotdb.service.rpc.thrift.TSCloseOperationReq;
import org.apache.iotdb.service.rpc.thrift.TSExecuteBatchStatementReq;
@@ -41,7 +41,7 @@ import org.apache.iotdb.service.rpc.thrift.TSExecuteStatementReq;
import org.apache.iotdb.service.rpc.thrift.TSExecuteStatementResp;
import org.apache.iotdb.service.rpc.thrift.TSIService;
import org.apache.iotdb.service.rpc.thrift.TSOperationHandle;
-import org.apache.iotdb.service.rpc.thrift.TSRPCResp;
+import org.apache.iotdb.service.rpc.thrift.TSStatus;
import org.apache.iotdb.service.rpc.thrift.TS_SessionHandle;
import org.apache.thrift.TException;
@@ -134,8 +134,8 @@ public class IoTDBStatement implements Statement {
try {
if (operationHandle != null) {
TSCancelOperationReq closeReq = new TSCancelOperationReq(operationHandle);
- TSRPCResp closeResp = client.cancelOperation(closeReq);
- RpcUtils.verifySuccess(closeResp.getStatus());
+ TSStatus closeResp = client.cancelOperation(closeReq);
+ RpcUtils.verifySuccess(closeResp);
}
} catch (Exception e) {
throw new SQLException("Error occurs when canceling statement.", e);
@@ -161,8 +161,8 @@ public class IoTDBStatement implements Statement {
if (operationHandle != null) {
TSCloseOperationReq closeReq = new TSCloseOperationReq(operationHandle, -1);
closeReq.setStmtId(stmtId);
- TSRPCResp closeResp = client.closeOperation(closeReq);
- RpcUtils.verifySuccess(closeResp.getStatus());
+ TSStatus closeResp = client.closeOperation(closeReq);
+ RpcUtils.verifySuccess(closeResp);
}
} catch (Exception e) {
throw new SQLException("Error occurs when closing statement.", e);
@@ -328,7 +328,7 @@ public class IoTDBStatement implements Statement {
TSExecuteBatchStatementReq execReq = new TSExecuteBatchStatementReq(sessionHandle,
batchSQLList);
TSExecuteBatchStatementResp execResp = client.executeBatchStatement(execReq);
- if (execResp.getStatus().getStatusType().getCode() == TSStatusType.SUCCESS_STATUS.getStatusCode()) {
+ if (execResp.getStatus().getStatusType().getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
if (execResp.getResult() == null) {
return new int[0];
} else {
diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/BatchTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/BatchTest.java
index 09505f4..74742f9 100644
--- a/jdbc/src/test/java/org/apache/iotdb/jdbc/BatchTest.java
+++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/BatchTest.java
@@ -30,7 +30,7 @@ import java.time.ZoneId;
import java.util.ArrayList;
import java.util.List;
-import org.apache.iotdb.rpc.TSStatusType;
+import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.*;
import org.apache.thrift.TException;
import org.junit.After;
@@ -47,10 +47,10 @@ public class BatchTest {
private TSIService.Iface client;
@Mock
private TS_SessionHandle sessHandle;
- private TS_StatusType successStatus = new TS_StatusType(TSStatusType.SUCCESS_STATUS.getStatusCode(), "");
- private TS_StatusType errorStatus = new TS_StatusType(TSStatusType.INTERNAL_SERVER_ERROR.getStatusCode(), "");
- private TS_Status Status_SUCCESS = new TS_Status(successStatus);
- private TS_Status Status_ERROR = new TS_Status(errorStatus);
+ private TSStatusType successStatus = new TSStatusType(TSStatusCode.SUCCESS_STATUS.getStatusCode(), "");
+ private TSStatusType errorStatus = new TSStatusType(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode(), "");
+ private TSStatus Status_SUCCESS = new TSStatus(successStatus);
+ private TSStatus Status_ERROR = new TSStatus(errorStatus);
private TSExecuteBatchStatementResp resp;
private ZoneId zoneID = ZoneId.systemDefault();
diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBConnectionTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBConnectionTest.java
index 5012e5e..3536d46 100644
--- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBConnectionTest.java
+++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBConnectionTest.java
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.List;
-import org.apache.iotdb.rpc.TSStatusType;
+import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.*;
import org.apache.thrift.TException;
import org.junit.After;
@@ -40,8 +40,8 @@ public class IoTDBConnectionTest {
private TSIService.Iface client;
private IoTDBConnection connection = new IoTDBConnection();
- private TS_StatusType successStatus = new TS_StatusType(TSStatusType.SUCCESS_STATUS.getStatusCode(), "");
- private TS_Status Status_SUCCESS = new TS_Status(successStatus);
+ private TSStatusType successStatus = new TSStatusType(TSStatusCode.SUCCESS_STATUS.getStatusCode(), "");
+ private TSStatus Status_SUCCESS = new TSStatus(successStatus);
@Before
public void setUp() throws Exception {
@@ -56,7 +56,7 @@ public class IoTDBConnectionTest {
public void testSetTimeZone() throws TException, IoTDBSQLException {
String timeZone = "Asia/Shanghai";
when(client.setTimeZone(any(TSSetTimeZoneReq.class)))
- .thenReturn(new TSRPCResp(Status_SUCCESS));
+ .thenReturn(new TSStatus(Status_SUCCESS));
connection.client = client;
connection.setTimeZone(timeZone);
assertEquals(connection.getTimeZone(), timeZone);
diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadataTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadataTest.java
index f0a20a1..28111f5 100644
--- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadataTest.java
+++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadataTest.java
@@ -26,7 +26,7 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.util.*;
-import org.apache.iotdb.rpc.TSStatusType;
+import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.*;
import org.junit.Assert;
import org.junit.Before;
@@ -59,8 +59,8 @@ public class IoTDBDatabaseMetadataTest {
@Mock
private TSFetchMetadataResp fetchMetadataResp;
- private TS_StatusType successStatus = new TS_StatusType(TSStatusType.SUCCESS_STATUS.getStatusCode(), "");
- private TS_Status Status_SUCCESS = new TS_Status(successStatus);
+ private TSStatusType successStatus = new TSStatusType(TSStatusCode.SUCCESS_STATUS.getStatusCode(), "");
+ private TSStatus Status_SUCCESS = new TSStatus(successStatus);
private DatabaseMetaData databaseMetaData;
diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBPreparedStatementTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBPreparedStatementTest.java
index f8c2a94..a80a914 100644
--- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBPreparedStatementTest.java
+++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBPreparedStatementTest.java
@@ -27,7 +27,7 @@ import java.sql.SQLException;
import java.sql.Timestamp;
import java.time.ZoneId;
-import org.apache.iotdb.rpc.TSStatusType;
+import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.*;
import org.apache.iotdb.service.rpc.thrift.TSIService.Iface;
import org.junit.Before;
@@ -41,7 +41,7 @@ public class IoTDBPreparedStatementTest {
@Mock
TSExecuteStatementResp execStatementResp;
@Mock
- TSRPCResp getOperationStatusResp;
+ TSStatus getOperationStatusResp;
private ZoneId zoneId = ZoneId.systemDefault();
@Mock
private IoTDBConnection connection;
@@ -49,8 +49,8 @@ public class IoTDBPreparedStatementTest {
private Iface client;
@Mock
private TS_SessionHandle sessHandle;
- private TS_StatusType successStatus = new TS_StatusType(TSStatusType.SUCCESS_STATUS.getStatusCode(), "");
- private TS_Status Status_SUCCESS = new TS_Status(successStatus);
+ private TSStatusType successStatus = new TSStatusType(TSStatusCode.SUCCESS_STATUS.getStatusCode(), "");
+ private TSStatus Status_SUCCESS = new TSStatus(successStatus);
@Mock
private TSOperationHandle tOperationHandle;
@@ -61,7 +61,6 @@ public class IoTDBPreparedStatementTest {
when(execStatementResp.getStatus()).thenReturn(Status_SUCCESS);
when(execStatementResp.getOperationHandle()).thenReturn(tOperationHandle);
- when(getOperationStatusResp.getStatus()).thenReturn(Status_SUCCESS);
when(client.executeStatement(any(TSExecuteStatementReq.class))).thenReturn(execStatementResp);
}
diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBQueryResultSetTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBQueryResultSetTest.java
index f0c13f6..8d68317 100644
--- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBQueryResultSetTest.java
+++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBQueryResultSetTest.java
@@ -26,14 +26,13 @@ import static org.mockito.Mockito.when;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Types;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.List;
-import org.apache.iotdb.rpc.TSStatusType;
+import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.*;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -108,8 +107,8 @@ public class IoTDBQueryResultSetTest {
@Mock
private TSFetchResultsResp fetchResultsResp;
- private TS_StatusType successStatus = new TS_StatusType(TSStatusType.SUCCESS_STATUS.getStatusCode(), "");
- private TS_Status Status_SUCCESS = new TS_Status(successStatus);
+ private TSStatusType successStatus = new TSStatusType(TSStatusCode.SUCCESS_STATUS.getStatusCode(), "");
+ private TSStatus Status_SUCCESS = new TSStatus(successStatus);
private ZoneId zoneID = ZoneId.systemDefault();
@Before
@@ -130,8 +129,8 @@ public class IoTDBQueryResultSetTest {
when(client.fetchResults(any(TSFetchResultsReq.class))).thenReturn(fetchResultsResp);
when(fetchResultsResp.getStatus()).thenReturn(Status_SUCCESS);
- TSRPCResp closeResp = new TSRPCResp();
- closeResp.setStatus(Status_SUCCESS);
+ TSStatus closeResp = new TSStatus();
+ closeResp = Status_SUCCESS;
when(client.closeOperation(any(TSCloseOperationReq.class))).thenReturn(closeResp);
}
diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBStatementTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBStatementTest.java
index 195654c..6a558cf 100644
--- a/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBStatementTest.java
+++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBStatementTest.java
@@ -32,7 +32,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.iotdb.rpc.TSStatusType;
+import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.*;
import org.apache.iotdb.service.rpc.thrift.TSIService.Iface;
import org.apache.thrift.TException;
@@ -57,8 +57,8 @@ public class IoTDBStatementTest {
@Mock
private TSFetchMetadataResp fetchMetadataResp;
- private TS_StatusType successStatus = new TS_StatusType(TSStatusType.SUCCESS_STATUS.getStatusCode(), "");
- private TS_Status Status_SUCCESS = new TS_Status(successStatus);
+ private TSStatusType successStatus = new TSStatusType(TSStatusCode.SUCCESS_STATUS.getStatusCode(), "");
+ private TSStatus Status_SUCCESS = new TSStatus(successStatus);
private ZoneId zoneID = ZoneId.systemDefault();
@Before
diff --git a/jdbc/src/test/java/org/apache/iotdb/jdbc/UtilsTest.java b/jdbc/src/test/java/org/apache/iotdb/jdbc/UtilsTest.java
index bc3a766..537dc33 100644
--- a/jdbc/src/test/java/org/apache/iotdb/jdbc/UtilsTest.java
+++ b/jdbc/src/test/java/org/apache/iotdb/jdbc/UtilsTest.java
@@ -27,14 +27,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import org.apache.iotdb.rpc.RpcUtils;
-import org.apache.iotdb.rpc.TSStatusType;
+import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.TSDataValue;
import org.apache.iotdb.service.rpc.thrift.TSQueryDataSet;
import org.apache.iotdb.service.rpc.thrift.TSRowRecord;
-import org.apache.iotdb.service.rpc.thrift.TS_Status;
+import org.apache.iotdb.service.rpc.thrift.TSStatus;
-import org.apache.iotdb.rpc.RpcUtils;
-import org.apache.iotdb.service.rpc.thrift.*;
+import org.apache.iotdb.service.rpc.thrift.TSStatusType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.common.Field;
import org.apache.iotdb.tsfile.read.common.RowRecord;
@@ -73,15 +72,15 @@ public class UtilsTest {
@Test
public void testVerifySuccess() {
try {
- TS_StatusType successStatus = new TS_StatusType(TSStatusType.SUCCESS_STATUS.getStatusCode(), "");
- RpcUtils.verifySuccess(new TS_Status(successStatus));
+ TSStatusType successStatus = new TSStatusType(TSStatusCode.SUCCESS_STATUS.getStatusCode(), "");
+ RpcUtils.verifySuccess(new TSStatus(successStatus));
} catch (Exception e) {
fail();
}
try {
- TS_StatusType errorStatus = new TS_StatusType(TSStatusType.INTERNAL_SERVER_ERROR.getStatusCode(), "");
- RpcUtils.verifySuccess(new TS_Status(errorStatus));
+ TSStatusType errorStatus = new TSStatusType(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode(), "");
+ RpcUtils.verifySuccess(new TSStatus(errorStatus));
} catch (Exception e) {
return;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index 2cd8c87..ddac211 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -66,7 +66,7 @@ import org.apache.iotdb.db.qp.physical.crud.DeletePlan;
import org.apache.iotdb.db.qp.physical.crud.InsertPlan;
import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.query.control.JobFileManager;
-import org.apache.iotdb.rpc.TSStatusType;
+import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.db.utils.CopyOnReadLinkedList;
import org.apache.iotdb.db.writelog.recover.TsFileRecoverPerformer;
import org.apache.iotdb.tsfile.file.metadata.ChunkMetaData;
@@ -362,7 +362,7 @@ public class StorageGroupProcessor {
List<Integer> unsequenceIndexes = new ArrayList<>();
for (int i = 0; i < batchInsertPlan.getRowCount(); i++) {
- results[i] = TSStatusType.SUCCESS_STATUS.getStatusCode();
+ results[i] = TSStatusCode.SUCCESS_STATUS.getStatusCode();
if (batchInsertPlan.getTimes()[i] > latestFlushedTimeForEachDevice
.get(batchInsertPlan.getDeviceId())) {
sequenceIndexes.add(i);
@@ -390,7 +390,7 @@ public class StorageGroupProcessor {
TsFileProcessor tsFileProcessor = getOrCreateTsFileProcessor(sequence);
if (tsFileProcessor == null) {
for (int index : indexes) {
- results[index] = TSStatusType.INTERNAL_SERVER_ERROR.getStatusCode();
+ results[index] = TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode();
}
return;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
index 5d237d1..e452e86 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
@@ -48,7 +48,7 @@ import org.apache.iotdb.db.qp.physical.crud.BatchInsertPlan;
import org.apache.iotdb.db.qp.physical.crud.InsertPlan;
import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.rescon.MemTablePool;
-import org.apache.iotdb.rpc.TSStatusType;
+import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.db.utils.QueryUtils;
import org.apache.iotdb.db.writelog.manager.MultiFileLogNodeManager;
import org.apache.iotdb.db.writelog.node.WriteLogNode;
@@ -173,7 +173,7 @@ public class TsFileProcessor {
} catch (IOException e) {
logger.error("write WAL failed", e);
for (int index: indexes) {
- results[index] = TSStatusType.INTERNAL_SERVER_ERROR.getStatusCode();
+ results[index] = TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode();
}
return false;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index b8ee9cb..8b5449b 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -74,7 +74,7 @@ import org.apache.iotdb.db.query.control.QueryResourceManager;
import org.apache.iotdb.db.tools.watermark.GroupedLSBWatermarkEncoder;
import org.apache.iotdb.db.tools.watermark.WatermarkEncoder;
import org.apache.iotdb.db.utils.QueryDataSetUtils;
-import org.apache.iotdb.rpc.TSStatusType;
+import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.ServerProperties;
import org.apache.iotdb.service.rpc.thrift.TSBatchInsertionReq;
import org.apache.iotdb.service.rpc.thrift.TSCancelOperationReq;
@@ -100,11 +100,10 @@ import org.apache.iotdb.service.rpc.thrift.TSOpenSessionResp;
import org.apache.iotdb.service.rpc.thrift.TSOperationHandle;
import org.apache.iotdb.service.rpc.thrift.TSProtocolVersion;
import org.apache.iotdb.service.rpc.thrift.TSQueryDataSet;
-import org.apache.iotdb.service.rpc.thrift.TSRPCResp;
import org.apache.iotdb.service.rpc.thrift.TSSetTimeZoneReq;
import org.apache.iotdb.service.rpc.thrift.TS_SessionHandle;
-import org.apache.iotdb.service.rpc.thrift.TS_Status;
-import org.apache.iotdb.service.rpc.thrift.TS_StatusType;
+import org.apache.iotdb.service.rpc.thrift.TSStatus;
+import org.apache.iotdb.service.rpc.thrift.TSStatusType;
import org.apache.iotdb.tsfile.common.constant.StatisticConstant;
import org.apache.iotdb.tsfile.exception.filter.QueryFilterOptimizationException;
import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException;
@@ -164,14 +163,14 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
logger.error("meet error while logging in.", e);
status = false;
}
- TS_Status tsStatus;
+ TSStatus tsStatus;
if (status) {
- tsStatus = new TS_Status(getStatus(TSStatusType.SUCCESS_STATUS, "Login successfully"));
+ tsStatus = new TSStatus(getStatus(TSStatusCode.SUCCESS_STATUS, "Login successfully"));
username.set(req.getUsername());
zoneIds.set(config.getZoneID());
initForOneSession();
} else {
- tsStatus = getStatus(TSStatusType.WRONG_LOGIN_PASSWORD_ERROR);
+ tsStatus = getStatus(TSStatusCode.WRONG_LOGIN_PASSWORD_ERROR);
}
TSOpenSessionResp resp = new TSOpenSessionResp(tsStatus,
TSProtocolVersion.IOTDB_SERVICE_PROTOCOL_V1);
@@ -190,31 +189,31 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
}
@Override
- public TSRPCResp closeSession(TSCloseSessionReq req) {
+ public TSStatus closeSession(TSCloseSessionReq req) {
logger.info("{}: receive close session", IoTDBConstant.GLOBAL_DB_NAME);
- TS_Status tsStatus;
+ TSStatus tsStatus;
if (username.get() == null) {
- tsStatus = getStatus(TSStatusType.NOT_LOGIN_ERROR);
+ tsStatus = getStatus(TSStatusCode.NOT_LOGIN_ERROR);
if (zoneIds.get() != null) {
zoneIds.remove();
}
} else {
- tsStatus = new TS_Status(getStatus(TSStatusType.SUCCESS_STATUS));
+ tsStatus = new TSStatus(getStatus(TSStatusCode.SUCCESS_STATUS));
username.remove();
if (zoneIds.get() != null) {
zoneIds.remove();
}
}
- return new TSRPCResp(tsStatus);
+ return new TSStatus(tsStatus);
}
@Override
- public TSRPCResp cancelOperation(TSCancelOperationReq req) {
- return new TSRPCResp(getStatus(TSStatusType.SUCCESS_STATUS));
+ public TSStatus cancelOperation(TSCancelOperationReq req) {
+ return new TSStatus(getStatus(TSStatusCode.SUCCESS_STATUS));
}
@Override
- public TSRPCResp closeOperation(TSCloseOperationReq req) {
+ public TSStatus closeOperation(TSCloseOperationReq req) {
logger.info("{}: receive close operation", IoTDBConstant.GLOBAL_DB_NAME);
try {
@@ -229,7 +228,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
} catch (Exception e) {
logger.error("Error in closeOperation : ", e);
}
- return new TSRPCResp(getStatus(TSStatusType.SUCCESS_STATUS));
+ return new TSStatus(getStatus(TSStatusCode.SUCCESS_STATUS));
}
private void releaseQueryResource(TSCloseOperationReq req) throws StorageEngineException {
@@ -259,37 +258,37 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
}
/**
- * convert from TSStatusType to TS_Status according to status code and status message
+ * convert from TSStatusCode to TSStatus according to status code and status message
*
* @param statusType status type
* @return
*/
- private TS_Status getStatus(TSStatusType statusType) {
- TS_StatusType statusCodeAndMessage = new TS_StatusType(statusType.getStatusCode(), statusType.getStatusMessage());
- TS_Status status = new TS_Status(statusCodeAndMessage);
+ private TSStatus getStatus(TSStatusCode statusType) {
+ TSStatusType statusCodeAndMessage = new TSStatusType(statusType.getStatusCode(), statusType.getStatusMessage());
+ TSStatus status = new TSStatus(statusCodeAndMessage);
return status;
}
/**
- * convert from TSStatusType to TS_Status, which has message appending with existed status message
+ * convert from TSStatusCode to TSStatus, which has message appending with existed status message
*
* @param statusType status type
* @param appendMessage appending message
* @return
*/
- private TS_Status getStatus(TSStatusType statusType, String appendMessage) {
- TS_StatusType statusCodeAndMessage = new TS_StatusType(statusType.getStatusCode(),
+ private TSStatus getStatus(TSStatusCode statusType, String appendMessage) {
+ TSStatusType statusCodeAndMessage = new TSStatusType(statusType.getStatusCode(),
statusType.getStatusMessage() + ": " + appendMessage);
- TS_Status status = new TS_Status(statusCodeAndMessage);
+ TSStatus status = new TSStatus(statusCodeAndMessage);
return status;
}
@Override
public TSFetchMetadataResp fetchMetadata(TSFetchMetadataReq req) {
- TS_Status status;
+ TSStatus status;
if (!checkLogin()) {
logger.info(INFO_NOT_LOGIN, IoTDBConstant.GLOBAL_DB_NAME);
- status = getStatus(TSStatusType.NOT_LOGIN_ERROR);
+ status = getStatus(TSStatusCode.NOT_LOGIN_ERROR);
return new TSFetchMetadataResp(status);
}
TSFetchMetadataResp resp = new TSFetchMetadataResp();
@@ -299,17 +298,17 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
String path = req.getColumnPath();
List<List<String>> showTimeseriesList = getTimeSeriesForPath(path);
resp.setShowTimeseriesList(showTimeseriesList);
- status = new TS_Status(getStatus(TSStatusType.SUCCESS_STATUS));
+ status = new TSStatus(getStatus(TSStatusCode.SUCCESS_STATUS));
break;
case "SHOW_STORAGE_GROUP":
Set<String> storageGroups = getAllStorageGroups();
resp.setShowStorageGroups(storageGroups);
- status = new TS_Status(getStatus(TSStatusType.SUCCESS_STATUS));
+ status = new TSStatus(getStatus(TSStatusCode.SUCCESS_STATUS));
break;
case "METADATA_IN_JSON":
String metadataInJson = getMetadataInString();
resp.setMetadataInJson(metadataInJson);
- status = new TS_Status(getStatus(TSStatusType.SUCCESS_STATUS));
+ status = new TSStatus(getStatus(TSStatusCode.SUCCESS_STATUS));
break;
case "DELTA_OBEJECT":
Metadata metadata = getMetadata();
@@ -320,27 +319,27 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
} else {
resp.setColumnsList(deviceMap.get(column));
}
- status = new TS_Status(getStatus(TSStatusType.SUCCESS_STATUS));
+ status = new TSStatus(getStatus(TSStatusCode.SUCCESS_STATUS));
break;
case "COLUMN":
resp.setDataType(getSeriesType(req.getColumnPath()).toString());
- status = new TS_Status(getStatus(TSStatusType.SUCCESS_STATUS));
+ status = new TSStatus(getStatus(TSStatusCode.SUCCESS_STATUS));
break;
case "COUNT_TIMESERIES":
case "ALL_COLUMNS":
resp.setColumnsList(getPaths(req.getColumnPath()));
- status = new TS_Status(getStatus(TSStatusType.SUCCESS_STATUS));
+ status = new TSStatus(getStatus(TSStatusCode.SUCCESS_STATUS));
break;
case "COUNT_NODES":
resp.setNodesList(getNodesList(req.getNodeLevel()));
- status = new TS_Status(getStatus(TSStatusType.SUCCESS_STATUS));
+ status = new TSStatus(getStatus(TSStatusCode.SUCCESS_STATUS));
break;
case "COUNT_NODE_TIMESERIES":
resp.setNodeTimeseriesNum(getNodeTimeseriesNum(getNodesList(req.getNodeLevel())));
- status = new TS_Status(getStatus(TSStatusType.SUCCESS_STATUS));
+ status = new TSStatus(getStatus(TSStatusCode.SUCCESS_STATUS));
break;
default:
- status = getStatus(TSStatusType.FETCH_METADATA_ERROR, req.getType());
+ status = getStatus(TSStatusCode.FETCH_METADATA_ERROR, req.getType());
break;
}
} catch (PathErrorException | MetadataErrorException | OutOfMemoryError e) {
@@ -348,7 +347,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
.error(String.format("Failed to fetch timeseries %s's metadata", req.getColumnPath()),
e);
Thread.currentThread().interrupt();
- status = getStatus(TSStatusType.FETCH_METADATA_ERROR, e.getMessage());
+ status = getStatus(TSStatusCode.FETCH_METADATA_ERROR, e.getMessage());
resp.setStatus(status);
return resp;
}
@@ -467,7 +466,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
try {
if (!checkLogin()) {
logger.info(INFO_NOT_LOGIN, IoTDBConstant.GLOBAL_DB_NAME);
- return getTSBatchExecuteStatementResp(getStatus(TSStatusType.NOT_LOGIN_ERROR), null);
+ return getTSBatchExecuteStatementResp(getStatus(TSStatusCode.NOT_LOGIN_ERROR), null);
}
List<String> statements = req.getStatements();
@@ -482,15 +481,15 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
}
if (isAllSuccessful) {
- return getTSBatchExecuteStatementResp(getStatus(TSStatusType.SUCCESS_STATUS,
+ return getTSBatchExecuteStatementResp(getStatus(TSStatusCode.SUCCESS_STATUS,
"Execute batch statements successfully"), result);
} else {
- return getTSBatchExecuteStatementResp(getStatus(TSStatusType.EXECUTE_STATEMENT_ERROR,
+ return getTSBatchExecuteStatementResp(getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR,
batchErrorMessage.toString()), result);
}
} catch (Exception e) {
logger.error("{}: error occurs when executing statements", IoTDBConstant.GLOBAL_DB_NAME, e);
- return getTSBatchExecuteStatementResp(getStatus(TSStatusType.EXECUTE_STATEMENT_ERROR, e.getMessage()), null);
+ return getTSBatchExecuteStatementResp(getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR, e.getMessage()), null);
} finally {
Measurement.INSTANCE.addOperationLatency(Operation.EXECUTE_JDBC_BATCH, t1);
}
@@ -506,7 +505,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
throw new QueryInBatchStmtException("Query statement not allowed in batch: " + statement);
}
TSExecuteStatementResp resp = executeUpdateStatement(physicalPlan);
- if (resp.getStatus().getStatusType().getCode() == TSStatusType.SUCCESS_STATUS.getStatusCode()) {
+ if (resp.getStatus().getStatusType().getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
result.add(Statement.SUCCESS_NO_INFO);
} else {
result.add(Statement.EXECUTE_FAILED);
@@ -532,12 +531,12 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
try {
if (!checkLogin()) {
logger.info(INFO_NOT_LOGIN, IoTDBConstant.GLOBAL_DB_NAME);
- return getTSExecuteStatementResp(getStatus(TSStatusType.NOT_LOGIN_ERROR));
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.NOT_LOGIN_ERROR));
}
String statement = req.getStatement();
if (execAdminCommand(statement)) {
- return getTSExecuteStatementResp(getStatus(TSStatusType.SUCCESS_STATUS, "ADMIN_COMMAND_SUCCESS"));
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.SUCCESS_STATUS, "ADMIN_COMMAND_SUCCESS"));
}
if (execShowFlushInfo(statement)) {
@@ -546,7 +545,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
FlushTaskPoolManager.getInstance().getTotalTasks(),
FlushTaskPoolManager.getInstance().getWorkingTasksNumber(),
FlushTaskPoolManager.getInstance().getWaitingTasksNumber());
- return getTSExecuteStatementResp(getStatus(TSStatusType.SUCCESS_STATUS, msg));
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.SUCCESS_STATUS, msg));
}
if (execShowDynamicParameters(statement)) {
@@ -560,11 +559,11 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
MManager.getInstance().getAllStorageGroup().size(),
IoTDBConfigDynamicAdapter.getInstance().getTotalTimeseries(),
MManager.getInstance().getMaximalSeriesNumberAmongStorageGroups());
- return getTSExecuteStatementResp(getStatus(TSStatusType.SUCCESS_STATUS, msg));
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.SUCCESS_STATUS, msg));
}
if (execSetConsistencyLevel(statement)) {
- return getTSExecuteStatementResp(getStatus(TSStatusType.SUCCESS_STATUS,
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.SUCCESS_STATUS,
"Execute set consistency level successfully"));
}
@@ -577,11 +576,11 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
}
} catch (IllegalASTFormatException e) {
logger.debug("meet error while parsing SQL to physical plan: ", e);
- return getTSExecuteStatementResp(getStatus(TSStatusType.SQL_PARSE_ERROR,
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.SQL_PARSE_ERROR,
"Statement format is not right: " + e.getMessage()));
} catch (Exception e) {
logger.info("meet error while executing statement: {}", req.getStatement(), e);
- return getTSExecuteStatementResp(getStatus(TSStatusType.EXECUTE_STATEMENT_ERROR, e.getMessage()));
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR, e.getMessage()));
}
}
@@ -656,7 +655,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
return resp;
} catch (Exception e) {
logger.error("{}: Internal server error: ", IoTDBConstant.GLOBAL_DB_NAME, e);
- return getTSExecuteStatementResp(getStatus(TSStatusType.INTERNAL_SERVER_ERROR, e.getMessage()));
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.INTERNAL_SERVER_ERROR, e.getMessage()));
} finally {
Measurement.INSTANCE.addOperationLatency(Operation.EXECUTE_QUERY, t1);
}
@@ -666,7 +665,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
public TSExecuteStatementResp executeQueryStatement(TSExecuteStatementReq req) {
if (!checkLogin()) {
logger.info(INFO_NOT_LOGIN, IoTDBConstant.GLOBAL_DB_NAME);
- return getTSExecuteStatementResp(getStatus(TSStatusType.NOT_LOGIN_ERROR));
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.NOT_LOGIN_ERROR));
}
String statement = req.getStatement();
@@ -675,11 +674,11 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
physicalPlan = processor.parseSQLToPhysicalPlan(statement, zoneIds.get());
} catch (QueryProcessorException | ArgsErrorException | MetadataErrorException e) {
logger.error("meet error while parsing SQL to physical plan!", e);
- return getTSExecuteStatementResp(getStatus(TSStatusType.SQL_PARSE_ERROR, e.getMessage()));
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.SQL_PARSE_ERROR, e.getMessage()));
}
if (!physicalPlan.isQuery()) {
- return getTSExecuteStatementResp(getStatus(TSStatusType.EXECUTE_STATEMENT_ERROR,
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR,
"Statement is not a query statement."));
}
return executeQueryStatement(statement, physicalPlan);
@@ -694,7 +693,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
}
private TSExecuteStatementResp executeAuthQuery(PhysicalPlan plan, List<String> columns) {
- TSExecuteStatementResp resp = getTSExecuteStatementResp(getStatus(TSStatusType.SUCCESS_STATUS));
+ TSExecuteStatementResp resp = getTSExecuteStatementResp(getStatus(TSStatusCode.SUCCESS_STATUS));
resp.setIgnoreTimeStamp(true);
AuthorPlan authorPlan = (AuthorPlan) plan;
switch (authorPlan.getAuthorType()) {
@@ -718,7 +717,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
columns.add(PRIVILEGE);
break;
default:
- return getTSExecuteStatementResp(getStatus(TSStatusType.SQL_PARSE_ERROR,
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.SQL_PARSE_ERROR,
String.format("%s is not an auth query", authorPlan.getAuthorType())));
}
return resp;
@@ -730,7 +729,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
// check seriesPath exists
if (paths.isEmpty()) {
- return getTSExecuteStatementResp(getStatus(TSStatusType.TIMESERIES_NOT_EXIST_ERROR));
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.TIMESERIES_NOT_EXIST_ERROR));
}
// check file level set
@@ -738,15 +737,15 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
checkFileLevelSet(paths);
} catch (PathErrorException e) {
logger.error("meet error while checking file level.", e);
- return getTSExecuteStatementResp(getStatus(TSStatusType.CHECK_FILE_LEVEL_ERROR, e.getMessage()));
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.CHECK_FILE_LEVEL_ERROR, e.getMessage()));
}
// check permissions
if (!checkAuthorization(paths, plan)) {
- return getTSExecuteStatementResp(getStatus(TSStatusType.NO_PERMISSION_ERROR));
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.NO_PERMISSION_ERROR));
}
- TSExecuteStatementResp resp = getTSExecuteStatementResp(getStatus(TSStatusType.SUCCESS_STATUS));
+ TSExecuteStatementResp resp = getTSExecuteStatementResp(getStatus(TSStatusCode.SUCCESS_STATUS));
// Restore column header of aggregate to func(column_name), only
// support single aggregate function for now
switch (plan.getOperatorType()) {
@@ -782,12 +781,12 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
public TSFetchResultsResp fetchResults(TSFetchResultsReq req) {
try {
if (!checkLogin()) {
- return getTSFetchResultsResp(getStatus(TSStatusType.NOT_LOGIN_ERROR));
+ return getTSFetchResultsResp(getStatus(TSStatusCode.NOT_LOGIN_ERROR));
}
String statement = req.getStatement();
if (!queryStatus.get().containsKey(statement)) {
- return getTSFetchResultsResp(getStatus(TSStatusType.EXECUTE_STATEMENT_ERROR, "Has not executed statement"));
+ return getTSFetchResultsResp(getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR, "Has not executed statement"));
}
QueryDataSet queryDataSet;
@@ -823,14 +822,14 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
queryRet.get().remove(statement);
}
- TSFetchResultsResp resp = getTSFetchResultsResp(getStatus(TSStatusType.SUCCESS_STATUS,
+ TSFetchResultsResp resp = getTSFetchResultsResp(getStatus(TSStatusCode.SUCCESS_STATUS,
"FetchResult successfully. Has more result: " + hasResultSet));
resp.setHasResultSet(hasResultSet);
resp.setQueryDataSet(result);
return resp;
} catch (Exception e) {
logger.error("{}: Internal server error: ", IoTDBConstant.GLOBAL_DB_NAME, e);
- return getTSFetchResultsResp(getStatus(TSStatusType.INTERNAL_SERVER_ERROR, e.getMessage()));
+ return getTSFetchResultsResp(getStatus(TSStatusCode.INTERNAL_SERVER_ERROR, e.getMessage()));
}
}
@@ -865,18 +864,18 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
try {
if (!checkLogin()) {
logger.info(INFO_NOT_LOGIN, IoTDBConstant.GLOBAL_DB_NAME);
- return getTSExecuteStatementResp(getStatus(TSStatusType.NOT_LOGIN_ERROR));
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.NOT_LOGIN_ERROR));
}
String statement = req.getStatement();
return executeUpdateStatement(statement);
} catch (Exception e) {
logger.error("{}: server Internal Error: ", IoTDBConstant.GLOBAL_DB_NAME, e);
- return getTSExecuteStatementResp(getStatus(TSStatusType.INTERNAL_SERVER_ERROR, e.getMessage()));
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.INTERNAL_SERVER_ERROR, e.getMessage()));
}
}
private TSExecuteStatementResp executeUpdateStatement(PhysicalPlan plan) {
- TS_Status status = checkAuthority(plan);
+ TSStatus status = checkAuthority(plan);
if (status != null) {
return new TSExecuteStatementResp(status);
}
@@ -907,11 +906,11 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
physicalPlan = processor.parseSQLToPhysicalPlan(statement, zoneIds.get());
} catch (QueryProcessorException | ArgsErrorException | MetadataErrorException e) {
logger.error("meet error while parsing SQL to physical plan!", e);
- return getTSExecuteStatementResp(getStatus(TSStatusType.SQL_PARSE_ERROR, e.getMessage()));
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.SQL_PARSE_ERROR, e.getMessage()));
}
if (physicalPlan.isQuery()) {
- return getTSExecuteStatementResp(getStatus(TSStatusType.EXECUTE_STATEMENT_ERROR,
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR,
"Statement is a query statement."));
}
@@ -941,9 +940,9 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
return AuthorityChecker.check(username.get(), paths, plan.getOperatorType(), targetUser);
}
- private TSExecuteStatementResp getTSExecuteStatementResp(TS_Status status) {
+ private TSExecuteStatementResp getTSExecuteStatementResp(TSStatus status) {
TSExecuteStatementResp resp = new TSExecuteStatementResp();
- TS_Status tsStatus = new TS_Status(status);
+ TSStatus tsStatus = new TSStatus(status);
resp.setStatus(tsStatus);
TSHandleIdentifier operationId = new TSHandleIdentifier(
ByteBuffer.wrap(username.get().getBytes()),
@@ -953,17 +952,17 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
return resp;
}
- private TSExecuteBatchStatementResp getTSBatchExecuteStatementResp(TS_Status status, List<Integer> result) {
+ private TSExecuteBatchStatementResp getTSBatchExecuteStatementResp(TSStatus status, List<Integer> result) {
TSExecuteBatchStatementResp resp = new TSExecuteBatchStatementResp();
- TS_Status tsStatus = new TS_Status(status);
+ TSStatus tsStatus = new TSStatus(status);
resp.setStatus(tsStatus);
resp.setResult(result);
return resp;
}
- private TSFetchResultsResp getTSFetchResultsResp(TS_Status status) {
+ private TSFetchResultsResp getTSFetchResultsResp(TSStatus status) {
TSFetchResultsResp resp = new TSFetchResultsResp();
- TS_Status tsStatus = new TS_Status(status);
+ TSStatus tsStatus = new TSStatus(status);
resp.setStatus(tsStatus);
return resp;
}
@@ -975,31 +974,31 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
@Override
public TSGetTimeZoneResp getTimeZone() {
- TS_Status tsStatus;
+ TSStatus tsStatus;
TSGetTimeZoneResp resp;
try {
- tsStatus = new TS_Status(getStatus(TSStatusType.SUCCESS_STATUS));
+ tsStatus = new TSStatus(getStatus(TSStatusCode.SUCCESS_STATUS));
resp = new TSGetTimeZoneResp(tsStatus, zoneIds.get().toString());
} catch (Exception e) {
logger.error("meet error while generating time zone.", e);
- tsStatus = getStatus(TSStatusType.GENERATE_TIME_ZONE_ERROR);
+ tsStatus = getStatus(TSStatusCode.GENERATE_TIME_ZONE_ERROR);
resp = new TSGetTimeZoneResp(tsStatus, "Unknown time zone");
}
return resp;
}
@Override
- public TSRPCResp setTimeZone(TSSetTimeZoneReq req) {
- TS_Status tsStatus;
+ public TSStatus setTimeZone(TSSetTimeZoneReq req) {
+ TSStatus tsStatus;
try {
String timeZoneID = req.getTimeZone();
zoneIds.set(ZoneId.of(timeZoneID));
- tsStatus = new TS_Status(getStatus(TSStatusType.SUCCESS_STATUS));
+ tsStatus = new TSStatus(getStatus(TSStatusCode.SUCCESS_STATUS));
} catch (Exception e) {
logger.error("meet error while setting time zone.", e);
- tsStatus = getStatus(TSStatusType.SET_TIME_ZONE_ERROR);
+ tsStatus = getStatus(TSStatusCode.SET_TIME_ZONE_ERROR);
}
- return new TSRPCResp(tsStatus);
+ return new TSStatus(tsStatus);
}
@Override
@@ -1019,7 +1018,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
// TODO need to refactor this when implementing PreparedStatement
if (!checkLogin()) {
logger.info(INFO_NOT_LOGIN, IoTDBConstant.GLOBAL_DB_NAME);
- return getTSExecuteStatementResp(getStatus(TSStatusType.NOT_LOGIN_ERROR));
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.NOT_LOGIN_ERROR));
}
long stmtId = req.getStmtId();
@@ -1043,15 +1042,15 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
return executeUpdateStatement(plan);
} catch (Exception e) {
logger.info("meet error while executing an insertion into {}", req.getDeviceId(), e);
- return getTSExecuteStatementResp(getStatus(TSStatusType.EXECUTE_STATEMENT_ERROR, e.getMessage()));
+ return getTSExecuteStatementResp(getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR, e.getMessage()));
}
}
@Override
- public TSRPCResp insertRow(TSInsertReq req) throws TException {
+ public TSStatus insertRow(TSInsertReq req) throws TException {
if (!checkLogin()) {
logger.info(INFO_NOT_LOGIN, IoTDBConstant.GLOBAL_DB_NAME);
- return new TSRPCResp(getStatus(TSStatusType.NOT_LOGIN_ERROR));
+ return new TSStatus(getStatus(TSStatusCode.NOT_LOGIN_ERROR));
}
InsertPlan plan = new InsertPlan();
@@ -1060,29 +1059,29 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
plan.setMeasurements(req.getMeasurements().toArray(new String[0]));
plan.setValues(req.getValues().toArray(new String[0]));
- TS_Status status = checkAuthority(plan);
+ TSStatus status = checkAuthority(plan);
if (status != null) {
- return new TSRPCResp(status);
+ return new TSStatus(status);
}
- return new TSRPCResp(executePlan(plan));
+ return new TSStatus(executePlan(plan));
}
@Override
- public TSRPCResp deleteData(TSDeleteReq req) throws TException {
+ public TSStatus deleteData(TSDeleteReq req) throws TException {
if (!checkLogin()) {
logger.info(INFO_NOT_LOGIN, IoTDBConstant.GLOBAL_DB_NAME);
- return new TSRPCResp(getStatus(TSStatusType.NOT_LOGIN_ERROR));
+ return new TSStatus(getStatus(TSStatusCode.NOT_LOGIN_ERROR));
}
DeletePlan plan = new DeletePlan();
plan.setDeleteTime(req.getTimestamp());
plan.addPath(new Path(req.getPath()));
- TS_Status status = checkAuthority(plan);
+ TSStatus status = checkAuthority(plan);
if (status != null) {
- return new TSRPCResp(status);
+ return new TSStatus(status);
}
- return new TSRPCResp(executePlan(plan));
+ return new TSStatus(executePlan(plan));
}
@Override
@@ -1091,7 +1090,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
try {
if (!checkLogin()) {
logger.info(INFO_NOT_LOGIN, IoTDBConstant.GLOBAL_DB_NAME);
- return getTSBatchExecuteStatementResp(getStatus(TSStatusType.NOT_LOGIN_ERROR), null);
+ return getTSBatchExecuteStatementResp(getStatus(TSStatusCode.NOT_LOGIN_ERROR), null);
}
BatchInsertPlan batchInsertPlan = new BatchInsertPlan(req.deviceId, req.measurements);
@@ -1104,14 +1103,14 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
batchInsertPlan.setDataTypes(req.types);
boolean isAllSuccessful = true;
- TS_Status status = checkAuthority(batchInsertPlan);
+ TSStatus status = checkAuthority(batchInsertPlan);
if (status != null) {
return new TSExecuteBatchStatementResp(status);
}
Integer[] results = processor.getExecutor().insertBatch(batchInsertPlan);
for (Integer result : results) {
- if (result != TSStatusType.SUCCESS_STATUS.getStatusCode()) {
+ if (result != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
isAllSuccessful = false;
break;
}
@@ -1119,49 +1118,49 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
if (isAllSuccessful) {
logger.debug("Insert one RowBatch successfully");
- return getTSBatchExecuteStatementResp(getStatus(TSStatusType.SUCCESS_STATUS), Arrays.asList(results));
+ return getTSBatchExecuteStatementResp(getStatus(TSStatusCode.SUCCESS_STATUS), Arrays.asList(results));
} else {
logger.debug("Insert one RowBatch failed!");
- return getTSBatchExecuteStatementResp(getStatus(TSStatusType.INTERNAL_SERVER_ERROR), Arrays.asList(results));
+ return getTSBatchExecuteStatementResp(getStatus(TSStatusCode.INTERNAL_SERVER_ERROR), Arrays.asList(results));
}
} catch (Exception e) {
logger.error("{}: error occurs when executing statements", IoTDBConstant.GLOBAL_DB_NAME, e);
- return getTSBatchExecuteStatementResp(getStatus(TSStatusType.EXECUTE_STATEMENT_ERROR, e.getMessage()), null);
+ return getTSBatchExecuteStatementResp(getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR, e.getMessage()), null);
} finally {
Measurement.INSTANCE.addOperationLatency(Operation.EXECUTE_RPC_BATCH_INSERT, t1);
}
}
@Override
- public TSRPCResp setStorageGroup(String storageGroup) throws TException {
+ public TSStatus setStorageGroup(String storageGroup) throws TException {
if (!checkLogin()) {
logger.info(INFO_NOT_LOGIN, IoTDBConstant.GLOBAL_DB_NAME);
- return new TSRPCResp(getStatus(TSStatusType.NOT_LOGIN_ERROR));
+ return new TSStatus(getStatus(TSStatusCode.NOT_LOGIN_ERROR));
}
MetadataPlan plan = new MetadataPlan(MetadataOperator.NamespaceType.SET_STORAGE_GROUP, new Path(storageGroup));
- TS_Status status = checkAuthority(plan);
+ TSStatus status = checkAuthority(plan);
if (status != null) {
- return new TSRPCResp(status);
+ return new TSStatus(status);
}
- return new TSRPCResp(executePlan(plan));
+ return new TSStatus(executePlan(plan));
}
@Override
- public TSRPCResp createTimeseries(TSCreateTimeseriesReq req) throws TException {
+ public TSStatus createTimeseries(TSCreateTimeseriesReq req) throws TException {
if (!checkLogin()) {
logger.info(INFO_NOT_LOGIN, IoTDBConstant.GLOBAL_DB_NAME);
- return new TSRPCResp(getStatus(TSStatusType.NOT_LOGIN_ERROR));
+ return new TSStatus(getStatus(TSStatusCode.NOT_LOGIN_ERROR));
}
MetadataPlan plan = new MetadataPlan(MetadataOperator.NamespaceType.ADD_PATH,
new Path(req.getPath()),
TSDataType.values()[req.getDataType()], TSEncoding.values()[req.getEncoding()],
CompressionType.values()[req.compressor]);
- TS_Status status = checkAuthority(plan);
+ TSStatus status = checkAuthority(plan);
if (status != null) {
- return new TSRPCResp(status);
+ return new TSStatus(status);
}
- return new TSRPCResp(executePlan(plan));
+ return new TSStatus(executePlan(plan));
}
@Override
@@ -1169,20 +1168,20 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
return globalStmtId.incrementAndGet();
}
- private TS_Status checkAuthority(PhysicalPlan plan) {
+ private TSStatus checkAuthority(PhysicalPlan plan) {
List<Path> paths = plan.getPaths();
try {
if (!checkAuthorization(paths, plan)) {
- return getStatus(TSStatusType.NO_PERMISSION_ERROR, plan.getOperatorType().toString());
+ return getStatus(TSStatusCode.NO_PERMISSION_ERROR, plan.getOperatorType().toString());
}
} catch (AuthException e) {
logger.error("meet error while checking authorization.", e);
- return getStatus(TSStatusType.UNINITIALIZED_AUTH_ERROR, e.getMessage());
+ return getStatus(TSStatusCode.UNINITIALIZED_AUTH_ERROR, e.getMessage());
}
return null;
}
- private TS_Status executePlan(PhysicalPlan plan) {
+ private TSStatus executePlan(PhysicalPlan plan) {
// TODO
// In current version, we only return OK/ERROR
// Do we need to add extra information of executive condition
@@ -1191,11 +1190,11 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
execRet = executeNonQuery(plan);
} catch (ProcessorException e) {
logger.debug("meet error while processing non-query. ", e);
- return getStatus(TSStatusType.EXECUTE_STATEMENT_ERROR, e.getMessage());
+ return getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR, e.getMessage());
}
- return execRet ? getStatus(TSStatusType.SUCCESS_STATUS, "Execute successfully")
- : getStatus(TSStatusType.EXECUTE_STATEMENT_ERROR);
+ return execRet ? getStatus(TSStatusCode.SUCCESS_STATUS, "Execute successfully")
+ : getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR);
}
}
diff --git a/service-rpc/rpc-changelist.md b/service-rpc/rpc-changelist.md
index b110d28..25a2b87 100644
--- a/service-rpc/rpc-changelist.md
+++ b/service-rpc/rpc-changelist.md
@@ -21,16 +21,18 @@
## 0.8.0 (version-0) -> version-1
-* Add Struct **TS_StatusType**, including code and message. Instead of using ~~TS_StatusCode~~, ~~errorCode~~ and ~~errorMessage~~, TS_Status use **TS_StatusType** to show specific success or error status, code and message.
+* Add Struct **TSStatusType**, including code and message. Instead of using ~~TS_StatusCode~~, ~~errorCode~~ and ~~errorMessage~~.
-* Use struct **TSRPCResp** to replace all structs with only one field `1: required TS_Status status`, including: ~~TSCloseSessionResp~~ closeSession, ~~TSCancelOperationResp~~ cancelOperation, ~~TSCloseOperationResp~~ closeOperation, ~~TSSetTimeZoneResp~~ setTimeZone.
+* Rename ~~TS_Status~~ to **TSStatus**, which use **TSStatusType** to show specific success or error status, code and message.
+
+* Use struct **TSStatus** to replace all structs with only one field `1: required TS_Status status`, including: ~~TSCloseSessionResp~~ closeSession, ~~TSCancelOperationResp~~ cancelOperation, ~~TSCloseOperationResp~~ closeOperation, ~~TSSetTimeZoneResp~~ setTimeZone.
* Add **TSBatchInsertionReq**, **TSCreateTimeseriesReq**, **TSSetStorageGroupReq** and **TSDeleteReq**.
* Change method name ~~TSExecuteStatementResp executeInsertion(1:TSInsertionReq req)~~ to **TSExecuteStatementResp insert(1:TSInsertionReq req)**, and add method **TSExecuteBatchStatementResp insertBatch(1:TSBatchInsertionReq req)** for batch inserting interface.
-* Add method **TSRPCResp setStorageGroup(1:TSSetStorageGroupReq req)** and **TSRPCResp createTimeseries(1:TSCreateTimeseriesReq req)** for creating metadata interface.
+* Add method **TSStatus setStorageGroup(1:TSSetStorageGroupReq req)** and **TSStatus createTimeseries(1:TSCreateTimeseriesReq req)** for creating metadata interface.
-* Add method **TSRPCResp deleteTimeseries(1:TSDeleteReq req)** for deleting timeseries.
+* Add method **TSStatus deleteTimeseries(1:TSDeleteReq req)** for deleting timeseries.
* Change item in enum **TSProtocolVersion** from ~~TSFILE_SERVICE_PROTOCOL_V1~~ to IOTDB_SERVICE_PROTOCOL_V1.
diff --git a/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java b/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java
index 74df2bc..bce1eb5 100644
--- a/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java
+++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java
@@ -20,7 +20,7 @@ package org.apache.iotdb.rpc;
import java.lang.reflect.Proxy;
import org.apache.iotdb.service.rpc.thrift.TSIService;
-import org.apache.iotdb.service.rpc.thrift.TS_Status;
+import org.apache.iotdb.service.rpc.thrift.TSStatus;
public class RpcUtils {
@@ -34,8 +34,8 @@ public class RpcUtils {
*
* @param status -status
*/
- public static void verifySuccess(TS_Status status) throws IoTDBRPCException {
- if (status.getStatusType().getCode() != TSStatusType.SUCCESS_STATUS.getStatusCode()) {
+ public static void verifySuccess(TSStatus status) throws IoTDBRPCException {
+ if (status.getStatusType().getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
throw new IoTDBRPCException(status.getStatusType().getMessage());
}
}
diff --git a/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusType.java b/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java
similarity index 95%
rename from service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusType.java
rename to service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java
index 5a4acf6..6f9c0f8 100644
--- a/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusType.java
+++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.rpc;
-public enum TSStatusType {
+public enum TSStatusCode {
SUCCESS_STATUS(200, ""),
STILL_EXECUTING_STATUS(201, ""),
INVALID_HANDLE_STATUS(202, ""),
@@ -40,7 +40,7 @@ public enum TSStatusType {
private int statusCode;
private String statusMessage;
- private TSStatusType(int statusCode, String statusMessage) {
+ private TSStatusCode(int statusCode, String statusMessage) {
this.statusCode = statusCode;
this.statusMessage = statusMessage;
}
diff --git a/service-rpc/src/main/thrift/rpc.thrift b/service-rpc/src/main/thrift/rpc.thrift
index 2d41ef7..c08f9aa 100644
--- a/service-rpc/src/main/thrift/rpc.thrift
+++ b/service-rpc/src/main/thrift/rpc.thrift
@@ -19,14 +19,14 @@
namespace java org.apache.iotdb.service.rpc.thrift
// The return status code and message in each response.
-struct TS_StatusType {
+struct TSStatusType {
1: required i32 code
2: required string message
}
// The return status of a remote request
-struct TS_Status {
- 1: required TS_StatusType statusType
+struct TSStatus {
+ 1: required TSStatusType statusType
2: optional list<string> infoMessages
3: optional string sqlState // as defined in the ISO/IEF CLIENT specification
}
@@ -57,7 +57,7 @@ struct TSOperationHandle {
}
struct TSExecuteStatementResp {
- 1: required TS_Status status
+ 1: required TSStatus status
2: optional TSOperationHandle operationHandle
// Column names in select statement of SQL
3: optional list<string> columns
@@ -79,7 +79,7 @@ struct TS_SessionHandle {
struct TSOpenSessionResp {
- 1: required TS_Status status
+ 1: required TSStatus status
// The protocol version that the server is using.
2: required TSProtocolVersion serverProtocolVersion = TSProtocolVersion.IOTDB_SERVICE_PROTOCOL_V1
@@ -101,7 +101,7 @@ struct TSOpenSessionReq {
}
// CloseSession()
-// Closes the specified session and frees any resources currently allocated to that session.
+// Closes the specified session and frees any resources currently allocated to that session.
// Any open operations in that session will be canceled.
struct TSCloseSessionReq {
1: required TS_SessionHandle sessionHandle
@@ -122,8 +122,8 @@ struct TSExecuteStatementReq {
struct TSExecuteBatchStatementResp{
- 1: required TS_Status status
- // For each value in result, Statement.SUCCESS_NO_INFO represents success, Statement.EXECUTE_FAILED represents fail otherwise.
+ 1: required TSStatus status
+ // For each value in result, Statement.SUCCESS_NO_INFO represents success, Statement.EXECUTE_FAILED represents fail otherwise.
2: optional list<i32> result
}
@@ -184,13 +184,13 @@ struct TSFetchResultsReq{
}
struct TSFetchResultsResp{
- 1: required TS_Status status
+ 1: required TSStatus status
2: required bool hasResultSet
3: optional TSQueryDataSet queryDataSet
}
struct TSFetchMetadataResp{
- 1: required TS_Status status
+ 1: required TSStatus status
2: optional string metadataInJson
3: optional list<string> ColumnsList
4: optional string dataType
@@ -214,7 +214,7 @@ struct TSColumnSchema{
}
struct TSGetTimeZoneResp {
- 1: required TS_Status status
+ 1: required TSStatus status
2: required string timeZone
}
@@ -251,10 +251,6 @@ struct TSDeleteReq {
2: required i64 timestamp
}
-struct TSRPCResp {
- 1: required TS_Status status
-}
-
struct TSCreateTimeseriesReq {
1: required string path
2: required i32 dataType
@@ -271,7 +267,7 @@ struct ServerProperties {
service TSIService {
TSOpenSessionResp openSession(1:TSOpenSessionReq req);
- TSRPCResp closeSession(1:TSCloseSessionReq req);
+ TSStatus closeSession(1:TSCloseSessionReq req);
TSExecuteStatementResp executeStatement(1:TSExecuteStatementReq req);
@@ -285,27 +281,27 @@ service TSIService {
TSFetchMetadataResp fetchMetadata(1:TSFetchMetadataReq req)
- TSRPCResp cancelOperation(1:TSCancelOperationReq req);
+ TSStatus cancelOperation(1:TSCancelOperationReq req);
- TSRPCResp closeOperation(1:TSCloseOperationReq req);
+ TSStatus closeOperation(1:TSCloseOperationReq req);
TSGetTimeZoneResp getTimeZone();
- TSRPCResp setTimeZone(1:TSSetTimeZoneReq req);
-
+ TSStatus setTimeZone(1:TSSetTimeZoneReq req);
+
ServerProperties getProperties();
TSExecuteStatementResp insert(1:TSInsertionReq req);
TSExecuteBatchStatementResp insertBatch(1:TSBatchInsertionReq req);
- TSRPCResp setStorageGroup(1:string storageGroup);
+ TSStatus setStorageGroup(1:string storageGroup);
- TSRPCResp createTimeseries(1:TSCreateTimeseriesReq req);
+ TSStatus createTimeseries(1:TSCreateTimeseriesReq req);
- TSRPCResp insertRow(1:TSInsertReq req);
+ TSStatus insertRow(1:TSInsertReq req);
- TSRPCResp deleteData(1:TSDeleteReq req);
+ TSStatus deleteData(1:TSDeleteReq req);
i64 requestStatementId();
}
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 0e3118b..c988dce 100644
--- a/session/src/main/java/org/apache/iotdb/session/Session.java
+++ b/session/src/main/java/org/apache/iotdb/session/Session.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.session;
import java.util.List;
import org.apache.iotdb.rpc.IoTDBRPCException;
import org.apache.iotdb.rpc.RpcUtils;
-import org.apache.iotdb.rpc.TSStatusType;
+import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.*;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -161,7 +161,7 @@ public class Session {
}
}
- public synchronized TSRPCResp insert(String deviceId, long time, List<String> measurements, List<String> values)
+ public synchronized TSStatus insert(String deviceId, long time, List<String> measurements, List<String> values)
throws IoTDBSessionException {
TSInsertReq request = new TSInsertReq();
request.setDeviceId(deviceId);
@@ -176,7 +176,7 @@ public class Session {
}
}
- public synchronized TSRPCResp delete(String path, long time) throws IoTDBSessionException {
+ public synchronized TSStatus delete(String path, long time) throws IoTDBSessionException {
TSDeleteReq request = new TSDeleteReq();
request.setPath(path);
request.setTimestamp(time);
@@ -188,7 +188,7 @@ public class Session {
}
}
- public synchronized TSRPCResp setStorageGroup(String storageGroupId) throws IoTDBSessionException {
+ public synchronized TSStatus setStorageGroup(String storageGroupId) throws IoTDBSessionException {
try {
return checkAndReturn(client.setStorageGroup(storageGroupId));
} catch (TException e) {
@@ -196,7 +196,7 @@ public class Session {
}
}
- public synchronized TSRPCResp createTimeseries(String path, TSDataType dataType, TSEncoding encoding, CompressionType compressor) throws IoTDBSessionException {
+ public synchronized TSStatus createTimeseries(String path, TSDataType dataType, TSEncoding encoding, CompressionType compressor) throws IoTDBSessionException {
TSCreateTimeseriesReq request = new TSCreateTimeseriesReq();
request.setPath(path);
request.setDataType(dataType.ordinal());
@@ -210,15 +210,15 @@ public class Session {
}
}
- private TSRPCResp checkAndReturn(TSRPCResp resp) {
- if (resp.status.statusType.getCode() != TSStatusType.SUCCESS_STATUS.getStatusCode()) {
- logger.error(resp.status.statusType.getMessage());
+ private TSStatus checkAndReturn(TSStatus resp) {
+ if (resp.statusType.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
+ logger.error(resp.statusType.getMessage());
}
return resp;
}
private TSExecuteBatchStatementResp checkAndReturn(TSExecuteBatchStatementResp resp) {
- if (resp.status.statusType.getCode() != TSStatusType.SUCCESS_STATUS.getStatusCode()) {
+ if (resp.status.statusType.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
logger.error(resp.status.statusType.getMessage());
}
return resp;
@@ -236,8 +236,8 @@ public class Session {
public synchronized void setTimeZone(String zoneId) throws TException, IoTDBRPCException {
TSSetTimeZoneReq req = new TSSetTimeZoneReq(zoneId);
- TSRPCResp resp = client.setTimeZone(req);
- RpcUtils.verifySuccess(resp.getStatus());
+ TSStatus resp = client.setTimeZone(req);
+ RpcUtils.verifySuccess(resp);
this.zoneId = ZoneId.of(zoneId);
}