[incubator-iotdb] branch watermark-demo updated: change user's default watermark configuration

[jiangtian]

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

jiangtian pushed a commit to branch watermark-demo
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/watermark-demo by this push:
     new b237259  change user's default watermark configuration
b237259 is described below

commit b237259cb6b9624acbe6b9fd3b19bf21fd0126ed
Author: 江天 <jt2594...@163.com>
AuthorDate: Thu May 30 21:11:18 2019 +0800

    change user's default watermark configuration
---
 iotdb/src/main/java/org/apache/iotdb/db/auth/entity/User.java           | 2 +-
 iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/User.java 
b/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/User.java
index ec19413..ad86f01 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/User.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/entity/User.java
@@ -34,7 +34,7 @@ public class User {
   private List<PathPrivilege> privilegeList;
   private List<String> roleList;
 
-  private boolean useWaterMark = false;
+  private boolean useWaterMark = true;
 
   /**
    * The latest time when the user is referenced. Reserved to provide session 
control or LRU
diff --git 
a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java 
b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java
index 5573d18..2b1155a 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java
@@ -73,6 +73,7 @@ public abstract class BasicUserManager implements 
IUserManager {
 
     if (admin == null) {
       createUser(IoTDBConstant.ADMIN_NAME, IoTDBConstant.ADMIN_PW);
+      setUserUseWaterMark(IoTDBConstant.ADMIN_NAME, false);
     }
     logger.info("Admin initialized");
   }