Add UserId in IClientSession (apache#16459)

Author: CRZbulabula

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/client/DataNodeInternalClient.java

@@ -81,7 +81,11 @@ public DataNodeInternalClient(SessionInfo sessionInfo) {
       session.setSqlDialect(sessionInfo.getSqlDialect());
 
       SESSION_MANAGER.supplySession(
-          session, sessionInfo.getUserName(), sessionInfo.getZoneId(), ClientVersion.V_1_0);
+          session,
+          sessionInfo.getUserId(),
+          sessionInfo.getUserName(),
+          sessionInfo.getZoneId(),
+          ClientVersion.V_1_0);
 
       LOGGER.info("User: {}, opens internal Session-{}.", sessionInfo.getUserName(), session);
     } catch (Exception e) {

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest/filter/AuthorizationFilter.java

@@ -101,6 +101,7 @@ public void filter(ContainerRequestContext containerRequestContext) throws IOExc
       SESSION_MANAGER.registerSession(restClientSession);
       SESSION_MANAGER.supplySession(
           SESSION_MANAGER.getCurrSession(),
+          user.getUserId(),
           user.getUsername(),
           ZoneId.systemDefault(),
           IoTDBConstant.ClientVersion.V_1_0);

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest/filter/User.java

@@ -18,9 +18,15 @@
 package org.apache.iotdb.db.protocol.rest.filter;
 
 public class User {
+  // TODO: unify with the real User and UserCache
+  private long userId = -1;
   private String username;
   private String password;
 
+  public long getUserId() {
+    return userId;
+  }
+
   public String getPassword() {
     return password;
   }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/IClientSession.java

@@ -44,6 +44,8 @@ public abstract class IClientSession {
 
   private TimeZone timeZone;
 
+  private long userId;
+
   private String username;
 
   private boolean login = false;
@@ -89,6 +91,14 @@ public void setTimeZone(TimeZone timeZone) {
     this.zoneId = timeZone.toZoneId();
   }
 
+  public long getUserId() {
+    return userId;
+  }
+
+  public void setUserId(long userId) {
+    this.userId = userId;
+  }
+
   public String getUsername() {
     return this.username;
   }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java

@@ -264,8 +264,10 @@ public BasicOpenSessionResp login(
             .setCode(TSStatusCode.INCOMPATIBLE_VERSION.getStatusCode())
             .setMessage("The version is incompatible, please upgrade to " + IoTDBConstant.VERSION);
       } else {
+        User user = authorityFetcher.get().getUser(username);
+        long userId = user == null ? -1 : user.getUserId();
         session.setSqlDialect(sqlDialect);
-        supplySession(session, username, ZoneId.of(zoneId), clientVersion);
+        supplySession(session, userId, username, ZoneId.of(zoneId), clientVersion);
         String logInMessage = "Login successfully";
         if (timeToExpire != null && timeToExpire != Long.MAX_VALUE) {
           DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -534,10 +536,12 @@ public void registerSessionForMqtt(IClientSession session) {
   /** must be called after registerSession()) will mark the session login. */
   public void supplySession(
       IClientSession session,
+      long userId,
       String username,
       ZoneId zoneId,
       IoTDBConstant.ClientVersion clientVersion) {
     session.setId(sessionIdGenerator.incrementAndGet());
+    session.setUserId(userId);
     session.setUsername(username);
     session.setZoneId(zoneId);
     session.setClientVersion(clientVersion);
@@ -556,11 +560,9 @@ public static SessionManager getInstance() {
   }
 
   public SessionInfo getSessionInfo(IClientSession session) {
-    User user = authorityFetcher.get().getUser(session.getUsername());
-    long userId = user == null ? -1 : user.getUserId();
     return new SessionInfo(
         session.getId(),
-        new UserEntity(userId, session.getUsername(), session.getClientAddress()),
+        new UserEntity(session.getUserId(), session.getUsername(), session.getClientAddress()),
         session.getZoneId(),
         session.getClientVersion(),
         session.getDatabaseName(),
@@ -580,35 +582,29 @@ public SessionInfo copySessionInfoForTreeModel(final SessionInfo sessionInfo) {
   }
 
   public SessionInfo getSessionInfoOfTreeModel(IClientSession session) {
-    User user = authorityFetcher.get().getUser(session.getUsername());
-    long userId = user == null ? -1 : user.getUserId();
     return new SessionInfo(
         session.getId(),
-        new UserEntity(userId, session.getUsername(), session.getClientAddress()),
+        new UserEntity(session.getUserId(), session.getUsername(), session.getClientAddress()),
         ZoneId.systemDefault(),
         session.getClientVersion(),
         session.getDatabaseName(),
         IClientSession.SqlDialect.TREE);
   }
 
   public SessionInfo getSessionInfoOfTableModel(IClientSession session) {
-    User user = authorityFetcher.get().getUser(session.getUsername());
-    long userId = user == null ? -1 : user.getUserId();
     return new SessionInfo(
         session.getId(),
-        new UserEntity(userId, session.getUsername(), session.getClientAddress()),
+        new UserEntity(session.getUserId(), session.getUsername(), session.getClientAddress()),
         ZoneId.systemDefault(),
         session.getClientVersion(),
         session.getDatabaseName(),
         IClientSession.SqlDialect.TABLE);
   }
 
   public SessionInfo getSessionInfoOfPipeReceiver(IClientSession session, String databaseName) {
-    User user = authorityFetcher.get().getUser(session.getUsername());
-    long userId = user == null ? -1 : user.getUserId();
     return new SessionInfo(
         session.getId(),
-        new UserEntity(userId, session.getUsername(), session.getClientAddress()),
+        new UserEntity(session.getUserId(), session.getUsername(), session.getClientAddress()),
         ZoneId.systemDefault(),
         session.getClientVersion(),
         databaseName,

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/DataNodeInternalRPCServiceImpl.java

@@ -1562,7 +1562,12 @@ public TSStatus executeCQ(TExecuteCQ req) {
     SESSION_MANAGER.registerSession(session);
 
     SESSION_MANAGER.supplySession(
-        session, req.getUsername(), ZoneId.of(req.getZoneId()), ClientVersion.V_1_0);
+        session,
+        // TODO: User the real userId
+        -1,
+        req.getUsername(),
+        ZoneId.of(req.getZoneId()),
+        ClientVersion.V_1_0);
 
     String executedSQL = req.queryBody;