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 86bd39477d5 [improvement](binlog) Change BinlogConfig default
TTL_SECONDS to 86400 (1day) (#30771)
86bd39477d5 is described below
commit 86bd39477d5ea3af02a0bdffdb91657a3af051aa
Author: Jack Drogon <[email protected]>
AuthorDate: Sat Feb 3 23:43:04 2024 +0800
[improvement](binlog) Change BinlogConfig default TTL_SECONDS to 86400
(1day) (#30771)
* Change BinlogConfig default TTL_SECONDS to 86400 (1day)
Signed-off-by: Jack Drogon <[email protected]>
* Fix binlog.ttl_seconds in regression test
Signed-off-by: Jack Drogon <[email protected]>
---------
Signed-off-by: Jack Drogon <[email protected]>
---
.../src/main/java/org/apache/doris/catalog/BinlogConfig.java | 2 +-
.../data/insert_p0/test_group_commit_interval_ms_property.out | 8 ++++----
regression-test/data/query_p0/show/test_show_create_table.out | 4 ++--
regression-test/data/show_p0/test_show_create_table_and_views.out | 8 ++++----
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/BinlogConfig.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/BinlogConfig.java
index 2f35a8d59cf..bae9d0dbfba 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/BinlogConfig.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/BinlogConfig.java
@@ -44,7 +44,7 @@ public class BinlogConfig implements Writable {
@SerializedName("maxHistoryNums")
private long maxHistoryNums;
- public static final long TTL_SECONDS = 0x7fffffffffffffffL;
+ public static final long TTL_SECONDS = 86400L; // 1 day
public static final long MAX_BYTES = 0x7fffffffffffffffL;
public static final long MAX_HISTORY_NUMS = 0x7fffffffffffffffL;
diff --git
a/regression-test/data/insert_p0/test_group_commit_interval_ms_property.out
b/regression-test/data/insert_p0/test_group_commit_interval_ms_property.out
index cc592fef27e..4b2a17ea07a 100644
--- a/regression-test/data/insert_p0/test_group_commit_interval_ms_property.out
+++ b/regression-test/data/insert_p0/test_group_commit_interval_ms_property.out
@@ -1,13 +1,13 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !1 --
-test_group_commit_interval_ms_property_tbl_legacy CREATE TABLE
`test_group_commit_interval_ms_property_tbl_legacy` (\n `k` BIGINT NULL,\n
`v` BIGINT NULL\n) ENGINE=OLAP\nUNIQUE KEY(`k`)\nCOMMENT 'OLAP'\nDISTRIBUTED BY
HASH(`v`) BUCKETS 8\nPROPERTIES (\n"replication_allocation" =
"tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" =
"false",\n"storage_format" = "V2",\n"enable_unique_key_merge_on_write" =
"false",\n"light_schema_change" = "true",\n"disable_auto_ [...]
+test_group_commit_interval_ms_property_tbl_legacy CREATE TABLE
`test_group_commit_interval_ms_property_tbl_legacy` (\n `k` BIGINT NULL,\n
`v` BIGINT NULL\n) ENGINE=OLAP\nUNIQUE KEY(`k`)\nCOMMENT 'OLAP'\nDISTRIBUTED BY
HASH(`v`) BUCKETS 8\nPROPERTIES (\n"replication_allocation" =
"tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" =
"false",\n"storage_format" = "V2",\n"enable_unique_key_merge_on_write" =
"false",\n"light_schema_change" = "true",\n"disable_auto_ [...]
-- !2 --
-test_group_commit_interval_ms_property_tbl_legacy CREATE TABLE
`test_group_commit_interval_ms_property_tbl_legacy` (\n `k` BIGINT NULL,\n
`v` BIGINT NULL\n) ENGINE=OLAP\nUNIQUE KEY(`k`)\nCOMMENT 'OLAP'\nDISTRIBUTED BY
HASH(`v`) BUCKETS 8\nPROPERTIES (\n"replication_allocation" =
"tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" =
"false",\n"storage_format" = "V2",\n"enable_unique_key_merge_on_write" =
"false",\n"light_schema_change" = "true",\n"disable_auto_ [...]
+test_group_commit_interval_ms_property_tbl_legacy CREATE TABLE
`test_group_commit_interval_ms_property_tbl_legacy` (\n `k` BIGINT NULL,\n
`v` BIGINT NULL\n) ENGINE=OLAP\nUNIQUE KEY(`k`)\nCOMMENT 'OLAP'\nDISTRIBUTED BY
HASH(`v`) BUCKETS 8\nPROPERTIES (\n"replication_allocation" =
"tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" =
"false",\n"storage_format" = "V2",\n"enable_unique_key_merge_on_write" =
"false",\n"light_schema_change" = "true",\n"disable_auto_ [...]
-- !1 --
-test_group_commit_interval_ms_property_tbl_nereids CREATE TABLE
`test_group_commit_interval_ms_property_tbl_nereids` (\n `k` BIGINT NULL,\n
`v` BIGINT NULL\n) ENGINE=OLAP\nUNIQUE KEY(`k`)\nCOMMENT 'OLAP'\nDISTRIBUTED BY
HASH(`v`) BUCKETS 8\nPROPERTIES (\n"replication_allocation" =
"tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" =
"false",\n"storage_format" = "V2",\n"enable_unique_key_merge_on_write" =
"false",\n"light_schema_change" = "true",\n"disable_aut [...]
+test_group_commit_interval_ms_property_tbl_nereids CREATE TABLE
`test_group_commit_interval_ms_property_tbl_nereids` (\n `k` BIGINT NULL,\n
`v` BIGINT NULL\n) ENGINE=OLAP\nUNIQUE KEY(`k`)\nCOMMENT 'OLAP'\nDISTRIBUTED BY
HASH(`v`) BUCKETS 8\nPROPERTIES (\n"replication_allocation" =
"tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" =
"false",\n"storage_format" = "V2",\n"enable_unique_key_merge_on_write" =
"false",\n"light_schema_change" = "true",\n"disable_aut [...]
-- !2 --
-test_group_commit_interval_ms_property_tbl_nereids CREATE TABLE
`test_group_commit_interval_ms_property_tbl_nereids` (\n `k` BIGINT NULL,\n
`v` BIGINT NULL\n) ENGINE=OLAP\nUNIQUE KEY(`k`)\nCOMMENT 'OLAP'\nDISTRIBUTED BY
HASH(`v`) BUCKETS 8\nPROPERTIES (\n"replication_allocation" =
"tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" =
"false",\n"storage_format" = "V2",\n"enable_unique_key_merge_on_write" =
"false",\n"light_schema_change" = "true",\n"disable_aut [...]
+test_group_commit_interval_ms_property_tbl_nereids CREATE TABLE
`test_group_commit_interval_ms_property_tbl_nereids` (\n `k` BIGINT NULL,\n
`v` BIGINT NULL\n) ENGINE=OLAP\nUNIQUE KEY(`k`)\nCOMMENT 'OLAP'\nDISTRIBUTED BY
HASH(`v`) BUCKETS 8\nPROPERTIES (\n"replication_allocation" =
"tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" =
"false",\n"storage_format" = "V2",\n"enable_unique_key_merge_on_write" =
"false",\n"light_schema_change" = "true",\n"disable_aut [...]
diff --git a/regression-test/data/query_p0/show/test_show_create_table.out
b/regression-test/data/query_p0/show/test_show_create_table.out
index 811e25ea15e..0f621de0172 100644
--- a/regression-test/data/query_p0/show/test_show_create_table.out
+++ b/regression-test/data/query_p0/show/test_show_create_table.out
@@ -1,7 +1,7 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !select --
-tb_show_create_table CREATE TABLE `tb_show_create_table` (\n `datek1` date
NULL COMMENT 'a',\n `datetimek1` datetime NULL COMMENT 'b',\n `datetimek2`
datetime(3) NULL COMMENT 'c',\n `datetimek3` datetime(6) NULL COMMENT 'd',\n
`datev1` date MAX NOT NULL COMMENT 'e',\n `datetimev1` datetime MAX NOT NULL
COMMENT 'f',\n `datetimev2` datetime(3) MAX NOT NULL COMMENT 'g',\n
`datetimev3` datetime(6) MAX NOT NULL COMMENT 'h'\n) ENGINE=OLAP\nAGGREGATE
KEY(`datek1`, `datetimek1`, `datetim [...]
+tb_show_create_table CREATE TABLE `tb_show_create_table` (\n `datek1` date
NULL COMMENT 'a',\n `datetimek1` datetime NULL COMMENT 'b',\n `datetimek2`
datetime(3) NULL COMMENT 'c',\n `datetimek3` datetime(6) NULL COMMENT 'd',\n
`datev1` date MAX NOT NULL COMMENT 'e',\n `datetimev1` datetime MAX NOT NULL
COMMENT 'f',\n `datetimev2` datetime(3) MAX NOT NULL COMMENT 'g',\n
`datetimev3` datetime(6) MAX NOT NULL COMMENT 'h'\n) ENGINE=OLAP\nAGGREGATE
KEY(`datek1`, `datetimek1`, `datetim [...]
-- !select --
-tb_show_create_table CREATE TABLE `tb_show_create_table` (\n `datek1` date
NULL COMMENT 'a',\n `datetimek1` datetime NULL COMMENT 'b',\n `datetimek2`
datetime(3) NULL COMMENT 'c',\n `datetimek3` datetime(6) NULL COMMENT 'd',\n
`datev1` date NOT NULL COMMENT 'e',\n `datetimev1` datetime NOT NULL COMMENT
'f',\n `datetimev2` datetime(3) NOT NULL COMMENT 'g',\n `datetimev3`
datetime(6) NOT NULL COMMENT 'h'\n) ENGINE=OLAP\nDUPLICATE KEY(`datek1`,
`datetimek1`, `datetimek2`, `datetimek [...]
+tb_show_create_table CREATE TABLE `tb_show_create_table` (\n `datek1` date
NULL COMMENT 'a',\n `datetimek1` datetime NULL COMMENT 'b',\n `datetimek2`
datetime(3) NULL COMMENT 'c',\n `datetimek3` datetime(6) NULL COMMENT 'd',\n
`datev1` date NOT NULL COMMENT 'e',\n `datetimev1` datetime NOT NULL COMMENT
'f',\n `datetimev2` datetime(3) NOT NULL COMMENT 'g',\n `datetimev3`
datetime(6) NOT NULL COMMENT 'h'\n) ENGINE=OLAP\nDUPLICATE KEY(`datek1`,
`datetimek1`, `datetimek2`, `datetimek [...]
diff --git a/regression-test/data/show_p0/test_show_create_table_and_views.out
b/regression-test/data/show_p0/test_show_create_table_and_views.out
index 2df41e35d23..fe4d8ea9fca 100644
--- a/regression-test/data/show_p0/test_show_create_table_and_views.out
+++ b/regression-test/data/show_p0/test_show_create_table_and_views.out
@@ -1,6 +1,6 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
-- !show --
-show_create_table_and_views_table CREATE TABLE
`show_create_table_and_views_table` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nCOMMENT 'OLAP'\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300"), ("400")),\nPAR [...]
+show_create_table_and_views_table CREATE TABLE
`show_create_table_and_views_table` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nCOMMENT 'OLAP'\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300"), ("400")),\nPAR [...]
-- !select --
1 1 30
@@ -36,11 +36,11 @@ show_create_table_and_views_view CREATE VIEW
`show_create_table_and_views_view`
300 1
-- !show --
-show_create_table_and_views_table CREATE TABLE
`show_create_table_and_views_table` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nCOMMENT 'OLAP'\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300"), ("400")),\nPAR [...]
+show_create_table_and_views_table CREATE TABLE
`show_create_table_and_views_table` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nCOMMENT 'OLAP'\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300"), ("400")),\nPAR [...]
-- !show --
-show_create_table_and_views_like CREATE TABLE
`show_create_table_and_views_like` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nCOMMENT 'OLAP'\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300"), ("400")),\nPARTI [...]
+show_create_table_and_views_like CREATE TABLE
`show_create_table_and_views_like` (\n `user_id` LARGEINT NOT NULL,\n
`good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nCOMMENT 'OLAP'\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [("300"), ("400")),\nPARTI [...]
-- !show --
-show_create_table_and_views_like_with_rollup CREATE TABLE
`show_create_table_and_views_like_with_rollup` (\n `user_id` LARGEINT NOT
NULL,\n `good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nCOMMENT 'OLAP'\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [( [...]
+show_create_table_and_views_like_with_rollup CREATE TABLE
`show_create_table_and_views_like_with_rollup` (\n `user_id` LARGEINT NOT
NULL,\n `good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0"\n)
ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nCOMMENT 'OLAP'\nPARTITION BY
RANGE(`good_id`)\n(PARTITION p1 VALUES
[("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES
[("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4
VALUES [( [...]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
