You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/11/07 07:16:59 UTC

[incubator-iotdb] branch add_travis_timeout updated (2a8031d -> 23020fa)

This is an automated email from the ASF dual-hosted git repository.

lta pushed a change to branch add_travis_timeout
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 2a8031d  fix trvis.yml
     add b01c00c  update sync status
     add 517f1bc  update sync status
     add bd29924  Fix spark package name (#518)
     add 23020fa  Merge branch 'master' into add_travis_timeout

No new revisions were added by this update.

Summary of changes:
 ...e Hadoop Connector.md => 2-MapReduce TsFile.md} |  1 -
 ...TsFile Spark Connector.md => 3-Spark TsFile.md} |  0
 ...4-Spark IoTDB Connector.md => 4-Spark IoTDB.md} | 10 +++---
 ...5-TsFile Hive Connector.md => 5-Hive TsFile.md} |  0
 .../main/java/org/apache/iotdb/jdbc/Config.java    | 24 ++++++-------
 .../apache/iotdb/db/sync/conf/SyncConstant.java    |  6 ++++
 .../db/sync/receiver/transfer/SyncServiceImpl.java | 35 +++++++++---------
 .../sync/sender/transfer/DataTransferManager.java  | 41 ++++++++++++----------
 service-rpc/src/main/thrift/rpc.thrift             |  4 +--
 service-rpc/src/main/thrift/sync.thrift            | 25 ++++++-------
 .../java/org/apache/iotdb/session/Session.java     | 20 +++++------
 .../iotdb/{sparkdb => spark/db}/SQLConstant.java   |  2 +-
 .../iotdb/{sparkdb => spark/db}/Converter.scala    |  2 +-
 .../{sparkdb => spark/db}/DefaultSource.scala      |  2 +-
 .../iotdb/{sparkdb => spark/db}/IoTDBOptions.scala |  2 +-
 .../iotdb/{sparkdb => spark/db}/IoTDBRDD.scala     |  8 ++---
 .../{sparkdb => spark/db}/IoTDBRelation.scala      |  2 +-
 .../iotdb/{sparkdb => spark/db}/Transformer.scala  |  2 +-
 .../iotdb/{sparkdb => spark/db}/package.scala      |  6 ++--
 .../{sparkdb => spark/db}/EnvironmentUtils.java    |  2 +-
 .../iotdb/{sparkdb => spark/db}/IoTDBTest.scala    |  2 +-
 .../org/apache/iotdb/spark/tsfile/package.scala    |  6 ++--
 .../org/apache/iotdb/spark/tsfile/TSFileSuit.scala |  4 ++-
 23 files changed, 107 insertions(+), 99 deletions(-)
 rename docs/Documentation/UserGuide/7-Ecosystem Integration/{2-TsFile Hadoop Connector.md => 2-MapReduce TsFile.md} (99%)
 rename docs/Documentation/UserGuide/7-Ecosystem Integration/{3-TsFile Spark Connector.md => 3-Spark TsFile.md} (100%)
 rename docs/Documentation/UserGuide/7-Ecosystem Integration/{4-Spark IoTDB Connector.md => 4-Spark IoTDB.md} (97%)
 rename docs/Documentation/UserGuide/7-Ecosystem Integration/{5-TsFile Hive Connector.md => 5-Hive TsFile.md} (100%)
 rename spark-iotdb-connector/src/main/java/org/apache/iotdb/{sparkdb => spark/db}/SQLConstant.java (96%)
 rename spark-iotdb-connector/src/main/scala/org/apache/iotdb/{sparkdb => spark/db}/Converter.scala (98%)
 rename spark-iotdb-connector/src/main/scala/org/apache/iotdb/{sparkdb => spark/db}/DefaultSource.scala (97%)
 rename spark-iotdb-connector/src/main/scala/org/apache/iotdb/{sparkdb => spark/db}/IoTDBOptions.scala (97%)
 rename spark-iotdb-connector/src/main/scala/org/apache/iotdb/{sparkdb => spark/db}/IoTDBRDD.scala (99%)
 rename spark-iotdb-connector/src/main/scala/org/apache/iotdb/{sparkdb => spark/db}/IoTDBRelation.scala (99%)
 rename spark-iotdb-connector/src/main/scala/org/apache/iotdb/{sparkdb => spark/db}/Transformer.scala (99%)
 rename spark-iotdb-connector/src/main/scala/org/apache/iotdb/{sparkdb => spark/db}/package.scala (91%)
 rename spark-iotdb-connector/src/test/scala/org/apache/iotdb/{sparkdb => spark/db}/EnvironmentUtils.java (99%)
 rename spark-iotdb-connector/src/test/scala/org/apache/iotdb/{sparkdb => spark/db}/IoTDBTest.scala (99%)