From bacd0a07ea663438f067cacaa4c30ba52e72a255 Mon Sep 17 00:00:00 2001 From: Jianyuan Jiang Date: Fri, 8 Dec 2023 11:14:51 +0800 Subject: [PATCH 1/2] This is an automated cherry-pick of #15619 Signed-off-by: ti-chi-bot --- ticdc/ticdc-changefeed-config.md | 15 +++++++++++++++ ticdc/ticdc-open-api-v2.md | 8 ++++++++ 2 files changed, 23 insertions(+) diff --git a/ticdc/ticdc-changefeed-config.md b/ticdc/ticdc-changefeed-config.md index f38f58dd5a316..7acd5deafdd8e 100644 --- a/ticdc/ticdc-changefeed-config.md +++ b/ticdc/ticdc-changefeed-config.md @@ -211,6 +211,21 @@ storage = "" # Specifies whether to store the redo log in a file. # The default value is false. use-file-backend = false +<<<<<<< HEAD +======= +# The number of encoding and decoding workers in the redo module. +# The default value is 16. +encoding-worker-num = 16 +# The number of flushing workers in the redo module. +# The default value is 8. +flush-worker-num = 8 +# The behavior to compress redo log files. +# Available options are "" and "lz4". The default value is "", which means no compression. +compression = "" +# The concurrency for uploading a single redo file. +# The default value is 1, which means concurrency is disabled. +flush-concurrency = 1 +>>>>>>> 12e084fe18 (Add cdc redo configuration (#15619)) [integrity] # Whether to enable the checksum validation for single-row data. The default value is "none", which means to disable the feature. Value options are "none" and "correctness". diff --git a/ticdc/ticdc-open-api-v2.md b/ticdc/ticdc-open-api-v2.md index 419f23137d07c..bcd5230f6d4c5 100644 --- a/ticdc/ticdc-open-api-v2.md +++ b/ticdc/ticdc-open-api-v2.md @@ -287,6 +287,14 @@ The `consistent` parameters are described as follows: | `level` | `STRING` type. The consistency level of the replicated data. (Optional) | | `max_log_size` | `UINT64` type. The maximum value of redo log. (Optional) | | `storage` | `STRING` type. The destination address of the storage. (Optional) | +<<<<<<< HEAD +======= +| `use_file_backend` | `BOOL` type. Specifies whether to store the redo log in a local file. (Optional) | +| `encoding_worker_num` | `INT` type. The number of encoding and decoding workers in the redo module. (Optional) | +| `flush_worker_num` | `INT` type. The number of flushing workers in the redo module. (Optional) | +| `compression` | `STRING` type. The behavior to compress redo log files. Available options are `""` and `"lz4"`. The default value is `""`, which means no compression. (Optional) | +| `flush_concurrency` | `INT` type. The concurrency for uploading a single file. The default value is `1`, which means concurrency is disabled. (Optional) | +>>>>>>> 12e084fe18 (Add cdc redo configuration (#15619)) The `filter` parameters are described as follows: From f52c259ac90eb0cce3acfbbb4c5fc1aa28137b82 Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Wed, 21 Feb 2024 10:43:18 +0800 Subject: [PATCH 2/2] resolve conflicts --- ticdc/ticdc-changefeed-config.md | 12 ------------ ticdc/ticdc-open-api-v2.md | 6 ------ 2 files changed, 18 deletions(-) diff --git a/ticdc/ticdc-changefeed-config.md b/ticdc/ticdc-changefeed-config.md index 7acd5deafdd8e..bb7d779f6ec15 100644 --- a/ticdc/ticdc-changefeed-config.md +++ b/ticdc/ticdc-changefeed-config.md @@ -211,21 +211,9 @@ storage = "" # Specifies whether to store the redo log in a file. # The default value is false. use-file-backend = false -<<<<<<< HEAD -======= -# The number of encoding and decoding workers in the redo module. -# The default value is 16. -encoding-worker-num = 16 -# The number of flushing workers in the redo module. -# The default value is 8. -flush-worker-num = 8 -# The behavior to compress redo log files. -# Available options are "" and "lz4". The default value is "", which means no compression. -compression = "" # The concurrency for uploading a single redo file. # The default value is 1, which means concurrency is disabled. flush-concurrency = 1 ->>>>>>> 12e084fe18 (Add cdc redo configuration (#15619)) [integrity] # Whether to enable the checksum validation for single-row data. The default value is "none", which means to disable the feature. Value options are "none" and "correctness". diff --git a/ticdc/ticdc-open-api-v2.md b/ticdc/ticdc-open-api-v2.md index bcd5230f6d4c5..4f67f67311c20 100644 --- a/ticdc/ticdc-open-api-v2.md +++ b/ticdc/ticdc-open-api-v2.md @@ -287,14 +287,8 @@ The `consistent` parameters are described as follows: | `level` | `STRING` type. The consistency level of the replicated data. (Optional) | | `max_log_size` | `UINT64` type. The maximum value of redo log. (Optional) | | `storage` | `STRING` type. The destination address of the storage. (Optional) | -<<<<<<< HEAD -======= -| `use_file_backend` | `BOOL` type. Specifies whether to store the redo log in a local file. (Optional) | -| `encoding_worker_num` | `INT` type. The number of encoding and decoding workers in the redo module. (Optional) | -| `flush_worker_num` | `INT` type. The number of flushing workers in the redo module. (Optional) | | `compression` | `STRING` type. The behavior to compress redo log files. Available options are `""` and `"lz4"`. The default value is `""`, which means no compression. (Optional) | | `flush_concurrency` | `INT` type. The concurrency for uploading a single file. The default value is `1`, which means concurrency is disabled. (Optional) | ->>>>>>> 12e084fe18 (Add cdc redo configuration (#15619)) The `filter` parameters are described as follows: