This is an automated email from the ASF dual-hosted git repository.
w41ter pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new ae15757d96f [chore](ddl) support force_enable_feature_binlog #41796
(#42002)
ae15757d96f is described below
commit ae15757d96f5404cdcba370e621c46c32e925613
Author: walter <[email protected]>
AuthorDate: Thu Oct 17 12:06:29 2024 +0800
[chore](ddl) support force_enable_feature_binlog #41796 (#42002)
cherry pick from #41796
---
fe/fe-common/src/main/java/org/apache/doris/common/Config.java | 5 +++++
.../src/main/java/org/apache/doris/analysis/CreateDbStmt.java | 7 +++++++
fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java | 3 +++
3 files changed, 15 insertions(+)
diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
index a33f59b4c40..be494505a31 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
@@ -2367,6 +2367,11 @@ public class Config extends ConfigBase {
"Whether to enable binlog feature"})
public static boolean enable_feature_binlog = false;
+ @ConfField(mutable = false, description = {
+ "是否默认为 Database/Table 启用binlog特性",
+ "Whether to enable binlog feature for Database/Table by default"})
+ public static boolean force_enable_feature_binlog = false;
+
@ConfField(mutable = false, masterOnly = false, varType =
VariableAnnotation.EXPERIMENTAL, description = {
"设置 binlog 消息最字节长度",
"Set the maximum byte length of binlog message"})
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateDbStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateDbStmt.java
index 917784d25ca..358ee5e4deb 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateDbStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateDbStmt.java
@@ -18,12 +18,14 @@
package org.apache.doris.analysis;
import org.apache.doris.catalog.Env;
+import org.apache.doris.common.Config;
import org.apache.doris.common.ErrorCode;
import org.apache.doris.common.ErrorReport;
import org.apache.doris.common.FeNameFormat;
import org.apache.doris.common.UserException;
import org.apache.doris.common.util.InternalDatabaseUtil;
import org.apache.doris.common.util.PrintableMap;
+import org.apache.doris.common.util.PropertyAnalyzer;
import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.qe.ConnectContext;
@@ -43,6 +45,11 @@ public class CreateDbStmt extends DdlStmt implements
NotFallbackInParser {
this.ctlName = dbName.getCtl();
this.dbName = dbName.getDb();
this.properties = properties == null ? new HashMap<>() : properties;
+
+ if (Config.force_enable_feature_binlog
+ &&
!this.properties.containsKey(PropertyAnalyzer.PROPERTIES_BINLOG_ENABLE)) {
+ this.properties.put(PropertyAnalyzer.PROPERTIES_BINLOG_ENABLE,
"true");
+ }
}
public String getFullDbName() {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java
index 6862c3b61c0..f6d46db5ee5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java
@@ -289,6 +289,9 @@ public class Database extends MetaObject implements
Writable, DatabaseIf<Table>,
public void setDbProperties(DatabaseProperty dbProperties) {
this.dbProperties = dbProperties;
+ if (PropertyAnalyzer.hasBinlogConfig(dbProperties.getProperties())) {
+ binlogConfig = dbProperties.getBinlogConfig();
+ }
}
public long getUsedDataQuotaWithLock() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
