Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Iotdb
提交
9f12b58c
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,发现更多精彩内容 >>
未验证
提交
9f12b58c
编写于
11月 25, 2022
作者:
X
Xuan Ronaldo
提交者:
GitHub
11月 25, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[IOTDB-5028] Using `show timeseries` to query the schema in import-csv (#8130)
上级
444bfade
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
40 addition
and
25 deletion
+40
-25
cli/src/main/java/org/apache/iotdb/tool/ImportCsv.java
cli/src/main/java/org/apache/iotdb/tool/ImportCsv.java
+40
-25
未找到文件。
cli/src/main/java/org/apache/iotdb/tool/ImportCsv.java
浏览文件 @
9f12b58c
...
...
@@ -21,6 +21,7 @@ package org.apache.iotdb.tool;
import
org.apache.iotdb.commons.exception.IllegalPathException
;
import
org.apache.iotdb.commons.utils.PathUtils
;
import
org.apache.iotdb.db.mpp.common.header.ColumnHeaderConstant
;
import
org.apache.iotdb.db.qp.constant.SQLConstant
;
import
org.apache.iotdb.db.qp.utils.DateTimeUtils
;
import
org.apache.iotdb.exception.ArgsErrorException
;
...
...
@@ -30,6 +31,8 @@ import org.apache.iotdb.session.Session;
import
org.apache.iotdb.session.SessionDataSet
;
import
org.apache.iotdb.tsfile.common.constant.TsFileConstant
;
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
;
import
org.apache.commons.cli.CommandLine
;
import
org.apache.commons.cli.CommandLineParser
;
...
...
@@ -436,10 +439,9 @@ public class ImportCsv extends AbstractCsvTool {
parseHeaders
(
headerNames
,
deviceAndMeasurementNames
,
headerTypeMap
,
headerNameMap
);
Set
<
String
>
devices
=
deviceAndMeasurementNames
.
keySet
();
String
devicesStr
=
StringUtils
.
join
(
devices
,
","
);
if
(
headerTypeMap
.
isEmpty
())
{
try
{
queryType
(
devices
Str
,
headerTypeMap
,
"Time"
);
queryType
(
devices
,
headerTypeMap
,
"Time"
);
}
catch
(
IoTDBConnectionException
e
)
{
e
.
printStackTrace
();
}
...
...
@@ -601,7 +603,15 @@ public class ImportCsv extends AbstractCsvTool {
if
(!
typeQueriedDevice
.
contains
(
deviceName
.
get
()))
{
try
{
if
(
headerTypeMap
.
isEmpty
())
{
hasResult
=
queryType
(
deviceName
.
get
(),
headerTypeMap
,
"Device"
);
hasResult
=
queryType
(
new
HashSet
<
String
>()
{
{
add
(
deviceName
.
get
());
}
},
headerTypeMap
,
"Device"
);
}
typeQueriedDevice
.
add
(
deviceName
.
get
());
}
catch
(
IoTDBConnectionException
e
)
{
...
...
@@ -817,32 +827,37 @@ public class ImportCsv extends AbstractCsvTool {
* @throws StatementExecutionException
*/
private
static
boolean
queryType
(
S
tring
deviceNames
,
HashMap
<
String
,
TSDataType
>
headerTypeMap
,
String
alignedType
)
S
et
<
String
>
deviceNames
,
HashMap
<
String
,
TSDataType
>
headerTypeMap
,
String
alignedType
)
throws
IoTDBConnectionException
{
String
sql
=
"select * from "
+
deviceNames
+
" limit 1"
;
SessionDataSet
sessionDataSet
=
null
;
try
{
sessionDataSet
=
session
.
executeQueryStatement
(
sql
);
}
catch
(
StatementExecutionException
e
)
{
System
.
out
.
println
(
"Meet error when query the type of timeseries because "
+
e
.
getMessage
());
return
false
;
}
List
<
String
>
columnNames
=
sessionDataSet
.
getColumnNames
();
List
<
String
>
columnTypes
=
sessionDataSet
.
getColumnTypes
();
if
(
columnNames
.
size
()
==
1
)
{
return
false
;
}
else
{
for
(
int
i
=
1
;
i
<
columnNames
.
size
();
i
++)
{
if
(
Objects
.
equals
(
alignedType
,
"Time"
))
{
headerTypeMap
.
put
(
columnNames
.
get
(
i
),
getType
(
columnTypes
.
get
(
i
)));
}
else
if
(
Objects
.
equals
(
alignedType
,
"Device"
))
{
String
[]
split
=
columnNames
.
get
(
i
).
split
(
"\\."
);
String
measurement
=
split
[
split
.
length
-
1
];
headerTypeMap
.
put
(
measurement
,
getType
(
columnTypes
.
get
(
i
)));
boolean
hasResult
=
false
;
for
(
String
deviceName
:
deviceNames
)
{
String
sql
=
"show timeseries "
+
deviceName
+
".*"
;
SessionDataSet
sessionDataSet
=
null
;
try
{
sessionDataSet
=
session
.
executeQueryStatement
(
sql
);
int
tsIndex
=
sessionDataSet
.
getColumnNames
().
indexOf
(
ColumnHeaderConstant
.
TIMESERIES
);
int
dtIndex
=
sessionDataSet
.
getColumnNames
().
indexOf
(
ColumnHeaderConstant
.
DATATYPE
);
while
(
sessionDataSet
.
hasNext
())
{
hasResult
=
true
;
RowRecord
record
=
sessionDataSet
.
next
();
List
<
Field
>
fields
=
record
.
getFields
();
String
timeseries
=
fields
.
get
(
tsIndex
).
getStringValue
();
String
dataType
=
fields
.
get
(
dtIndex
).
getStringValue
();
if
(
Objects
.
equals
(
alignedType
,
"Time"
))
{
headerTypeMap
.
put
(
timeseries
,
getType
(
dataType
));
}
else
if
(
Objects
.
equals
(
alignedType
,
"Device"
))
{
String
[]
split
=
PathUtils
.
splitPathToDetachedNodes
(
timeseries
);
String
measurement
=
split
[
split
.
length
-
1
];
headerTypeMap
.
put
(
measurement
,
getType
(
dataType
));
}
}
}
catch
(
StatementExecutionException
|
IllegalPathException
e
)
{
System
.
out
.
println
(
"Meet error when query the type of timeseries because "
+
e
.
getMessage
());
return
false
;
}
return
true
;
}
return
hasResult
;
}
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录