From 41baea115fbdc7ad5f9ddf9ba50581813e21401e 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 9c5d38d05158e..b301506f1d815 100644 --- a/ticdc/ticdc-changefeed-config.md +++ b/ticdc/ticdc-changefeed-config.md @@ -188,6 +188,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 3b6ded5f7d07b..a355378b9d87c 100644 --- a/ticdc/ticdc-open-api-v2.md +++ b/ticdc/ticdc-open-api-v2.md @@ -288,6 +288,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 b75f4e06c3e7db6d3e8880e80b364ac550eb026d Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Mon, 18 Dec 2023 14:38:21 +0800 Subject: [PATCH 2/2] resolve conflicts --- ticdc/ticdc-changefeed-config.md | 3 --- ticdc/ticdc-open-api-v2.md | 3 --- 2 files changed, 6 deletions(-) diff --git a/ticdc/ticdc-changefeed-config.md b/ticdc/ticdc-changefeed-config.md index b301506f1d815..ebad9b071cc46 100644 --- a/ticdc/ticdc-changefeed-config.md +++ b/ticdc/ticdc-changefeed-config.md @@ -188,8 +188,6 @@ 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 @@ -202,7 +200,6 @@ 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 a355378b9d87c..ba8a6c178cd10 100644 --- a/ticdc/ticdc-open-api-v2.md +++ b/ticdc/ticdc-open-api-v2.md @@ -288,14 +288,11 @@ 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: