diff --git a/docs/en/docs/ecosystem/audit-plugin.md b/docs/en/docs/ecosystem/audit-plugin.md index 0c71aa73ed..559656455c 100644 --- a/docs/en/docs/ecosystem/audit-plugin.md +++ b/docs/en/docs/ecosystem/audit-plugin.md @@ -58,7 +58,7 @@ After deployment is complete, and before installing the plugin, you need to crea create table doris_audit_tbl__ ( query_id varchar(48) comment "Unique query id", - time datetime not null comment "Query start time", + `time` datetime not null comment "Query start time", client_ip varchar(32) comment "Client IP", user varchar(64) comment "User name", db varchar(96) comment "Database of this query", @@ -76,8 +76,8 @@ create table doris_audit_tbl__ peak_memory_bytes bigint comment "Peak memory bytes used on all backends of this query", stmt string comment "The original statement, trimed if longer than 2G" ) engine=OLAP -duplicate key(query_id, time, client_ip) -partition by range(time) () +duplicate key(query_id, `time`, client_ip) +partition by range(`time`) () distributed by hash(query_id) buckets 1 properties( "dynamic_partition.time_unit" = "DAY", diff --git a/docs/zh-CN/docs/ecosystem/audit-plugin.md b/docs/zh-CN/docs/ecosystem/audit-plugin.md index 71bd5cc25c..e363f50413 100644 --- a/docs/zh-CN/docs/ecosystem/audit-plugin.md +++ b/docs/zh-CN/docs/ecosystem/audit-plugin.md @@ -58,7 +58,7 @@ auditloader plugin的配置位于`${DORIS}/fe_plugins/auditloader/src/main/assem create table doris_audit_tbl__ ( query_id varchar(48) comment "Unique query id", - time datetime not null comment "Query start time", + `time` datetime not null comment "Query start time", client_ip varchar(32) comment "Client IP", user varchar(64) comment "User name", db varchar(96) comment "Database of this query", @@ -76,8 +76,8 @@ create table doris_audit_tbl__ peak_memory_bytes bigint comment "Peak memory bytes used on all backends of this query", stmt string comment "The original statement, trimed if longer than 2G " ) engine=OLAP -duplicate key(query_id, time, client_ip) -partition by range(time) () +duplicate key(query_id, `time`, client_ip) +partition by range(`time`) () distributed by hash(query_id) buckets 1 properties( "dynamic_partition.time_unit" = "DAY", @@ -98,4 +98,4 @@ properties( 之后,连接到 Doris 后使用 `INSTALL PLUGIN` 命令完成安装。安装成功后,可以通过 `SHOW PLUGINS` 看到已经安装的插件,并且状态为 `INSTALLED`。 -完成后,插件会不断的以指定的时间间隔将审计日志插入到这个表中。 \ No newline at end of file +完成后,插件会不断的以指定的时间间隔将审计日志插入到这个表中。 diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/DigitalVersion.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/DigitalVersion.java index e7c72da2ed..16cd33999a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/DigitalVersion.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/DigitalVersion.java @@ -80,7 +80,8 @@ public class DigitalVersion implements Comparable { int revision = Integer.parseInt(list[2].trim()); if (major >= 100 || minor >= 100 || revision >= 100) { - throw new IllegalArgumentException("Illegal version format: " + version); + throw new IllegalArgumentException( + "Illegal version format: " + version + ". Expected: major.minor.revision"); } return new DigitalVersion((byte) major, (byte) minor, (byte) revision); diff --git a/fe_plugins/auditloader/src/main/assembly/plugin.properties b/fe_plugins/auditloader/src/main/assembly/plugin.properties index 0331385651..65b25f8706 100755 --- a/fe_plugins/auditloader/src/main/assembly/plugin.properties +++ b/fe_plugins/auditloader/src/main/assembly/plugin.properties @@ -18,6 +18,6 @@ name=AuditLoader type=AUDIT description=load audit log to olap load, and user can view the statistic of queries -version=0.13.1 +version=1.0.0 java.version=1.8.0 classname=org.apache.doris.plugin.audit.AuditLoaderPlugin 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 573b65a467..28763bbdca 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 @@ -69,7 +69,7 @@ public class DorisStreamLoader { conn.addRequestProperty("label", label); conn.addRequestProperty("max_filter_ratio", "1.0"); - conn.addRequestProperty("columns", "query_id, time, client_ip, user, db, state, query_time, scan_bytes," + + conn.addRequestProperty("columns", "query_id, `time`, client_ip, user, db, state, 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"); conn.setDoOutput(true); diff --git a/fe_plugins/pom.xml b/fe_plugins/pom.xml index 2b387cbec2..ba379667fb 100644 --- a/fe_plugins/pom.xml +++ b/fe_plugins/pom.xml @@ -68,7 +68,7 @@ under the License. 2.17.1 - 0.15-SNAPSHOT + 1.0-SNAPSHOT github @@ -93,6 +93,21 @@ under the License. + + general-env + + + !env.CUSTOM_MAVEN_REPO + + + + + + cloudera-public + https://repository.cloudera.com/artifactory/public/ + + +