This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 0931eb536c5 Revert "[Improvement](auditlog) add column catalog for
audit log and audit log table (#26403)" (#28177)
0931eb536c5 is described below
commit 0931eb536c570a4fa4b88ab5b9d75f7738c5db26
Author: zhiqiang <[email protected]>
AuthorDate: Fri Dec 8 18:46:59 2023 +0800
Revert "[Improvement](auditlog) add column catalog for audit log and audit
log table (#26403)" (#28177)
This reverts commit daea751a986823bf5858704663d58f49fd5dfb39.
---
docs/en/docs/ecosystem/audit-plugin.md | 2 --
docs/zh-CN/docs/ecosystem/audit-plugin.md | 2 --
fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java | 7 -------
fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java | 5 -----
.../main/java/org/apache/doris/plugin/audit/AuditLoaderPlugin.java | 1 -
.../main/java/org/apache/doris/plugin/audit/DorisStreamLoader.java | 4 ++--
pytest/deploy/start.py | 1 -
7 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/docs/en/docs/ecosystem/audit-plugin.md
b/docs/en/docs/ecosystem/audit-plugin.md
index d63c15f8b94..a355a75e594 100644
--- a/docs/en/docs/ecosystem/audit-plugin.md
+++ b/docs/en/docs/ecosystem/audit-plugin.md
@@ -87,7 +87,6 @@ create table doris_audit_db__.doris_audit_log_tbl__
`time` datetime not null comment "Query start time",
client_ip varchar(32) comment "Client IP",
user varchar(64) comment "User name",
- catalog varchar(128) comment "Catalog of this query",
db varchar(96) comment "Database of this query",
state varchar(8) comment "Query result state. EOF, ERR, OK",
error_code int comment "Error code of failing query.",
@@ -124,7 +123,6 @@ create table doris_audit_db__.doris_slow_log_tbl__
`time` datetime not null comment "Query start time",
client_ip varchar(32) comment "Client IP",
user varchar(64) comment "User name",
- catalog varchar(128) comment "Catalog of this query",
db varchar(96) comment "Database of this query",
state varchar(8) comment "Query result state. EOF, ERR, OK",
error_code int comment "Error code of failing query.",
diff --git a/docs/zh-CN/docs/ecosystem/audit-plugin.md
b/docs/zh-CN/docs/ecosystem/audit-plugin.md
index f700ce28d0c..7fe4549926f 100644
--- a/docs/zh-CN/docs/ecosystem/audit-plugin.md
+++ b/docs/zh-CN/docs/ecosystem/audit-plugin.md
@@ -93,7 +93,6 @@ create table doris_audit_db__.doris_audit_log_tbl__
`time` datetime not null comment "Query start time",
client_ip varchar(32) comment "Client IP",
user varchar(64) comment "User name",
- catalog varchar(128) comment "Catalog of this query",
db varchar(96) comment "Database of this query",
state varchar(8) comment "Query result state. EOF, ERR, OK",
error_code int comment "Error code of failing query.",
@@ -130,7 +129,6 @@ create table doris_audit_db__.doris_slow_log_tbl__
`time` datetime not null comment "Query start time",
client_ip varchar(32) comment "Client IP",
user varchar(64) comment "User name",
- catalog varchar(128) comment "Catalog of this query",
db varchar(96) comment "Database of this query",
state varchar(8) comment "Query result state. EOF, ERR, OK",
error_code int comment "Error code of failing query.",
diff --git a/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
b/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
index 6f8e3c18c9d..01a03e8c267 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/AuditEvent.java
@@ -56,8 +56,6 @@ public class AuditEvent {
public String clientIp = "";
@AuditField(value = "User")
public String user = "";
- @AuditField(value = "Catalog")
- public String catalog = "";
@AuditField(value = "Db")
public String db = "";
@AuditField(value = "State")
@@ -133,11 +131,6 @@ public class AuditEvent {
return this;
}
- public AuditEventBuilder setCatalog(String catalog) {
- auditEvent.catalog = catalog;
- return this;
- }
-
public AuditEventBuilder setDb(String db) {
auditEvent.db = db;
return this;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
index ff6e666172c..4184a1124b9 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
@@ -57,11 +57,6 @@ public class AuditLogHelper {
.setWorkloadGroup(ctx.getWorkloadGroupName())
.setFuzzyVariables(!printFuzzyVariables ? "" :
ctx.getSessionVariable().printFuzzyVariables());
- // when doric fe is booting, current catalog may not be set
- if (ctx.getCurrentCatalog() != null) {
-
ctx.getAuditEventBuilder().setCatalog(ctx.getCurrentCatalog().getName());
- }
-
if (ctx.getState().isQuery()) {
MetricRepo.COUNTER_QUERY_ALL.increase(1L);
MetricRepo.USER_COUNTER_QUERY_ALL.getOrAdd(ctx.getQualifiedUser()).increase(1L);
diff --git
a/fe_plugins/auditloader/src/main/java/org/apache/doris/plugin/audit/AuditLoaderPlugin.java
b/fe_plugins/auditloader/src/main/java/org/apache/doris/plugin/audit/AuditLoaderPlugin.java
index 75c45f56f61..3cfb0eeeaee 100755
---
a/fe_plugins/auditloader/src/main/java/org/apache/doris/plugin/audit/AuditLoaderPlugin.java
+++
b/fe_plugins/auditloader/src/main/java/org/apache/doris/plugin/audit/AuditLoaderPlugin.java
@@ -163,7 +163,6 @@ public class AuditLoaderPlugin extends Plugin implements
AuditPlugin {
logBuffer.append(longToTimeString(event.timestamp)).append("\t");
logBuffer.append(event.clientIp).append("\t");
logBuffer.append(event.user).append("\t");
- logBuffer.append(event.catalog).append("\t");
logBuffer.append(event.db).append("\t");
logBuffer.append(event.state).append("\t");
logBuffer.append(event.errorCode).append("\t");
diff --git
a/fe_plugins/auditloader/src/main/java/org/apache/doris/plugin/audit/DorisStreamLoader.java
b/fe_plugins/auditloader/src/main/java/org/apache/doris/plugin/audit/DorisStreamLoader.java
index 7b568f0a04d..d389f0dfa81 100644
---
a/fe_plugins/auditloader/src/main/java/org/apache/doris/plugin/audit/DorisStreamLoader.java
+++
b/fe_plugins/auditloader/src/main/java/org/apache/doris/plugin/audit/DorisStreamLoader.java
@@ -71,7 +71,7 @@ public class DorisStreamLoader {
conn.addRequestProperty("label", label);
conn.addRequestProperty("max_filter_ratio", "1.0");
- conn.addRequestProperty("columns", "query_id, `time`, client_ip, user,
catalog, db, state, error_code, error_message, " +
+ conn.addRequestProperty("columns", "query_id, `time`, client_ip, user,
db, state, error_code, error_message, " +
"query_time, scan_bytes, scan_rows, return_rows, stmt_id,
is_query, frontend_ip, cpu_time_ms, sql_hash, " +
"sql_digest, peak_memory_bytes, stmt");
@@ -88,7 +88,7 @@ public class DorisStreamLoader {
sb.append("-H \"").append("Expect\":").append("\"100-continue\" \\\n
");
sb.append("-H \"").append("Content-Type\":").append("\"text/plain;
charset=UTF-8\" \\\n ");
sb.append("-H \"").append("max_filter_ratio\":").append("\"1.0\" \\\n
");
- sb.append("-H \"").append("columns\":").append("\"query_id, time,
client_ip, user, catalog, db, state, error_code, " +
+ sb.append("-H \"").append("columns\":").append("\"query_id, time,
client_ip, user, db, state, error_code, " +
"error_message, query_time, scan_bytes, scan_rows,
return_rows, stmt_id, is_query, frontend_ip, " +
"cpu_time_ms, sql_hash, sql_digest, peak_memory_bytes, stmt\"
\\\n ");
sb.append("\"").append(conn.getURL()).append("\"");
diff --git a/pytest/deploy/start.py b/pytest/deploy/start.py
index dc6498b9e9a..608d477fe9d 100644
--- a/pytest/deploy/start.py
+++ b/pytest/deploy/start.py
@@ -181,7 +181,6 @@ def add_auditload_plugin():
\`time\` datetime not null comment 'Query start time', \
client_ip varchar(32) comment 'Client IP', \
user varchar(64) comment 'User name', \
- catalog varchar(128) comment 'Catalog of this query', \
db varchar(96) comment 'Database of this query', \
state varchar(8) comment 'Query result state. EOF, ERR, OK', \
query_time bigint comment 'Query execution time in millisecond',
\
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
