You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/11/01 01:00:35 UTC
[iotdb] branch rel/0.13 updated: [To rel/0.13][IOTDB-3662] change audit log storage group to root.__system and add field username (#7829)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.13 by this push:
new 3152003b1c [To rel/0.13][IOTDB-3662] change audit log storage group to root.__system and add field username (#7829)
3152003b1c is described below
commit 3152003b1cffafa6ef947a9cce96772a0304e41e
Author: Zhijia Cao <ca...@126.com>
AuthorDate: Tue Nov 1 09:00:30 2022 +0800
[To rel/0.13][IOTDB-3662] change audit log storage group to root.__system and add field username (#7829)
---
antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 1 -
server/src/main/java/org/apache/iotdb/db/utils/AuditLogUtils.java | 7 ++++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
index e4905bb8fd..7996345033 100644
--- a/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
+++ b/antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4
@@ -745,7 +745,6 @@ nodeName
| wildcard? INTEGER_LITERAL wildcard?
| QUTOED_ID_IN_NODE_NAME
| STRING_LITERAL
- | SYSTEM
;
nodeNameWithoutWildcard
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/AuditLogUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/AuditLogUtils.java
index 41786e9303..27fd8639de 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/AuditLogUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/AuditLogUtils.java
@@ -40,7 +40,8 @@ public class AuditLogUtils {
public static final String LOG = "log";
public static final String TYPE = "type";
- public static final String AUDIT_LOG_DEVICE = "root.system.audit.'%s'";
+ public static final String USERNAME = "username";
+ public static final String AUDIT_LOG_DEVICE = "root.__system.audit.'%s'";
public static final String TYPE_QUERY = "QUERY";
public static final String TYPE_LOGIN = "LOGIN";
public static final String TYPE_LOGOUT = "LOGOUT";
@@ -64,8 +65,8 @@ public class AuditLogUtils {
new InsertRowPlan(
new PartialPath(String.format(AUDIT_LOG_DEVICE, username)),
DateTimeUtils.currentTime(),
- new String[] {TYPE, LOG},
- new String[] {type, log});
+ new String[] {TYPE, LOG, USERNAME},
+ new String[] {type, log, username});
IoTDB.serviceProvider.getExecutor().insert(insertRowPlan);
} catch (IllegalPathException | QueryProcessException e) {
logger.error("write audit log series error,", e);