pingcap · ti-chi-bot · Apr 28, 2024 · Apr 24, 2024 · Apr 24, 2024 · Apr 28, 2024
diff --git a/cdc/api/v2/model.go b/cdc/api/v2/model.go
@@ -436,6 +436,18 @@ func (c *ReplicaConfig) toInternalReplicaConfigWithOriginConfig(
 				FlushConcurrency:    c.Sink.CloudStorageConfig.FlushConcurrency,
 			}
 		}
+		var debeziumConfig *config.DebeziumConfig
+		if c.Sink.DebeziumConfig != nil {
+			debeziumConfig = &config.DebeziumConfig{
+				OutputOldValue: c.Sink.DebeziumConfig.OutputOldValue,
+			}
+		}
+		var openProtocolConfig *config.OpenProtocolConfig
+		if c.Sink.OpenProtocolConfig != nil {
+			openProtocolConfig = &config.OpenProtocolConfig{
+				OutputOldValue: c.Sink.OpenProtocolConfig.OutputOldValue,
+			}
+		}
 
 		res.Sink = &config.SinkConfig{
 			DispatchRules:                    dispatchRules,
@@ -457,6 +469,8 @@ func (c *ReplicaConfig) toInternalReplicaConfigWithOriginConfig(
 			PulsarConfig:                     pulsarConfig,
 			CloudStorageConfig:               cloudStorageConfig,
 			SafeMode:                         c.Sink.SafeMode,
+			OpenProtocol:                     openProtocolConfig,
+			Debezium:                         debeziumConfig,
 		}
 
 		if c.Sink.TxnAtomicity != nil {
@@ -717,7 +731,18 @@ func ToAPIReplicaConfig(c *config.ReplicaConfig) *ReplicaConfig {
 				FlushConcurrency:    cloned.Sink.CloudStorageConfig.FlushConcurrency,
 			}
 		}
-
+		var debeziumConfig *DebeziumConfig
+		if cloned.Sink.Debezium != nil {
+			debeziumConfig = &DebeziumConfig{
+				OutputOldValue: cloned.Sink.Debezium.OutputOldValue,
+			}
+		}
+		var openProtocolConfig *OpenProtocolConfig
+		if cloned.Sink.OpenProtocol != nil {
+			openProtocolConfig = &OpenProtocolConfig{
+				OutputOldValue: cloned.Sink.OpenProtocol.OutputOldValue,
+			}
+		}
 		res.Sink = &SinkConfig{
 			Protocol:                         cloned.Sink.Protocol,
 			SchemaRegistry:                   cloned.Sink.SchemaRegistry,
@@ -738,6 +763,8 @@ func ToAPIReplicaConfig(c *config.ReplicaConfig) *ReplicaConfig {
 			PulsarConfig:                     pulsarConfig,
 			CloudStorageConfig:               cloudStorageConfig,
 			SafeMode:                         cloned.Sink.SafeMode,
+			DebeziumConfig:                   debeziumConfig,
+			OpenProtocolConfig:               openProtocolConfig,
 		}
 
 		if cloned.Sink.TxnAtomicity != nil {
@@ -925,6 +952,8 @@ type SinkConfig struct {
 	SendBootstrapInMsgCount          *int32              `json:"send_bootstrap_in_msg_count,omitempty"`
 	SendBootstrapToAllPartition      *bool               `json:"send_bootstrap_to_all_partition,omitempty"`
 	DebeziumDisableSchema            *bool               `json:"debezium_disable_schema,omitempty"`
+	DebeziumConfig                   *DebeziumConfig     `json:"debezium,omitempty"`
+	OpenProtocolConfig               *OpenProtocolConfig `json:"open,omitempty"`
 }
 
 // CSVConfig denotes the csv config
@@ -1267,3 +1296,13 @@ type GlueSchemaRegistryConfig struct {
 	SecretAccessKey string `json:"secret_access_key,omitempty"`
 	Token           string `json:"token,omitempty"`
 }
+
+// OpenProtocolConfig represents the configurations for open protocol encoding
+type OpenProtocolConfig struct {
+	OutputOldValue bool `json:"output_old_value"`
+}
+
+// DebeziumConfig represents the configurations for debezium protocol encoding
+type DebeziumConfig struct {
+	OutputOldValue bool `json:"output_old_value"`
+}
diff --git a/cdc/api/v2/model_test.go b/cdc/api/v2/model_test.go
@@ -63,6 +63,8 @@ var defaultAPIConfig = &ReplicaConfig{
 		SendBootstrapInMsgCount:          util.AddressOf(int32(10000)),
 		SendBootstrapToAllPartition:      util.AddressOf(true),
 		DebeziumDisableSchema:            util.AddressOf(false),
+		OpenProtocolConfig:               &OpenProtocolConfig{OutputOldValue: true},
+		DebeziumConfig:                   &DebeziumConfig{OutputOldValue: true},
 	},
 	Consistent: &ConsistentConfig{
 		Level:                 "none",

diff --git a/docs/swagger/docs.go b/docs/swagger/docs.go
@@ -1492,6 +1492,14 @@ var doc = `{
                 }
             }
         },
+        "config.DebeziumConfig": {
+            "type": "object",
+            "properties": {
+                "output-old-value": {
+                    "type": "boolean"
+                }
+            }
+        },
         "config.DispatchRule": {
             "type": "object",
             "properties": {
@@ -1754,6 +1762,14 @@ var doc = `{
                 }
             }
         },
+        "config.OpenProtocolConfig": {
+            "type": "object",
+            "properties": {
+                "output-old-value": {
+                    "type": "boolean"
+                }
+            }
+        },
         "config.PulsarConfig": {
             "type": "object",
             "properties": {
@@ -1856,6 +1872,10 @@ var doc = `{
                     "description": "DateSeparator is only available when the downstream is Storage.",
                     "type": "string"
                 },
+                "debezium": {
+                    "description": "DebeziumConfig related configurations",
+                    "$ref": "#/definitions/config.DebeziumConfig"
+                },
                 "debezium-disable-schema": {
                     "description": "Debezium only. Whether schema should be excluded in the output.",
                     "type": "boolean"
@@ -1897,6 +1917,10 @@ var doc = `{
                     "description": "OnlyOutputUpdatedColumns is only available when the downstream is MQ.",
                     "type": "boolean"
                 },
+                "open": {
+                    "description": "OpenProtocol related configurations",
+                    "$ref": "#/definitions/config.OpenProtocolConfig"
+                },
                 "protocol": {
                     "description": "Protocol is NOT available when the downstream is DB.",
                     "type": "string"
@@ -2519,6 +2543,14 @@ var doc = `{
                 }
             }
         },
+        "v2.DebeziumConfig": {
+            "type": "object",
+            "properties": {
+                "output_old_value": {
+                    "type": "boolean"
+                }
+            }
+        },
         "v2.DispatchRule": {
             "type": "object",
             "properties": {
@@ -2842,6 +2874,14 @@ var doc = `{
                 }
             }
         },
+        "v2.OpenProtocolConfig": {
+            "type": "object",
+            "properties": {
+                "output_old_value": {
+                    "type": "boolean"
+                }
+            }
+        },
         "v2.ProcessorCommonInfo": {
             "type": "object",
             "properties": {
@@ -3106,6 +3146,9 @@ var doc = `{
                 "date_separator": {
                     "type": "string"
                 },
+                "debezium": {
+                    "$ref": "#/definitions/v2.DebeziumConfig"
+                },
                 "debezium_disable_schema": {
                     "type": "boolean"
                 },
@@ -3139,6 +3182,9 @@ var doc = `{
                 "only_output_updated_columns": {
                     "type": "boolean"
                 },
+                "open": {
+                    "$ref": "#/definitions/v2.OpenProtocolConfig"
+                },
                 "protocol": {
                     "type": "string"
                 },

diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
@@ -1473,6 +1473,14 @@
                 }
             }
         },
+        "config.DebeziumConfig": {
+            "type": "object",
+            "properties": {
+                "output-old-value": {
+                    "type": "boolean"
+                }
+            }
+        },
         "config.DispatchRule": {
             "type": "object",
             "properties": {
@@ -1735,6 +1743,14 @@
                 }
             }
         },
+        "config.OpenProtocolConfig": {
+            "type": "object",
+            "properties": {
+                "output-old-value": {
+                    "type": "boolean"
+                }
+            }
+        },
         "config.PulsarConfig": {
             "type": "object",
             "properties": {
@@ -1837,6 +1853,10 @@
                     "description": "DateSeparator is only available when the downstream is Storage.",
                     "type": "string"
                 },
+                "debezium": {
+                    "description": "DebeziumConfig related configurations",
+                    "$ref": "#/definitions/config.DebeziumConfig"
+                },
                 "debezium-disable-schema": {
                     "description": "Debezium only. Whether schema should be excluded in the output.",
                     "type": "boolean"
@@ -1878,6 +1898,10 @@
                     "description": "OnlyOutputUpdatedColumns is only available when the downstream is MQ.",
                     "type": "boolean"
                 },
+                "open": {
+                    "description": "OpenProtocol related configurations",
+                    "$ref": "#/definitions/config.OpenProtocolConfig"
+                },
                 "protocol": {
                     "description": "Protocol is NOT available when the downstream is DB.",
                     "type": "string"
@@ -2500,6 +2524,14 @@
                 }
             }
         },
+        "v2.DebeziumConfig": {
+            "type": "object",
+            "properties": {
+                "output_old_value": {
+                    "type": "boolean"
+                }
+            }
+        },
         "v2.DispatchRule": {
             "type": "object",
             "properties": {
@@ -2823,6 +2855,14 @@
                 }
             }
         },
+        "v2.OpenProtocolConfig": {
+            "type": "object",
+            "properties": {
+                "output_old_value": {
+                    "type": "boolean"
+                }
+            }
+        },
         "v2.ProcessorCommonInfo": {
             "type": "object",
             "properties": {
@@ -3087,6 +3127,9 @@
                 "date_separator": {
                     "type": "string"
                 },
+                "debezium": {
+                    "$ref": "#/definitions/v2.DebeziumConfig"
+                },
                 "debezium_disable_schema": {
                     "type": "boolean"
                 },
@@ -3120,6 +3163,9 @@
                 "only_output_updated_columns": {
                     "type": "boolean"
                 },
+                "open": {
+                    "$ref": "#/definitions/v2.OpenProtocolConfig"
+                },
                 "protocol": {
                     "type": "string"
                 },

diff --git a/docs/swagger/swagger.yaml b/docs/swagger/swagger.yaml
@@ -69,6 +69,11 @@ definitions:
           type: string
         type: array
     type: object
+  config.DebeziumConfig:
+    properties:
+      output-old-value:
+        type: boolean
+    type: object
   config.DispatchRule:
     properties:
       columns:
@@ -249,6 +254,11 @@ definitions:
         description: OAuth2Scope scope
         type: string
     type: object
+  config.OpenProtocolConfig:
+    properties:
+      output-old-value:
+        type: boolean
+    type: object
   config.PulsarConfig:
     properties:
       auth-tls-certificate-path:
@@ -342,6 +352,9 @@ definitions:
       date-separator:
         description: DateSeparator is only available when the downstream is Storage.
         type: string
+      debezium:
+        $ref: '#/definitions/config.DebeziumConfig'
+        description: DebeziumConfig related configurations
       debezium-disable-schema:
         description: Debezium only. Whether schema should be excluded in the output.
         type: boolean
@@ -377,6 +390,9 @@ definitions:
         description: OnlyOutputUpdatedColumns is only available when the downstream
           is MQ.
         type: boolean
+      open:
+        $ref: '#/definitions/config.OpenProtocolConfig'
+        description: OpenProtocol related configurations
       protocol:
         description: Protocol is NOT available when the downstream is DB.
         type: string
@@ -807,6 +823,11 @@ definitions:
       memory_quota_percentage:
         type: integer
     type: object
+  v2.DebeziumConfig:
+    properties:
+      output_old_value:
+        type: boolean
+    type: object
   v2.DispatchRule:
     properties:
       columns:
@@ -1021,6 +1042,11 @@ definitions:
       write_timeout:
         type: string
     type: object
+  v2.OpenProtocolConfig:
+    properties:
+      output_old_value:
+        type: boolean
+    type: object
   v2.ProcessorCommonInfo:
     properties:
       capture_id:
@@ -1195,6 +1221,8 @@ definitions:
         $ref: '#/definitions/v2.CSVConfig'
       date_separator:
         type: string
+      debezium:
+        $ref: '#/definitions/v2.DebeziumConfig'
       debezium_disable_schema:
         type: boolean
       delete_only_output_handle_key_columns:
@@ -1217,6 +1245,8 @@ definitions:
         $ref: '#/definitions/v2.MySQLConfig'
       only_output_updated_columns:
         type: boolean
+      open:
+        $ref: '#/definitions/v2.OpenProtocolConfig'
       protocol:
         type: string
       pulsar_config:

diff --git a/pkg/cmd/util/helper_test.go b/pkg/cmd/util/helper_test.go
@@ -214,6 +214,8 @@ func TestAndWriteExampleReplicaTOML(t *testing.T) {
 		SendBootstrapInMsgCount:          util.AddressOf(int32(10000)),
 		SendBootstrapToAllPartition:      util.AddressOf(true),
 		DebeziumDisableSchema:            util.AddressOf(false),
+		OpenProtocol:                     &config.OpenProtocolConfig{OutputOldValue: true},
+		Debezium:                         &config.DebeziumConfig{OutputOldValue: true},
 	}, cfg.Sink)
 }
 
@@ -252,6 +254,8 @@ func TestAndWriteStorageSinkTOML(t *testing.T) {
 		SendBootstrapInMsgCount:          util.AddressOf(int32(10000)),
 		SendBootstrapToAllPartition:      util.AddressOf(true),
 		DebeziumDisableSchema:            util.AddressOf(false),
+		OpenProtocol:                     &config.OpenProtocolConfig{OutputOldValue: true},
+		Debezium:                         &config.DebeziumConfig{OutputOldValue: true},
 	}, cfg.Sink)
 }