You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2023/05/20 20:58:57 UTC
[iotdb] branch master updated (b905b4a831c -> e07248bcc6f)
This is an automated email from the ASF dual-hosted git repository.
rong pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from b905b4a831c [IOTDB-5898] Pipe: pipe meta sync schedular (#9887)
add e07248bcc6f [IOTDB-5772] spark-iotdb-connnector: support scala 2.11 & 2.12 and resolve the Thrift version conflict with Spark's (#9788)
No new revisions were added by this update.
Summary of changes:
distribution/pom.xml | 14 ++
.../{client-cpp.xml => spark-connector.xml} | 16 +-
.../UserGuide/Ecosystem-Integration/Spark-IoTDB.md | 273 ++++++++++-----------
.../UserGuide/Ecosystem-Integration/Spark-IoTDB.md | 261 ++++++++++----------
integration-test/pom.xml | 18 ++
.../it/AbstractTest.java} | 41 ++--
.../java/org/apache/iotdb/spark/it/ReadTest.java | 145 +++++++++++
.../test/java/org/apache/iotdb/spark/it/Utils.java | 96 ++++++++
.../java/org/apache/iotdb/spark/it/WriteTest.java | 116 +++++++++
pom.xml | 35 +--
spark-iotdb-connector/pom.xml | 84 +------
spark-iotdb-connector/{ => scala_2.11}/pom.xml | 108 ++++----
spark-iotdb-connector/{ => scala_2.12}/pom.xml | 103 ++++----
.../src/test/resources/iotdb-datanode.properties | 23 --
.../apache/iotdb/spark/db/EnvironmentUtils.java | 263 --------------------
.../org/apache/iotdb/spark/db/IoTDBTest.scala | 150 -----------
.../org/apache/iotdb/spark/db/IoTDBWriteTest.scala | 118 ---------
.../iotdb/spark/db/unit/DataFrameToolsTest.scala | 96 --------
spark-tsfile/pom.xml | 50 +---
.../iotdb/spark/tsfile/qp/common/SQLConstant.java | 118 ++++-----
20 files changed, 858 insertions(+), 1270 deletions(-)
copy distribution/src/assembly/{client-cpp.xml => spark-connector.xml} (64%)
copy integration-test/src/test/java/org/apache/iotdb/{db/it/schema/IoTDBClusterDeviceQuotaIT.java => spark/it/AbstractTest.java} (54%)
create mode 100644 integration-test/src/test/java/org/apache/iotdb/spark/it/ReadTest.java
create mode 100644 integration-test/src/test/java/org/apache/iotdb/spark/it/Utils.java
create mode 100644 integration-test/src/test/java/org/apache/iotdb/spark/it/WriteTest.java
copy spark-iotdb-connector/{ => scala_2.11}/pom.xml (51%)
copy spark-iotdb-connector/{ => scala_2.12}/pom.xml (53%)
delete mode 100644 spark-iotdb-connector/src/test/resources/iotdb-datanode.properties
delete mode 100644 spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/EnvironmentUtils.java
delete mode 100644 spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/IoTDBTest.scala
delete mode 100644 spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/IoTDBWriteTest.scala
delete mode 100644 spark-iotdb-connector/src/test/scala/org/apache/iotdb/spark/db/unit/DataFrameToolsTest.scala