Merge branch 'master' of https://github.com/WizardXiao/ticdc into fix…

…-diff-default-collation

.github/workflows/ticdc_integration.yaml

@@ -58,14 +58,14 @@ jobs:
 
       - name: Build Integration Framework
         run: |
-          cd $GITHUB_WORKSPACE/integration
+          cd $GITHUB_WORKSPACE/tests/mq_protocol_tests
           go build
 
       - name: Run Integration Framework
         timeout-minutes: 45
         run: |
-          cd $GITHUB_WORKSPACE/integration
-          ./integration -protocol=mysql
+          cd $GITHUB_WORKSPACE/tests/mq_protocol_tests
+          ./mq_protocol_tests -protocol=mysql
 
       - name: Try to dump container logs
         if: ${{ failure() }}
@@ -120,14 +120,14 @@ jobs:
 
       - name: Build Integration Framework
         run: |
-          cd $GITHUB_WORKSPACE/integration
+          cd $GITHUB_WORKSPACE/tests/mq_protocol_tests
           go build
 
       - name: Run Integration Framework
         timeout-minutes: 45
         run: |
-          cd $GITHUB_WORKSPACE/integration
-          ./integration -protocol=simple-mysql-checking-old-value
+          cd $GITHUB_WORKSPACE/tests/mq_protocol_tests
+          ./mq_protocol_tests -protocol=simple-mysql-checking-old-value
 
       - name: Try to dump container logs
         if: ${{ failure() }}
@@ -182,14 +182,14 @@ jobs:
 
       - name: Build Integration Framework
         run: |
-          cd $GITHUB_WORKSPACE/integration
+          cd $GITHUB_WORKSPACE/tests/mq_protocol_tests
           go build
 
       - name: Run Integration Framework
         timeout-minutes: 45
         run: |
-          cd $GITHUB_WORKSPACE/integration
-          ./integration -protocol=canalJson
+          cd $GITHUB_WORKSPACE/tests/mq_protocol_tests
+          ./mq_protocol_tests -protocol=canalJson
 
       - name: Try to dump container logs
         if: ${{ failure() }}

.github/workflows/ticdc_integration_cron.yaml

@@ -48,14 +48,14 @@ jobs:
 
       - name: Build Integration Framework
         run: |
-          cd $GITHUB_WORKSPACE/integration
+          cd $GITHUB_WORKSPACE/tests/mq_protocol_tests
           go build
 
       - name: Run Integration Framework
         timeout-minutes: 45
         run: |
-          cd $GITHUB_WORKSPACE/integration
-          ./integration -protocol=canal
+          cd $GITHUB_WORKSPACE/tests/mq_protocol_tests
+          ./mq_protocol_tests -protocol=canal
 
       - name: Try to dump container logs
         if: ${{ failure() }}
@@ -110,14 +110,14 @@ jobs:
 
       - name: Build Integration Framework
         run: |
-          cd $GITHUB_WORKSPACE/integration
+          cd $GITHUB_WORKSPACE/tests/mq_protocol_tests
           go build
 
       - name: Run Integration Framework
         timeout-minutes: 45
         run: |
-          cd $GITHUB_WORKSPACE/integration
-          ./integration
+          cd $GITHUB_WORKSPACE/tests/mq_protocol_tests
+          ./mq_protocol_tests
 
       - name: Try to dump container logs
         if: ${{ failure() }}

integration/README.md → tests/mq_protocol_tests/README.md

@@ -1,7 +1,11 @@
 # Integration Framework
 
 ## Introduction
-The **Integration Framework** is designed to provide a flexible way for contributors to write integration tests for new sinks or MQ protocols. The core of the framework is stored in `{ticdc_root}/integration/framework`, and test cases should be stored in `{ticdc_root}/integration`. Currently, although the Framework is still under active development, it is capable of helping test Avro support and it is the only officially supported way for developers to run integration tests with Kafka connect.
+The **Integration Framework** is designed to provide a flexible way for contributors to write integration tests for new
+sinks or MQ protocols. The core of the framework is stored in `{ticdc_root}/tests/mq_protocol_tests/framework`, and test
+cases should be stored in `{ticdc_root}/tests/mq_protocol_tests/cases`. Currently, although the Framework is still under
+active development, it is capable of helping test Avro support and it is the only officially supported way for
+developers to run integration tests with Kafka connect.
 
 ## Quick Start
 To create a test case, you need to:
@@ -23,7 +27,7 @@ For the time being, if you would like to write a test case for Avro and Canal, i
 
 Example:
 ```go
-// tests/base_mycase.go
+// cases/base_mycase.go
 type MyCase struct {
 	framework.Task
 }
@@ -71,7 +75,7 @@ func (c *MyCase) Run(ctx *framework.TaskContext) error {
 }
 
 
-// tests/integration.go
+// main.go
 func main() {
     task := &canal.SingleTableTask{TableName: "test"}
     testCases := []framework.Task{

integration/tests/case_alter.go → tests/mq_protocol_tests/cases/case_alter.go

@@ -11,14 +11,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package tests
+package cases
 
 import (
 	"fmt"
 	"math/rand"
 
 	"github.com/pingcap/errors"
-	"github.com/pingcap/ticdc/integration/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
 )
 
 // AlterCase is base impl of test case for alter operation

integration/tests/case_composite_pkey.go → tests/mq_protocol_tests/cases/case_composite_pkey.go

@@ -11,11 +11,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package tests
+package cases
 
 import (
 	"github.com/pingcap/errors"
-	"github.com/pingcap/ticdc/integration/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
 )
 
 // CompositePKeyCase is base impl of test case for composite primary keys

integration/tests/case_date_time.go → tests/mq_protocol_tests/cases/case_date_time.go

@@ -11,17 +11,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package tests
+package cases
 
 import (
 	"errors"
 	"log"
 	"time"
 
-	"github.com/pingcap/ticdc/integration/framework"
-	"github.com/pingcap/ticdc/integration/framework/avro"
-	"github.com/pingcap/ticdc/integration/framework/canal"
-	"github.com/pingcap/ticdc/integration/framework/mysql"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework/avro"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework/canal"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework/mysql"
 )
 
 // DateTimeCase is base impl of test case for different types data

integration/tests/case_delete.go → tests/mq_protocol_tests/cases/case_delete.go

@@ -11,13 +11,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package tests
+package cases
 
 import (
 	"errors"
 
 	"github.com/pingcap/log"
-	"github.com/pingcap/ticdc/integration/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
 	"go.uber.org/zap"
 )
 

integration/tests/case_many_types.go → tests/mq_protocol_tests/cases/case_many_types.go

@@ -11,17 +11,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package tests
+package cases
 
 import (
 	"errors"
 	"math"
 	"time"
 
-	"github.com/pingcap/ticdc/integration/framework"
-	"github.com/pingcap/ticdc/integration/framework/avro"
-	"github.com/pingcap/ticdc/integration/framework/canal"
-	"github.com/pingcap/ticdc/integration/framework/mysql"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework/avro"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework/canal"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework/mysql"
 )
 
 // ManyTypesCase is base impl of test case for different types data

integration/tests/case_simple.go → tests/mq_protocol_tests/cases/case_simple.go

@@ -11,11 +11,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package tests
+package cases
 
 import (
 	"github.com/pingcap/errors"
-	"github.com/pingcap/ticdc/integration/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
 )
 
 // SimpleCase is base impl of simple test case

integration/tests/case_unsigned.go → tests/mq_protocol_tests/cases/case_unsigned.go

@@ -11,10 +11,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package tests
+package cases
 
 import (
-	"github.com/pingcap/ticdc/integration/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
 )
 
 // UnsignedCase is base impl of test case for unsigned int type data

integration/framework/avro/kafka_docker_env.go → tests/mq_protocol_tests/framework/avro/kafka_docker_env.go

@@ -22,7 +22,7 @@ import (
 	"github.com/integralist/go-findroot/find"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/ticdc/integration/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
 	"go.uber.org/zap"
 )
 

integration/framework/avro/kafka_docker_env_test.go → tests/mq_protocol_tests/framework/avro/kafka_docker_env_test.go

@@ -18,7 +18,7 @@ import (
 	"testing"
 
 	"github.com/pingcap/log"
-	"github.com/pingcap/ticdc/integration/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
 	"github.com/stretchr/testify/require"
 )
 

integration/framework/avro/kafka_single_table.go → tests/mq_protocol_tests/framework/avro/kafka_single_table.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/ticdc/integration/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
 	"go.uber.org/zap"
 )
 

integration/framework/avro/kafka_single_table_test.go → tests/mq_protocol_tests/framework/avro/kafka_single_table_test.go

@@ -17,7 +17,7 @@ import (
 	"database/sql"
 	"testing"
 
-	"github.com/pingcap/ticdc/integration/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
 	"github.com/stretchr/testify/require"
 )
 

integration/framework/canal/kafka_docker_env.go → tests/mq_protocol_tests/framework/canal/kafka_docker_env.go

@@ -21,7 +21,7 @@ import (
 	"github.com/integralist/go-findroot/find"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/ticdc/integration/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
 	"go.uber.org/zap"
 )
 

integration/framework/canal/kafka_docker_env_test.go → tests/mq_protocol_tests/framework/canal/kafka_docker_env_test.go

@@ -18,7 +18,7 @@ import (
 	"testing"
 
 	"github.com/pingcap/log"
-	"github.com/pingcap/ticdc/integration/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
 	"github.com/stretchr/testify/require"
 )
 

integration/framework/canal/kafka_single_table.go → tests/mq_protocol_tests/framework/canal/kafka_single_table.go

@@ -18,7 +18,7 @@ import (
 	"time"
 
 	"github.com/pingcap/log"
-	"github.com/pingcap/ticdc/integration/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
 )
 
 const (

integration/framework/canal/kafka_single_table_test.go → tests/mq_protocol_tests/framework/canal/kafka_single_table_test.go

@@ -17,7 +17,7 @@ import (
 	"database/sql"
 	"testing"
 
-	"github.com/pingcap/ticdc/integration/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
 	"github.com/stretchr/testify/require"
 )
 

integration/framework/mysql/docker_env.go → tests/mq_protocol_tests/framework/mysql/docker_env.go

@@ -19,7 +19,7 @@ import (
 	"github.com/integralist/go-findroot/find"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/pingcap/ticdc/integration/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
 	"go.uber.org/zap"
 )
 

integration/framework/mysql/docker_env_test.go → tests/mq_protocol_tests/framework/mysql/docker_env_test.go

@@ -18,7 +18,7 @@ import (
 	"testing"
 
 	"github.com/pingcap/log"
-	"github.com/pingcap/ticdc/integration/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
 	"github.com/stretchr/testify/require"
 )
 

integration/framework/mysql/single_table.go → tests/mq_protocol_tests/framework/mysql/single_table.go

@@ -18,7 +18,7 @@ import (
 	"time"
 
 	"github.com/pingcap/log"
-	"github.com/pingcap/ticdc/integration/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
 )
 
 const (

integration/framework/mysql/single_table_test.go → tests/mq_protocol_tests/framework/mysql/single_table_test.go

@@ -17,7 +17,7 @@ import (
 	"database/sql"
 	"testing"
 
-	"github.com/pingcap/ticdc/integration/framework"
+	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
 	"github.com/stretchr/testify/require"
 )