This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from e3d48fd Merge pull request #299 from LeiRui/pick-wm
new a2d9c63 transform old form to new form and use a parameter to control
new 39d124c Merge branch 'master' of
https://github.com/apache/incubator-iotdb into xuekaifeng-spark-connector
new 210f10e rename temp table and add some tests
new e402f37 Merge branch 'master' of
https://github.com/apache/incubator-iotdb into xuekaifeng-spark-connector
new 7ebfbcb Merge branch 'master' of
https://github.com/apache/incubator-iotdb into xuekaifeng-spark-connector
new 4158e5a build new default source to implement new form of spark
dataframe
new 62214e8 change docs
new bedaae9 fix test
new bf830f1 transform filter to iexpression
new 5ce8102 Merge branch 'master' of
https://github.com/apache/incubator-iotdb into xuekaifeng-spark-connector
new ca5fe35 add license
new 91def7b update doc
new efabf33 remove duplicate cause by or and fix bugs
new 1ba2493 merge wide and narrow convertor together and update doc
new 19d92e6 remove NewConverter
new 8dabe60 change code format to confirm google style
new e519157 for travis
new 225d167 add write narrow form to tsfile
new dd58af0 remove original file
new 6d64e3a add test
new 190f20f add license
new 0f41773 add log for partition position and add test code for test
partitioned file
new 7b606ac for travis
new 75ef7cf change log level to error
new 89fdf9e Merge pull request #303 from
SilverNarcissus/xuekaifeng-spark-connector
The 2140 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.
Summary of changes:
docs/Documentation/UserGuide/9-Tools-spark.md | 70 ++-
server/src/test/resources/logback.xml | 2 +-
.../java/org/apache/iotdb/tsfile/qp/Executor.java | 32 +-
.../org/apache/iotdb/tsfile/qp/QueryProcessor.java | 190 +++++++
.../iotdb/tsfile/qp/common/BasicOperator.java | 75 +++
.../iotdb/tsfile/qp/common/FilterOperator.java | 157 ++++++
.../apache/iotdb/tsfile/qp/common/Operator.java | 42 +-
.../apache/iotdb/tsfile/qp/common/SQLConstant.java | 150 ++++++
.../apache/iotdb/tsfile/qp/common/SingleQuery.java | 62 +++
.../apache/iotdb/tsfile/qp/common/TSQueryPlan.java | 68 +++
.../qp/exception/BasicOperatorException.java | 24 +-
.../tsfile/qp/exception/DNFOptimizeException.java | 24 +-
.../qp/exception/LogicalOptimizeException.java | 23 +-
.../tsfile/qp/exception/MergeFilterException.java | 20 +-
.../qp/exception/QueryOperatorException.java | 18 +-
.../qp/exception}/QueryProcessorException.java | 35 +-
.../tsfile/qp/exception/RemoveNotException.java | 25 +-
.../tsfile/qp/optimizer/DNFFilterOptimizer.java | 159 ++++++
.../tsfile/qp}/optimizer/IFilterOptimizer.java | 19 +-
.../qp/optimizer/MergeSingleFilterOptimizer.java | 138 +++++
.../tsfile/qp/optimizer/PhysicalOptimizer.java | 225 ++++++++
.../tsfile/qp/optimizer/RemoveNotOptimizer.java | 104 ++++
.../scala/org/apache/iotdb/tsfile/Converter.scala | 472 +----------------
.../org/apache/iotdb/tsfile/DefaultSource.scala | 166 ++++--
.../org/apache/iotdb/tsfile/NarrowConverter.scala | 576 +++++++++++++++++++++
...Writer.scala => NarrowTsFileOutputWriter.scala} | 19 +-
.../org/apache/iotdb/tsfile/Transformer.scala | 174 +++++++
.../apache/iotdb/tsfile/TsFileWriterFactory.scala | 8 +-
.../{Converter.scala => WideConverter.scala} | 314 ++++-------
...utWriter.scala => WideTsFileOutputWriter.scala} | 6 +-
.../scala/org/apache/iotdb/tsfile/package.scala | 25 +-
.../org/apache/iotdb/tsfile/ConverterTest.scala | 26 +-
.../scala/org/apache/iotdb/tsfile/TSFileSuit.scala | 47 +-
.../iotdb/tsfile/file/metadata/TsFileMetaData.java | 19 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 86 ++-
.../read/controller/MetadataQuerierByFileImpl.java | 18 +-
36 files changed, 2720 insertions(+), 898 deletions(-)
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/QueryExecutor.java
=> spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/Executor.java (53%)
mode change 100644 => 100755
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/QueryProcessor.java
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/common/BasicOperator.java
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/common/FilterOperator.java
copy example/rocketmq/src/main/java/org/apache/iotdb/rocketmq/Utils.java =>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/common/Operator.java (56%)
mode change 100644 => 100755
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/common/SQLConstant.java
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/common/SingleQuery.java
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/common/TSQueryPlan.java
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IBinaryExpression.java
=>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/exception/BasicOperatorException.java
(66%)
mode change 100644 => 100755
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IBinaryExpression.java
=>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/exception/DNFOptimizeException.java
(67%)
mode change 100644 => 100755
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IBinaryExpression.java
=>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/exception/LogicalOptimizeException.java
(65%)
mode change 100644 => 100755
copy
server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManagerMBean.java =>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/exception/MergeFilterException.java
(70%)
mode change 100644 => 100755
copy client/src/main/java/org/apache/iotdb/exception/ArgsErrorException.java
=>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/exception/QueryOperatorException.java
(70%)
mode change 100644 => 100755
copy {server/src/main/java/org/apache/iotdb/db/exception/qp =>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/exception}/QueryProcessorException.java
(61%)
mode change 100644 => 100755
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IBinaryExpression.java
=>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/exception/RemoveNotException.java
(67%)
mode change 100644 => 100755
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/DNFFilterOptimizer.java
copy {server/src/main/java/org/apache/iotdb/db/qp/strategy =>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp}/optimizer/IFilterOptimizer.java
(63%)
mode change 100644 => 100755
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/MergeSingleFilterOptimizer.java
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/PhysicalOptimizer.java
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/RemoveNotOptimizer.java
mode change 100755 => 100644
spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/Converter.scala
create mode 100644
spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/NarrowConverter.scala
copy
spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/{TsFileOutputWriter.scala
=> NarrowTsFileOutputWriter.scala} (71%)
create mode 100644
spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/Transformer.scala
copy spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/{Converter.scala =>
WideConverter.scala} (85%)
rename
spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/{TsFileOutputWriter.scala
=> WideTsFileOutputWriter.scala} (91%)
