This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from bdb2cae Merge pull request #371 from LeiRui/quickFix
new 3ae733b add watermark interfaces in Authorization
new 0704e47 serialize field useWaterMark
new 1c5ff01 save user when useWaterMarkUpdated
new 6cec0e5 watermark encoder
new 12893af add grant/revoke data auth sql support
new e9cd1cd change user's default watermark configuration
new 3b6de22 add data authorize in qp
new 55bdaf5 update utils
new 5c24a0e watermark parameters
new 53a56b2 watermark config
new f195d4a fix watermark bug
new 283f1b4 add license
new 3025bb0 fix PhysicalPlanTest
new 3cfea15 Merge remote-tracking branch 'origin2/master' into pick-wm
new b6e7af6 get through watermark encoding process
new 2bac929 merge master
new 5176ff7 remove useless exception
new d514236 fix a bug in encoder about hashMod key
new 12a94fb Merge remote-tracking branch 'origin2/master' into pick-wm
new 07ef906 update
new 3a72031 rename data_auth; add watermark_detect grammar
new 55b49f3 update watermarkIT
new dd3ee0f remove watermark_detect grammar
new 8a2eefa add decode test
new b4543d0 Merge remote-tracking branch 'origin2/master' into pick-wm
new 8e118f4 remove an invalid test
new a1308a3 update with master
new 0ef7cc0 finish turning watermark demo into minumum usable feature
new 498fd13 fix pr review
new 5b70069 Merge branch 'master' into pick-wm
new 3a85427 Update iotdb-engine.properties
new bb88cbe remodify the names of two parameters of GroupBasedLSBMethod
new abb8bd6 improve watermark docs
new 551f48e Merge branch 'master' into pick-wm
new 624bc81 Merge remote-tracking branch 'origin2/master' into pick-wm
new bbcc2be modify watermark docs
new 146d0db fix data type problem in watermark detection
new 650d953 Merge branch 'master' into pick-wm
new dac0e93 Merge branch 'master' into pick-wm
new 3d5d56d update with master
new e3d48fd Merge pull request #299 from LeiRui/pick-wm
The 2115 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:
.../UserGuide/8-Tools-watermark.md | 212 ++++++++++++++++++++
docs/Documentation/UserGuide/8-Tools-watermark.md | 211 ++++++++++++++++++++
.../resources/conf/iotdb-engine.properties | 10 +
.../{memory-tool.bat => detect-watermark.bat} | 2 +-
.../tools/{memory-tool.sh => detect-watermark.sh} | 17 +-
.../antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g | 2 +-
.../org/apache/iotdb/db/sql/parse/TSParser.g | 23 +++
.../iotdb/db/auth/authorizer/BasicAuthorizer.java | 10 +
.../iotdb/db/auth/authorizer/IAuthorizer.java | 16 ++
.../java/org/apache/iotdb/db/auth/entity/User.java | 10 +
.../iotdb/db/auth/user/BasicUserManager.java | 28 +++
.../apache/iotdb/db/auth/user/IUserManager.java | 16 ++
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 2 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 87 ++++++++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 14 +-
.../org/apache/iotdb/db/qp/QueryProcessor.java | 2 +
.../apache/iotdb/db/qp/constant/SQLConstant.java | 3 +
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 25 ++-
.../org/apache/iotdb/db/qp/logical/Operator.java | 3 +-
...LoadDataOperator.java => DataAuthOperator.java} | 31 ++-
.../physical/sys/DataAuthPlan.java} | 27 ++-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 18 ++
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 6 +
.../org/apache/iotdb/db/service/TSServiceImpl.java | 26 ++-
.../watermark/GroupedLSBWatermarkEncoder.java | 142 +++++++++++++
.../db/tools/watermark/WatermarkDetector.java | 209 +++++++++++++++++++
.../watermark/WatermarkEncoder.java} | 8 +-
.../apache/iotdb/db/utils/QueryDataSetUtils.java | 32 ++-
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 23 +++
.../org/apache/iotdb/db/sql/SQLParserTest.java | 31 +++
.../apache/iotdb/db/tools/IoTDBWatermarkTest.java | 221 +++++++++++++++++++++
31 files changed, 1407 insertions(+), 60 deletions(-)
create mode 100644 docs/Documentation-CHN/UserGuide/8-Tools-watermark.md
create mode 100644 docs/Documentation/UserGuide/8-Tools-watermark.md
copy server/src/assembly/resources/tools/{memory-tool.bat =>
detect-watermark.bat} (98%)
mode change 100755 => 100644
copy server/src/assembly/resources/tools/{memory-tool.sh =>
detect-watermark.sh} (86%)
mode change 100755 => 100644
copy
server/src/main/java/org/apache/iotdb/db/qp/logical/sys/{LoadDataOperator.java
=> DataAuthOperator.java} (60%)
copy
server/src/main/java/org/apache/iotdb/db/{engine/merge/selector/IMergePathSelector.java
=> qp/physical/sys/DataAuthPlan.java} (64%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/tools/watermark/GroupedLSBWatermarkEncoder.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/tools/watermark/WatermarkDetector.java
copy
server/src/main/java/org/apache/iotdb/db/{rescon/TVListAllocatorMBean.java =>
tools/watermark/WatermarkEncoder.java} (81%)
create mode 100644
server/src/test/java/org/apache/iotdb/db/tools/IoTDBWatermarkTest.java
