Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Iotdb
提交
b92e5df6
I
Iotdb
项目概览
apache
/
Iotdb
12 个月 前同步成功
通知
25
Star
3344
Fork
916
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
Iotdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
b92e5df6
编写于
8月 27, 2019
作者:
J
Jialin Qiao
提交者:
GitHub
8月 27, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #356 from apache/f_change_exception_message
change exception message
上级
fcddd513
f9a1d1ef
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
19 addition
and
16 deletion
+19
-16
client/src/main/java/org/apache/iotdb/client/Client.java
client/src/main/java/org/apache/iotdb/client/Client.java
+3
-0
jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
.../src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
+3
-3
jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
...ain/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
+5
-5
jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java
.../main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java
+1
-1
jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
+3
-3
server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
...a/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
+4
-4
未找到文件。
client/src/main/java/org/apache/iotdb/client/Client.java
浏览文件 @
b92e5df6
...
...
@@ -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
;
...
...
jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBConnection.java
浏览文件 @
b92e5df6
...
...
@@ -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
);
}
...
...
jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadata.java
浏览文件 @
b92e5df6
...
...
@@ -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
();
}
...
...
jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java
浏览文件 @
b92e5df6
...
...
@@ -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
;
...
...
jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBStatement.java
浏览文件 @
b92e5df6
...
...
@@ -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
;
}
...
...
server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java
浏览文件 @
b92e5df6
...
...
@@ -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
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录