This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch branch-1.2-lts in repository https://gitbox.apache.org/repos/asf/doris.git
commit 784fcb4e49ed246451b4590bb25e146e2b0f83eb Author: morningman <[email protected]> AuthorDate: Sat Mar 11 22:35:59 2023 +0800 [fix](priv) fix bug of grant priv on ctl.db.* not work cherry-pick #17612 --- be/src/runtime/routine_load/routine_load_task_executor.cpp | 2 +- .../src/main/java/org/apache/doris/mysql/privilege/DbPrivTable.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/be/src/runtime/routine_load/routine_load_task_executor.cpp b/be/src/runtime/routine_load/routine_load_task_executor.cpp index b4fd4b0f4f..a1ad37eefc 100644 --- a/be/src/runtime/routine_load/routine_load_task_executor.cpp +++ b/be/src/runtime/routine_load/routine_load_task_executor.cpp @@ -333,7 +333,7 @@ void RoutineLoadTaskExecutor::exec_task(StreamLoadContext* ctx, DataConsumerPool for (auto& kv : ctx->kafka_info->cmt_offset) { // The offsets you commit are the offsets of the messages you want to read next RdKafka::TopicPartition* tp1 = RdKafka::TopicPartition::create( - ctx->kafka_info->topic, kv.first, kv.secondi + 1); + ctx->kafka_info->topic, kv.first, kv.second + 1); topic_partitions.push_back(tp1); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/DbPrivTable.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/DbPrivTable.java index 961cd1cb8c..f7b42b7965 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/DbPrivTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/DbPrivTable.java @@ -18,8 +18,10 @@ package org.apache.doris.mysql.privilege; import org.apache.doris.analysis.UserIdentity; +import org.apache.doris.cluster.ClusterNamespace; import org.apache.doris.common.io.Text; import org.apache.doris.qe.ConnectContext; +import org.apache.doris.system.SystemInfoService; import com.google.common.base.Preconditions; import org.apache.logging.log4j.LogManager; @@ -53,7 +55,8 @@ public class DbPrivTable extends PrivTable { } // check db - if (!dbPrivEntry.isAnyDb() && !dbPrivEntry.getDbPattern().match(db)) { + if (!dbPrivEntry.isAnyDb() && !dbPrivEntry.getDbPattern().match(db) && !dbPrivEntry.getDbPattern() + .match(ClusterNamespace.getFullName(SystemInfoService.DEFAULT_CLUSTER, db))) { continue; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
