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

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


 discard 261c8d5  Fix concurrent query caused BufferUnderflowException when 
storage in HDFS
    omit 14f1f8d  Fix vulnerability
    omit 2a83ca2  Fix code smells
    omit 66ce019  Fix merge and flush caused errors for TsFile storage in HDFS
     add 15c5567  add scrollbar (#1140)
     add 5f1cb2b  [IOTDB-628] change readme.md description (#1137)
     add 20be40b   [IOTDB-633]Update Session.java : Fix sort bug (#1141)
     add d36070c  -- Resolving Spelling mistake
     add 7931d71  Added workaround when doing Aggregation over boolean Series 
for v0.10, and fix time precision not effect bug
     add 58f7227  remove unused codes
     add 1ec34bd  fix user guide
     add 73dd5eb  fix sonar code smell
     add 18f726c  fix merge stuck bug (#1133)
     add 5c95b6f  [IOTDB-634] Fix merge and flush caused errors for TsFile 
storage in HDFS (#1145)
     add 99975f7  [IOTDB-560] add TSRecordOutputFormat to write TsFile via 
Flink DataSet/DataStream API.
     add af8943e  address comments
     add 023d9a7  address comments
     add fd62d4f  address comments
     add 39d5c2c  change closeOperation logger from info to debug
     add 01aa984  only log error message in isSignalMemTable
     add 3c05164  Fix SessionUT bug and update Session.java
     add cbd9c99  Add ResultSet Constrction Doc (#1114)
     add 5c492b1  [IOTDB-640] Move flush and merge to anltr (Enable flush and 
merge in Session) (#1143)
     add bef8a97  [IOTDB-631] Using new TsFile MetadataIndex to optimize query 
and cache (#1134)
     add f9e4a85  fix the compiler error of pr_1143
     add d33366e  [IOTDB-641] Remove TsFileMetadataCache (#1160)
     add 1064e28  Merge remote-tracking branch 'origin/master'
     add 2e705a6  Fix concurrent query caused BufferUnderflowException when 
storage in HDFS

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (261c8d5)
            \
             N -- N -- N   refs/heads/hdfs_query_fix (2e705a6)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 README.md                                          |  18 +--
 README_ZH.md                                       |  14 +-
 .../2-QueryEngine/4-ResultSetConstruction.md       | 177 +++++++++++++++++++++
 .../1-DDL Data Definition Language.md              |  31 ++++
 .../UserGuide/7-Ecosystem Integration/1-Grafana.md |   7 +-
 .../2-QueryEngine/4-ResultSetConstruction.md       | 175 ++++++++++++++++++++
 .../1-DDL Data Definition Language.md              |  24 +++
 .../UserGuide/7-Ecosystem Integration/1-Grafana.md |   7 +-
 example/flink/README.md                            |   2 +
 .../apache/iotdb/flink/FlinkTsFileBatchSink.java   | 114 +++++++++++++
 .../apache/iotdb/flink/FlinkTsFileStreamSink.java  | 115 +++++++++++++
 .../java/org/apache/iotdb/flink/TsFlieUtils.java   |  26 +++
 flink-tsfile-connector/README.md                   |  86 +++++++++-
 .../iotdb/flink/tsfile/RowTSRecordConverter.java   | 163 +++++++++++++++++++
 .../iotdb/flink/tsfile/TSRecordConverter.java      |  61 +++++++
 .../iotdb/flink/tsfile/TSRecordOutputFormat.java   |  99 ++++++++++++
 .../iotdb/flink/tsfile/TsFileOutputFormat.java     | 122 ++++++++++++++
 .../tsfile/RowTSRecordOutputFormatITCase.java      |  56 +++++++
 .../flink/tsfile/RowTSRecordOutputFormatTest.java  |  77 +++++++++
 .../flink/tsfile/RowTsFileConnectorTestBase.java   |  87 ++++++++++
 .../flink/tsfile/RowTsFileInputFormatTestBase.java |  72 +--------
 .../tsfile/RowTsFileOutputFormatTestBase.java      | 117 ++++++++++++++
 .../apache/iotdb/flink/util/TsFileWriteUtil.java   |   2 +-
 .../iotdb/web/grafana/dao/impl/BasicDaoImpl.java   | 109 ++++++++-----
 grafana/src/main/resources/application.properties  |   6 +-
 .../apache/iotdb/hadoop/tsfile/TSFInputFormat.java |  10 +-
 .../resources/conf/iotdb-engine.properties         |   8 +-
 .../org/apache/iotdb/db/qp/strategy/SqlBase.g4     |   7 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  12 --
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  14 +-
 .../db/engine/cache/CacheHitRatioMonitor.java      |   6 -
 .../engine/cache/CacheHitRatioMonitorMXBean.java   |   2 -
 .../iotdb/db/engine/cache/ChunkMetadataCache.java  |  16 +-
 .../db/engine/cache/TimeSeriesMetadataCache.java   |  67 ++++----
 .../iotdb/db/engine/cache/TsFileMetaDataCache.java | 174 --------------------
 .../iotdb/db/engine/merge/task/MergeFileTask.java  |   3 -
 .../engine/storagegroup/StorageGroupProcessor.java |  14 +-
 .../db/engine/storagegroup/TsFileProcessor.java    |   2 +-
 .../org/apache/iotdb/db/mqtt/PublishHandler.java   |   7 +-
 .../main/java/org/apache/iotdb/db/qp/Planner.java  |   2 +
 .../apache/iotdb/db/qp/constant/SQLConstant.java   |   4 +
 .../apache/iotdb/db/qp/executor/IPlanExecutor.java |   4 +-
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  47 +++++-
 .../org/apache/iotdb/db/qp/logical/Operator.java   |   2 +-
 .../apache/iotdb/db/qp/logical/RootOperator.java   |   1 -
 ...eTimeSeriesOperator.java => FlushOperator.java} |  36 +++--
 .../sys/{ShowOperator.java => MergeOperator.java}  |  19 +--
 .../iotdb/db/qp/physical/crud/QueryPlan.java       |   2 +-
 .../db/qp/physical/crud/RawDataQueryPlan.java      |  16 +-
 .../{LoadConfigurationPlan.java => FlushPlan.java} |  25 +--
 .../sys/{DataAuthPlan.java => MergePlan.java}      |  14 +-
 .../iotdb/db/qp/strategy/LogicalGenerator.java     |  36 +++++
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    | 131 ++++++++++-----
 .../reader/series/SeriesRawDataBatchReader.java    |  24 +--
 .../query/timegenerator/ServerTimeGenerator.java   |   5 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  74 +--------
 .../apache/iotdb/db/engine/merge/MergeTest.java    |   2 -
 .../db/integration/IoTDBEngineTimeGeneratorIT.java |  37 +++--
 .../query/reader/series/SeriesReaderTestUtil.java  |   3 -
 .../apache/iotdb/db/utils/EnvironmentUtils.java    |   3 -
 .../java/org/apache/iotdb/session/Session.java     |  14 +-
 .../org/apache/iotdb/session/IoTDBSessionIT.java   |  11 +-
 .../java/org/apache/iotdb/session/SessionUT.java   |  92 +++++++++++
 site/src/main/.vuepress/config.js                  |   6 +-
 site/src/main/.vuepress/styles/index.styl          |   2 +-
 .../apache/iotdb/spark/db/EnvironmentUtils.java    |   2 -
 .../tsfile/file/metadata/MetadataIndexNode.java    |   2 +-
 .../file/metadata/enums/MetadataIndexNodeType.java |   9 ++
 .../iotdb/tsfile/read/TsFileSequenceReader.java    | 141 ++++++++++++++--
 .../read/controller/MetadataQuerierByFileImpl.java |  10 +-
 .../apache/iotdb/tsfile/write/schema/Schema.java   |   4 +-
 71 files changed, 2262 insertions(+), 627 deletions(-)
 create mode 100644 docs/SystemDesign/2-QueryEngine/4-ResultSetConstruction.md
 create mode 100644 
docs/zh/SystemDesign/2-QueryEngine/4-ResultSetConstruction.md
 create mode 100644 
example/flink/src/main/java/org/apache/iotdb/flink/FlinkTsFileBatchSink.java
 create mode 100644 
example/flink/src/main/java/org/apache/iotdb/flink/FlinkTsFileStreamSink.java
 create mode 100644 
flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/RowTSRecordConverter.java
 create mode 100644 
flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/TSRecordConverter.java
 create mode 100644 
flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/TSRecordOutputFormat.java
 create mode 100644 
flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/TsFileOutputFormat.java
 create mode 100644 
flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTSRecordOutputFormatITCase.java
 create mode 100644 
flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTSRecordOutputFormatTest.java
 create mode 100644 
flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTsFileConnectorTestBase.java
 create mode 100644 
flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTsFileOutputFormatTestBase.java
 delete mode 100644 
server/src/main/java/org/apache/iotdb/db/engine/cache/TsFileMetaDataCache.java
 copy 
server/src/main/java/org/apache/iotdb/db/qp/logical/sys/{DeleteTimeSeriesOperator.java
 => FlushOperator.java} (67%)
 copy 
server/src/main/java/org/apache/iotdb/db/qp/logical/sys/{ShowOperator.java => 
MergeOperator.java} (79%)
 copy 
server/src/main/java/org/apache/iotdb/db/qp/physical/sys/{LoadConfigurationPlan.java
 => FlushPlan.java} (76%)
 copy 
server/src/main/java/org/apache/iotdb/db/qp/physical/sys/{DataAuthPlan.java => 
MergePlan.java} (81%)
 create mode 100644 
session/src/test/java/org/apache/iotdb/session/SessionUT.java

Reply via email to