-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fix](audit) add workload_group to audit log table (#30470)
1. Missing workload_group column in audit table 2. Extract the definition of internal schema's tables into a new class 3. Fix bug that audit loader has no authorization to load data to audit_table, introduced from #29790 4. Fix bug that audit_log can not be modified to 3 replica because it is partitioned table
- Loading branch information
1 parent
cd3ef3c
commit c5e4337
Showing
13 changed files
with
277 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
113 changes: 113 additions & 0 deletions
113
fe/fe-core/src/main/java/org/apache/doris/catalog/InternalSchema.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package org.apache.doris.catalog; | ||
|
|
||
| import org.apache.doris.analysis.ColumnDef; | ||
| import org.apache.doris.analysis.TypeDef; | ||
| import org.apache.doris.common.UserException; | ||
| import org.apache.doris.plugin.audit.AuditLoaderPlugin; | ||
| import org.apache.doris.statistics.StatisticConstants; | ||
|
|
||
| import com.google.common.collect.Lists; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| public class InternalSchema { | ||
|
|
||
| // Do not use the original schema directly, because it may be modified by create table operation. | ||
| public static final List<ColumnDef> COL_STATS_SCHEMA; | ||
| public static final List<ColumnDef> HISTO_STATS_SCHEMA; | ||
| public static final List<ColumnDef> AUDIT_SCHEMA; | ||
|
|
||
| static { | ||
| // column statistics table | ||
| COL_STATS_SCHEMA = new ArrayList<>(); | ||
| COL_STATS_SCHEMA.add(new ColumnDef("id", TypeDef.createVarchar(StatisticConstants.ID_LEN))); | ||
| COL_STATS_SCHEMA.add(new ColumnDef("catalog_id", TypeDef.createVarchar(StatisticConstants.MAX_NAME_LEN))); | ||
| COL_STATS_SCHEMA.add(new ColumnDef("db_id", TypeDef.createVarchar(StatisticConstants.MAX_NAME_LEN))); | ||
| COL_STATS_SCHEMA.add(new ColumnDef("tbl_id", TypeDef.createVarchar(StatisticConstants.MAX_NAME_LEN))); | ||
| COL_STATS_SCHEMA.add(new ColumnDef("idx_id", TypeDef.createVarchar(StatisticConstants.MAX_NAME_LEN))); | ||
| COL_STATS_SCHEMA.add(new ColumnDef("col_id", TypeDef.createVarchar(StatisticConstants.MAX_NAME_LEN))); | ||
| COL_STATS_SCHEMA.add(new ColumnDef("part_id", TypeDef.createVarchar(StatisticConstants.MAX_NAME_LEN), true)); | ||
| COL_STATS_SCHEMA.add(new ColumnDef("count", TypeDef.create(PrimitiveType.BIGINT), true)); | ||
| COL_STATS_SCHEMA.add(new ColumnDef("ndv", TypeDef.create(PrimitiveType.BIGINT), true)); | ||
| COL_STATS_SCHEMA.add(new ColumnDef("null_count", TypeDef.create(PrimitiveType.BIGINT), true)); | ||
| COL_STATS_SCHEMA.add(new ColumnDef("min", TypeDef.createVarchar(ScalarType.MAX_VARCHAR_LENGTH), true)); | ||
| COL_STATS_SCHEMA.add(new ColumnDef("max", TypeDef.createVarchar(ScalarType.MAX_VARCHAR_LENGTH), true)); | ||
| COL_STATS_SCHEMA.add(new ColumnDef("data_size_in_bytes", TypeDef.create(PrimitiveType.BIGINT), true)); | ||
| COL_STATS_SCHEMA.add(new ColumnDef("update_time", TypeDef.create(PrimitiveType.DATETIME))); | ||
|
|
||
| // histogram_statistics table | ||
| HISTO_STATS_SCHEMA = new ArrayList<>(); | ||
| HISTO_STATS_SCHEMA.add(new ColumnDef("id", TypeDef.createVarchar(StatisticConstants.ID_LEN))); | ||
| HISTO_STATS_SCHEMA.add(new ColumnDef("catalog_id", TypeDef.createVarchar(StatisticConstants.MAX_NAME_LEN))); | ||
| HISTO_STATS_SCHEMA.add(new ColumnDef("db_id", TypeDef.createVarchar(StatisticConstants.MAX_NAME_LEN))); | ||
| HISTO_STATS_SCHEMA.add(new ColumnDef("tbl_id", TypeDef.createVarchar(StatisticConstants.MAX_NAME_LEN))); | ||
| HISTO_STATS_SCHEMA.add(new ColumnDef("idx_id", TypeDef.createVarchar(StatisticConstants.MAX_NAME_LEN))); | ||
| HISTO_STATS_SCHEMA.add(new ColumnDef("col_id", TypeDef.createVarchar(StatisticConstants.MAX_NAME_LEN))); | ||
| HISTO_STATS_SCHEMA.add(new ColumnDef("sample_rate", TypeDef.create(PrimitiveType.DOUBLE))); | ||
| HISTO_STATS_SCHEMA.add(new ColumnDef("buckets", TypeDef.createVarchar(ScalarType.MAX_VARCHAR_LENGTH))); | ||
| HISTO_STATS_SCHEMA.add(new ColumnDef("update_time", TypeDef.create(PrimitiveType.DATETIME))); | ||
|
|
||
| // audit table | ||
| AUDIT_SCHEMA = new ArrayList<>(); | ||
| AUDIT_SCHEMA.add(new ColumnDef("query_id", TypeDef.createVarchar(48), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("time", TypeDef.create(PrimitiveType.DATETIME), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("client_ip", TypeDef.createVarchar(128), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("user", TypeDef.createVarchar(128), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("catalog", TypeDef.createVarchar(128), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("db", TypeDef.createVarchar(128), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("state", TypeDef.createVarchar(128), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("error_code", TypeDef.create(PrimitiveType.INT), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("error_message", TypeDef.create(PrimitiveType.STRING), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("query_time", TypeDef.create(PrimitiveType.BIGINT), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("scan_bytes", TypeDef.create(PrimitiveType.BIGINT), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("scan_rows", TypeDef.create(PrimitiveType.BIGINT), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("return_rows", TypeDef.create(PrimitiveType.BIGINT), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("stmt_id", TypeDef.create(PrimitiveType.BIGINT), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("is_query", TypeDef.create(PrimitiveType.TINYINT), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("frontend_ip", TypeDef.createVarchar(128), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("cpu_time_ms", TypeDef.create(PrimitiveType.BIGINT), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("sql_hash", TypeDef.createVarchar(128), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("sql_digest", TypeDef.createVarchar(128), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("peak_memory_bytes", TypeDef.create(PrimitiveType.BIGINT), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("workload_group", TypeDef.create(PrimitiveType.STRING), true)); | ||
| AUDIT_SCHEMA.add(new ColumnDef("stmt", TypeDef.create(PrimitiveType.STRING), true)); | ||
| } | ||
|
|
||
| // Get copied schema for statistic table | ||
| // Do not use the original schema directly, because it may be modified by create table operation. | ||
| public static List<ColumnDef> getCopiedSchema(String tblName) throws UserException { | ||
| List<ColumnDef> schema; | ||
| if (tblName.equals(StatisticConstants.STATISTIC_TBL_NAME)) { | ||
| schema = COL_STATS_SCHEMA; | ||
| } else if (tblName.equals(StatisticConstants.HISTOGRAM_TBL_NAME)) { | ||
| schema = HISTO_STATS_SCHEMA; | ||
| } else if (tblName.equals(AuditLoaderPlugin.AUDIT_LOG_TABLE)) { | ||
| schema = AUDIT_SCHEMA; | ||
| } else { | ||
| throw new UserException("Unknown internal table name: " + tblName); | ||
| } | ||
| List<ColumnDef> copiedSchema = Lists.newArrayList(); | ||
| for (ColumnDef columnDef : schema) { | ||
| copiedSchema.add(new ColumnDef(columnDef.getName(), columnDef.getTypeDef(), columnDef.isAllowNull())); | ||
| } | ||
| return copiedSchema; | ||
| } | ||
| } |
Oops, something went wrong.