From dd879eb8b227cc7909c54c33c658b5215888600f Mon Sep 17 00:00:00 2001 From: qiaojialin <646274302@qq.com> Date: Sun, 25 Aug 2019 17:23:39 +0800 Subject: [PATCH] fix IT test, IoTDBRPCException -> IoTDBSQLException, default user/password --- .../java/org/apache/iotdb/jdbc/Config.java | 8 +- .../apache/iotdb/jdbc/IoTDBConnection.java | 2 +- .../iotdb/jdbc/IoTDBDatabaseMetadata.java | 32 +++++-- .../iotdb/jdbc/IoTDBQueryResultSet.java | 8 +- .../org/apache/iotdb/jdbc/IoTDBStatement.java | 4 +- pom.xml | 2 +- .../db/integration/IoTDBAggregationIT.java | 8 +- session/pom.xml | 83 +++++++++---------- .../java/org/apache/iotdb/session/Config.java | 5 +- .../iotdb/session/IoTDBSessionException.java | 2 +- .../org/apache/iotdb/session/Session.java | 10 +-- 11 files changed, 88 insertions(+), 76 deletions(-) diff --git a/jdbc/src/main/java/org/apache/iotdb/jdbc/Config.java b/jdbc/src/main/java/org/apache/iotdb/jdbc/Config.java index b44ec4a141..763af7d72d 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/Config.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/Config.java @@ -38,11 +38,11 @@ public class Config { */ public static final String DEFAULT_SERIES_NAME = "default"; - public static final String AUTH_USER = "root"; - public static final String DEFAULT_USER = "root"; + public static final String AUTH_USER = "user"; + public static final String DEFAULT_USER = "user"; - public static final String AUTH_PASSWORD = "root"; - public static final String DEFALUT_PASSWORD = "root"; + public static final String AUTH_PASSWORD = "password"; + public static final String DEFALUT_PASSWORD = "password"; public static final int RETRY_NUM = 3; public static final long RETRY_INTERVAL = 1000; 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 2a26baf66e..62409924cb 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 SQLException(e); + throw new IoTDBSQLException(e); } if (protocolVersion.getValue() != openResp.getServerProtocolVersion().getValue()) { throw new TException(String 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 036b5b776c..209a0fa8e4 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java @@ -84,9 +84,13 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { req.setColumnPath(schemaPattern); try { TSFetchMetadataResp resp = client.fetchMetadata(req); - RpcUtils.verifySuccess(resp.getStatus()); + try { + RpcUtils.verifySuccess(resp.getStatus()); + } catch (IoTDBRPCException e) { + throw new IoTDBSQLException(e); + } return new IoTDBMetadataResultSet(resp.getColumnsList(), null, null); - } catch (TException | IoTDBRPCException e) { + } catch (TException e) { throw new TException("Conncetion error when fetching column metadata", e); } case Constant.CATALOG_DEVICE: @@ -94,19 +98,27 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { req.setColumnPath(schemaPattern); try { TSFetchMetadataResp resp = client.fetchMetadata(req); - RpcUtils.verifySuccess(resp.getStatus()); + try { + RpcUtils.verifySuccess(resp.getStatus()); + } catch (IoTDBRPCException e) { + throw new IoTDBSQLException(e); + } return new IoTDBMetadataResultSet(resp.getColumnsList(), null, null); - } catch (TException | IoTDBRPCException e) { + } catch (TException e) { throw new TException("Conncetion error when fetching delta object metadata", e); } case Constant.CATALOG_STORAGE_GROUP: req = new TSFetchMetadataReq(Constant.GLOBAL_SHOW_STORAGE_GROUP_REQ); try { TSFetchMetadataResp resp = client.fetchMetadata(req); - RpcUtils.verifySuccess(resp.getStatus()); + try { + RpcUtils.verifySuccess(resp.getStatus()); + } catch (IoTDBRPCException e) { + throw new IoTDBSQLException(e); + } Set showStorageGroup = resp.getShowStorageGroups(); return new IoTDBMetadataResultSet(null, showStorageGroup, null); - } catch (TException | IoTDBRPCException e) { + } catch (TException e) { throw new TException("Conncetion error when fetching storage group metadata", e); } case Constant.CATALOG_TIMESERIES: @@ -114,10 +126,14 @@ public class IoTDBDatabaseMetadata implements DatabaseMetaData { req.setColumnPath(schemaPattern); try { TSFetchMetadataResp resp = client.fetchMetadata(req); - RpcUtils.verifySuccess(resp.getStatus()); + try { + RpcUtils.verifySuccess(resp.getStatus()); + } catch (IoTDBRPCException e) { + throw new IoTDBSQLException(e); + } List> showTimeseriesList = resp.getShowTimeseriesList(); return new IoTDBMetadataResultSet(null, null, showTimeseriesList); - } catch (TException | IoTDBRPCException e) { + } catch (TException e) { throw new TException("Conncetion error when fetching timeseries metadata", e); } default: 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 49b15ea7f6..ab675d433b 100644 --- a/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java +++ b/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java @@ -710,7 +710,11 @@ public class IoTDBQueryResultSet implements ResultSet { try { TSFetchResultsResp resp = client.fetchResults(req); - RpcUtils.verifySuccess(resp.getStatus()); + try { + RpcUtils.verifySuccess(resp.getStatus()); + } catch (IoTDBRPCException e) { + throw new IoTDBSQLException(e); + } if (!resp.hasResultSet) { emptyResultSet = true; } else { @@ -718,7 +722,7 @@ public class IoTDBQueryResultSet implements ResultSet { List records = Utils.convertRowRecords(tsQueryDataSet); recordItr = records.iterator(); } - } catch (TException | IoTDBRPCException e) { + } catch (TException e) { throw new SQLException( "Cannot fetch result from server, because of network connection: {} ", 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 aa31406926..393e5d2805 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 SQLException(e); + throw new IoTDBSQLException(e); } 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 SQLException(e); + throw new IoTDBSQLException(e); } IoTDBQueryResultSet resSet = new IoTDBQueryResultSet(this, execResp.getColumns(), client, operationHandle, sql, execResp.getOperationType(), execResp.getDataTypeList(), diff --git a/pom.xml b/pom.xml index d68980d1ca..48cc43a679 100644 --- a/pom.xml +++ b/pom.xml @@ -381,6 +381,7 @@ tsfile service-rpc jdbc + session client server example @@ -388,7 +389,6 @@ spark-tsfile distribution - session 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 be1eee8404..a543807c5c 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("Unsupported data type in aggregation MEAN : TEXT", e.getMessage()); + Assert.assertEquals("org.apache.iotdb.rpc.IoTDBRPCException: 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("Unsupported data type in aggregation SUM : TEXT", e.getMessage()); + Assert.assertEquals("org.apache.iotdb.rpc.IoTDBRPCException: 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("Unsupported data type in aggregation MEAN : BOOLEAN", e.getMessage()); + Assert.assertEquals("org.apache.iotdb.rpc.IoTDBRPCException: 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("Unsupported data type in aggregation SUM : BOOLEAN", e.getMessage()); + Assert.assertEquals("org.apache.iotdb.rpc.IoTDBRPCException: Unsupported data type in aggregation SUM : BOOLEAN", e.getMessage()); } statement.close(); } catch (Exception e) { diff --git a/session/pom.xml b/session/pom.xml index 93a93d21f2..c1fa8bfa39 100644 --- a/session/pom.xml +++ b/session/pom.xml @@ -19,49 +19,42 @@ under the License. --> - - - iotdb-parent - org.apache.iotdb - 0.9.0-SNAPSHOT - - 4.0.0 - - iotdb-session - - IoTDB Session - - - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - - - - - - UTF-8 - 1.7 - 1.7 - - - - - org.apache.iotdb - service-rpc - 0.9.0-SNAPSHOT - - - org.apache.iotdb - tsfile - 0.9.0-SNAPSHOT - - - + + + iotdb-parent + org.apache.iotdb + 0.9.0-SNAPSHOT + + 4.0.0 + iotdb-session + IoTDB Session + + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + + + + UTF-8 + 1.7 + 1.7 + + + + org.apache.iotdb + service-rpc + 0.9.0-SNAPSHOT + + + org.apache.iotdb + tsfile + 0.9.0-SNAPSHOT + + diff --git a/session/src/main/java/org/apache/iotdb/session/Config.java b/session/src/main/java/org/apache/iotdb/session/Config.java index 540b2384ca..501abe6857 100644 --- a/session/src/main/java/org/apache/iotdb/session/Config.java +++ b/session/src/main/java/org/apache/iotdb/session/Config.java @@ -20,8 +20,7 @@ package org.apache.iotdb.session; public class Config { - public static final String DEFAULT_USER = "root"; - public static final String DEFALUT_PASSWORD = "root"; - + public static final String DEFAULT_USER = "user"; + public static final String DEFALUT_PASSWORD = "password"; } diff --git a/session/src/main/java/org/apache/iotdb/session/IoTDBSessionException.java b/session/src/main/java/org/apache/iotdb/session/IoTDBSessionException.java index 62239b2867..440e955741 100644 --- a/session/src/main/java/org/apache/iotdb/session/IoTDBSessionException.java +++ b/session/src/main/java/org/apache/iotdb/session/IoTDBSessionException.java @@ -18,7 +18,7 @@ */ package org.apache.iotdb.session; -public class IoTDBSessionException extends RuntimeException { +public class IoTDBSessionException extends Exception { private static final long serialVersionUID = 2405104784097667293L; 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 fb84b5838c..e7d71adced 100644 --- a/session/src/main/java/org/apache/iotdb/session/Session.java +++ b/session/src/main/java/org/apache/iotdb/session/Session.java @@ -32,7 +32,6 @@ import org.apache.iotdb.service.rpc.thrift.TSProtocolVersion; import org.apache.iotdb.service.rpc.thrift.TSSetTimeZoneReq; import org.apache.iotdb.service.rpc.thrift.TSSetTimeZoneResp; import org.apache.iotdb.service.rpc.thrift.TS_SessionHandle; -import org.apache.iotdb.service.rpc.thrift.TS_StatusCode; import org.apache.iotdb.tsfile.write.record.RowBatch; import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; import org.apache.thrift.TException; @@ -72,11 +71,12 @@ public class Session { this.password = password; } - public void open() { + public void open() throws IoTDBSessionException { open(false, 0); } - public void open(boolean enableRPCCompression, int connectionTimeoutInMs) { + public void open(boolean enableRPCCompression, int connectionTimeoutInMs) + throws IoTDBSessionException { transport = new TSocket(host, port, connectionTimeoutInMs); if (!transport.isOpen()) { try { @@ -128,7 +128,7 @@ public class Session { } - public void close() { + public void close() throws IoTDBSessionException { if (isClosed) { return; } @@ -145,7 +145,7 @@ public class Session { } } - public TSExecuteBatchStatementResp insertBatch(RowBatch rowBatch) { + public TSExecuteBatchStatementResp insertBatch(RowBatch rowBatch) throws IoTDBSessionException { TSBatchInsertionReq request = new TSBatchInsertionReq(); request.deviceId = rowBatch.deviceId; for (MeasurementSchema measurementSchema: rowBatch.measurements) { -- GitLab