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/08/27 04:36:36 UTC
[incubator-iotdb] branch f_change_exception_message created (now
f9a1d1e)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch f_change_exception_message
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at f9a1d1e change exception message
This branch includes the following new commits:
new f9a1d1e change exception message
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.
[incubator-iotdb] 01/01: change exception message
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch f_change_exception_message
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit f9a1d1ef88864a04c7487c6a835fb6cfe010884b
Author: qiaojialin <64...@qq.com>
AuthorDate: Tue Aug 27 12:35:48 2019 +0800
change exception message
---
client/src/main/java/org/apache/iotdb/client/Client.java | 3 +++
jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java | 6 +++---
.../main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 10 +++++-----
.../main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 2 +-
jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java | 6 +++---
.../org/apache/iotdb/db/integration/IoTDBAggregationIT.java | 8 ++++----
6 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/client/src/main/java/org/apache/iotdb/client/Client.java b/client/src/main/java/org/apache/iotdb/client/Client.java
index 9068e77..9678abc 100644
--- a/client/src/main/java/org/apache/iotdb/client/Client.java
+++ b/client/src/main/java/org/apache/iotdb/client/Client.java
@@ -33,6 +33,9 @@ import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.jdbc.IoTDBConnection;
import org.apache.thrift.TException;
+/**
+ * usage: -h 127.0.0.1 -p 6667 -u root -pw root
+ */
public class Client extends AbstractClient {
private static CommandLine commandLine;
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 6240992..83a96ab 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
@@ -424,7 +424,7 @@ public class IoTDBConnection implements Connection {
} catch (IoTDBRPCException e) {
// failed to connect, disconnect from the server
transport.close();
- throw new IoTDBSQLException(e);
+ throw new IoTDBSQLException(e.getMessage());
}
if (protocolVersion.getValue() != openResp.getServerProtocolVersion().getValue()) {
throw new TException(String
@@ -485,7 +485,7 @@ public class IoTDBConnection implements Connection {
try {
RpcUtils.verifySuccess(resp.getStatus());
} catch (IoTDBRPCException e) {
- throw new IoTDBSQLException(e);
+ throw new IoTDBSQLException(e.getMessage());
}
return resp.getTimeZone();
}
@@ -496,7 +496,7 @@ public class IoTDBConnection implements Connection {
try {
RpcUtils.verifySuccess(resp.getStatus());
} catch (IoTDBRPCException e) {
- throw new IoTDBSQLException(e);
+ throw new IoTDBSQLException(e.getMessage());
}
this.zoneId = ZoneId.of(zoneId);
}
diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
index 209a0fa..36d01c2 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
@@ -87,7 +87,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData {
try {
RpcUtils.verifySuccess(resp.getStatus());
} catch (IoTDBRPCException e) {
- throw new IoTDBSQLException(e);
+ throw new IoTDBSQLException(e.getMessage());
}
return new IoTDBMetadataResultSet(resp.getColumnsList(), null, null);
} catch (TException e) {
@@ -101,7 +101,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData {
try {
RpcUtils.verifySuccess(resp.getStatus());
} catch (IoTDBRPCException e) {
- throw new IoTDBSQLException(e);
+ throw new IoTDBSQLException(e.getMessage());
}
return new IoTDBMetadataResultSet(resp.getColumnsList(), null, null);
} catch (TException e) {
@@ -114,7 +114,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData {
try {
RpcUtils.verifySuccess(resp.getStatus());
} catch (IoTDBRPCException e) {
- throw new IoTDBSQLException(e);
+ throw new IoTDBSQLException(e.getMessage());
}
Set<String> showStorageGroup = resp.getShowStorageGroups();
return new IoTDBMetadataResultSet(null, showStorageGroup, null);
@@ -129,7 +129,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData {
try {
RpcUtils.verifySuccess(resp.getStatus());
} catch (IoTDBRPCException e) {
- throw new IoTDBSQLException(e);
+ throw new IoTDBSQLException(e.getMessage());
}
List<List<String>> showTimeseriesList = resp.getShowTimeseriesList();
return new IoTDBMetadataResultSet(null, null, showTimeseriesList);
@@ -1268,7 +1268,7 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData {
try {
RpcUtils.verifySuccess(resp.getStatus());
} catch (IoTDBRPCException e) {
- throw new IoTDBSQLException(e);
+ throw new IoTDBSQLException(e.getMessage());
}
return resp.getMetadataInJson();
}
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 ab675d4..a865a90 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java
@@ -713,7 +713,7 @@ public class IoTDBQueryResultSet implements ResultSet {
try {
RpcUtils.verifySuccess(resp.getStatus());
} catch (IoTDBRPCException e) {
- throw new IoTDBSQLException(e);
+ throw new IoTDBSQLException(e.getMessage());
}
if (!resp.hasResultSet) {
emptyResultSet = true;
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 393e5d2..14e6c2c 100644
--- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
+++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
@@ -251,7 +251,7 @@ public class IoTDBStatement implements Statement {
try {
RpcUtils.verifySuccess(execResp.getStatus());
} catch (IoTDBRPCException e) {
- throw new IoTDBSQLException(e);
+ throw new IoTDBSQLException(e.getMessage());
}
if (execResp.getOperationHandle().hasResultSet) {
IoTDBQueryResultSet resSet = new IoTDBQueryResultSet(this,
@@ -355,7 +355,7 @@ public class IoTDBStatement implements Statement {
try {
RpcUtils.verifySuccess(execResp.getStatus());
} catch (IoTDBRPCException e) {
- throw new IoTDBSQLException(e);
+ throw new IoTDBSQLException(e.getMessage());
}
IoTDBQueryResultSet resSet = new IoTDBQueryResultSet(this, execResp.getColumns(), client,
operationHandle, sql, execResp.getOperationType(), execResp.getDataTypeList(),
@@ -412,7 +412,7 @@ public class IoTDBStatement implements Statement {
try {
RpcUtils.verifySuccess(execResp.getStatus());
} catch (IoTDBRPCException e) {
- throw new IoTDBSQLException(e);
+ throw new IoTDBSQLException(e.getMessage());
}
return 0;
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
index a543807..be1eee8 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
@@ -510,7 +510,7 @@ public class IoTDBAggregationIT {
resultSet.next();
fail();
} catch (Exception e) {
- Assert.assertEquals("org.apache.iotdb.rpc.IoTDBRPCException: Unsupported data type in aggregation MEAN : TEXT", e.getMessage());
+ Assert.assertEquals("Unsupported data type in aggregation MEAN : TEXT", e.getMessage());
}
statement.close();
@@ -523,7 +523,7 @@ public class IoTDBAggregationIT {
resultSet.next();
fail();
} catch (Exception e) {
- Assert.assertEquals("org.apache.iotdb.rpc.IoTDBRPCException: Unsupported data type in aggregation SUM : TEXT", e.getMessage());
+ Assert.assertEquals("Unsupported data type in aggregation SUM : TEXT", e.getMessage());
}
statement.close();
@@ -536,7 +536,7 @@ public class IoTDBAggregationIT {
resultSet.next();
fail();
} catch (Exception e) {
- Assert.assertEquals("org.apache.iotdb.rpc.IoTDBRPCException: Unsupported data type in aggregation MEAN : BOOLEAN", e.getMessage());
+ Assert.assertEquals("Unsupported data type in aggregation MEAN : BOOLEAN", e.getMessage());
}
statement.close();
@@ -549,7 +549,7 @@ public class IoTDBAggregationIT {
resultSet.next();
fail();
} catch (Exception e) {
- Assert.assertEquals("org.apache.iotdb.rpc.IoTDBRPCException: Unsupported data type in aggregation SUM : BOOLEAN", e.getMessage());
+ Assert.assertEquals("Unsupported data type in aggregation SUM : BOOLEAN", e.getMessage());
}
statement.close();
} catch (Exception e) {