This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a change to branch nowBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
discard d3615e7 fix now() bug
omit 366cde1 Fix format
omit 5bb1d10 Merge branch 'master' of https://github.com/apache/iotdb into
session-manager
omit 1c57569 Change timeout
omit df6fc89 Change timeout
omit f57aa88 Bug fix
omit 14fcfbc Merge branch 'master' of https://github.com/apache/iotdb into
session-manager
omit 2fb73b3 Add session timeout
omit 5f997cf Use helper pattern
omit ee97e5c Fix bug
omit c983be1 Fix diff
omit 598c560 Merge branch 'master' of https://github.com/apache/iotdb #
Conflicts: #
server/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java #
server/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java #
server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java
omit 0f25ac4 Merge branch 'master' of https://github.com/apache/iotdb #
Conflicts: #
server/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java #
server/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java #
server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java
omit 467fdf9 Merge branch 'master' of https://github.com/apache/iotdb into
session-manager
omit dfb2bd3 Extract out SessionManager
omit 68508e5 Fix bug
add 6b5ba69 fix monitor bug (#3459)
add c83e70b [ISSUE 3458]fix load configuration(#3487)
add 8202644 Correct typos in iotdb-env.sh (#3494)
add 5ed33ac Fix release note url in Chinese doc (#3495)
add 81e8949 Vis tool for master (#3473)
add a3f1358 [IOTDB-1462] fix cross space compaction recover use wrong
storage group name bug (#3496)
new aabbaf2 Fix now() bug
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 (d3615e7)
\
N -- N -- N refs/heads/nowBug (aabbaf2)
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.
The 1 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/SystemDesign/TsFile/Format.md | 228 ++++++++++++++--
docs/zh/Download/README.md | 4 +-
docs/zh/SystemDesign/TsFile/Format.md | 228 ++++++++++++++--
server/src/assembly/resources/conf/iotdb-env.sh | 2 +-
.../print-tsfile-visdata.bat} | 4 +-
...nt-tsfile-sketch.sh => print-tsfile-visdata.sh} | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 11 -
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 35 +--
.../iotdb/db/cost/statistic/Measurement.java | 4 +-
.../engine/storagegroup/StorageGroupProcessor.java | 2 +-
.../org/apache/iotdb/db/monitor/StatMonitor.java | 4 +-
.../iotdb/db/query/control/QueryTimeManager.java | 3 -
.../iotdb/db/query/control/SessionManager.java | 14 -
.../db/query/control/SessionTimeoutManager.java | 127 ---------
.../org/apache/iotdb/db/service/TSServiceImpl.java | 6 -
.../iotdb/db/tools/vis/TsFileExtractVisdata.java | 170 ++++++++++++
.../main/java/org/apache/iotdb/db/tools/vis/vis.m | 290 +++++++++++++++++++++
.../iotdb/db/integration/IoTDBGroupByMonthIT.java | 8 +
18 files changed, 902 insertions(+), 240 deletions(-)
copy server/src/assembly/resources/tools/{mlog/mLogParser.bat =>
tsfileToolSet/print-tsfile-visdata.bat} (95%)
copy server/src/assembly/resources/tools/tsfileToolSet/{print-tsfile-sketch.sh
=> print-tsfile-visdata.sh} (95%)
mode change 100755 => 100644
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/control/SessionTimeoutManager.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/tools/vis/TsFileExtractVisdata.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/tools/vis/vis.m
