You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/04/20 04:57:57 UTC
[incubator-iotdb] branch degrade_log_level updated (a1c1d8e -> 0225b01)

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

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


    from a1c1d8e  set parsing incorrect cmd as tracing level log in ParseDriver; set TsserviceImple failed executing as info leve log
     new bfc27eb  fix log level and stack print in test (#156)
     new 013c30c  [IOTDB-80] Support custom export file name (#159)
     new ff3aaa9  update travis for supporinting JDK on Win
     new 4c8db59  Merge pull request #160 from xiaoyekanren/travis_jdk11_win
     new fa385af  fix iotdb-82, close TsFileInput before remove the tsfile
     new 440c50f  Merge pull request #161 from apache/fix_file_close_in_pageHeaderTest
     new 0225b01  Merge branch 'master' into degrade_log_level

The 1577 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:
 .travis.yml                                        | 39 ++++-------
 iotdb-cli/cli/bin/export-csv.bat                   |  5 +-
 iotdb-cli/cli/bin/export-csv.sh                    |  5 +-
 iotdb-cli/cli/bin/import-csv.bat                   |  5 +-
 iotdb-cli/cli/bin/import-csv.sh                    |  5 +-
 .../java/org/apache/iotdb/cli/tool/ExportCsv.java  | 59 +++++++++--------
 .../java/org/apache/iotdb/cli/tool/ImportCsv.java  | 59 ++++++++---------
 .../apache/iotdb/cli/client/AbstractScript.java    | 65 ++++++++++++++++++
 .../iotdb/cli/client/StartClientScriptIT.java      | 51 +++-----------
 .../org/apache/iotdb/cli/tool/ExportCsvTestIT.java | 75 +++++++++++++++++++++
 .../org/apache/iotdb/cli/tool/ImportCsvTestIT.java | 77 ++++++++++++++++++++++
 .../qp/strategy/optimizer/ConcatPathOptimizer.java |  6 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  2 +-
 .../org/apache/iotdb/db/sql/parse/ParseDriver.java |  2 +-
 .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java  |  2 +-
 .../iotdb/tsfile/file/header/PageHeaderTest.java   |  8 +--
 16 files changed, 323 insertions(+), 142 deletions(-)
 create mode 100644 iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractScript.java
 create mode 100644 iotdb-cli/src/test/java/org/apache/iotdb/cli/tool/ExportCsvTestIT.java
 create mode 100644 iotdb-cli/src/test/java/org/apache/iotdb/cli/tool/ImportCsvTestIT.java