This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new aa1d1809d3a [improvement](binlog) Change BinlogConfig default
TTL_SECONDS to 86400 (1day) (#30771) (#30798)
aa1d1809d3a is described below
commit aa1d1809d3a3a7e97a7ed6572a0a1e90fd515c8c
Author: Jack Drogon <[email protected]>
AuthorDate: Mon Feb 5 17:40:36 2024 +0800
[improvement](binlog) Change BinlogConfig default TTL_SECONDS to 86400
(1day) (#30771) (#30798)
---
.../src/main/java/org/apache/doris/catalog/BinlogConfig.java | 2 +-
regression-test/data/query_p0/show/test_show_create_table.out | 4 ++--
.../data/show_p0/test_show_create_table_and_views.out | 9 ++++-----
3 files changed, 7 insertions(+), 8 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/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 57e3e8266a6..46eec5f1cfd 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(40) NOT NULL,\n
`good_id` largeint(40) NOT NULL,\n `cost` bigint(20) 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"), (" [...]
+show_create_table_and_views_table CREATE TABLE
`show_create_table_and_views_table` (\n `user_id` largeint(40) NOT NULL,\n
`good_id` largeint(40) NOT NULL,\n `cost` bigint(20) 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"), (" [...]
-- !select --
1 1 30
@@ -36,11 +36,10 @@ 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(40) NOT NULL,\n
`good_id` largeint(40) NOT NULL,\n `cost` bigint(20) 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"), (" [...]
+show_create_table_and_views_table CREATE TABLE
`show_create_table_and_views_table` (\n `user_id` largeint(40) NOT NULL,\n
`good_id` largeint(40) NOT NULL,\n `cost` bigint(20) 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"), (" [...]
-- !show --
-show_create_table_and_views_like CREATE TABLE
`show_create_table_and_views_like` (\n `user_id` largeint(40) NOT NULL,\n
`good_id` largeint(40) NOT NULL,\n `cost` bigint(20) 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"), ("40 [...]
+show_create_table_and_views_like CREATE TABLE
`show_create_table_and_views_like` (\n `user_id` largeint(40) NOT NULL,\n
`good_id` largeint(40) NOT NULL,\n `cost` bigint(20) 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"), ("40 [...]
-- !show --
-show_create_table_and_views_like_with_rollup CREATE TABLE
`show_create_table_and_views_like_with_rollup` (\n `user_id` largeint(40) NOT
NULL,\n `good_id` largeint(40) NOT NULL,\n `cost` bigint(20) 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 [...]
-
+show_create_table_and_views_like_with_rollup CREATE TABLE
`show_create_table_and_views_like_with_rollup` (\n `user_id` largeint(40) NOT
NULL,\n `good_id` largeint(40) NOT NULL,\n `cost` bigint(20) 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 [...]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
