fix

Author: andylokandy

.github/workflows/ci.yml

@@ -50,7 +50,10 @@ jobs:
       - name: unit test
         run: make unit-test
 
-  integration-test:
+  # TODO: Integeration test are split into two jobs because APIV2 is not implemented yet,
+  #       so we can't run both tests in the same cluster.
+  #       Once APIV2 is implemented, we can run both tests in the same cluster.
+  raw-integration-test:
     name: integration test
     env:
       CARGO_INCREMENTAL: 0
@@ -70,7 +73,7 @@ jobs:
         run: |
           # use latest stable version
           ~/.tiup/bin/tiup install tikv pd
-          ~/.tiup/bin/tiup playground --mode tikv-slim --kv 3 --without-monitor --kv.config config/tikv.toml --pd.config config/pd.toml &
+          make tiup-v1ttl
           while :; do
             echo "waiting cluster to be ready"
             [[ "$(curl -I http://127.0.0.1:2379/pd/api/v1/regions 2>/dev/null | head -n 1 | cut -d$' ' -f2)" -ne "405" ]] || break
@@ -79,4 +82,35 @@ jobs:
       - name: Install latest nextest release
         uses: taiki-e/install-action@nextest
       - name: integration test
-        run: MULTI_REGION=1 make integration-test
+        run: MULTI_REGION=1 make raw-integration-test
+
+  txn-integration-test:
+    name: integration test
+    env:
+      CARGO_INCREMENTAL: 0
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          version: '3.x'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+      - name: install tiup
+        run: curl --proto '=https' --tlsv1.2 -sSf https://tiup-mirrors.pingcap.com/install.sh | sh
+      - name: start tiup playground
+        run: |
+          # use latest stable version
+          ~/.tiup/bin/tiup install tikv pd
+          make tiup
+          while :; do
+            echo "waiting cluster to be ready"
+            [[ "$(curl -I http://127.0.0.1:2379/pd/api/v1/regions 2>/dev/null | head -n 1 | cut -d$' ' -f2)" -ne "405" ]] || break
+            sleep 1
+          done
+      - name: Install latest nextest release
+        uses: taiki-e/install-action@nextest
+      - name: integration test
+        run: MULTI_REGION=1 make txn-integration-test

Makefile

@@ -22,18 +22,22 @@ check: generate
 unit-test: generate
 	cargo nextest run --all --no-default-features
 
-integration-test: generate
-	cargo test txn_ --all ${INTEGRATION_TEST_ARGS} -- --nocapture
+integration-test-raw: generate
 	cargo test raw_ --all ${INTEGRATION_TEST_ARGS} -- --nocapture
-	cargo test misc_ --all ${INTEGRATION_TEST_ARGS} -- --nocapture
+
+integration-test-txn: generate
+	cargo test txn_ --all ${INTEGRATION_TEST_ARGS} -- --nocapture
 
 test: unit-test integration-test
 
 doc:
 	cargo doc --workspace --exclude tikv-client-proto --document-private-items --no-deps
 
 tiup:
-	tiup playground nightly --mode tikv-slim --kv 3 --without-monitor --kv.config $(shell pwd)/config/tikv.toml --pd.config $(shell pwd)/config/pd.toml &
+	tiup playground nightly --mode tikv-slim --kv 3 --without-monitor --kv.config $(shell pwd)/config/tikv-v1.toml --pd.config $(shell pwd)/config/pd.toml &
+
+tiup-v1ttl:
+	tiup playground nightly --mode tikv-slim --kv 3 --without-monitor --kv.config $(shell pwd)/config/tikv-v1ttl.toml --pd.config $(shell pwd)/config/pd.toml &
 
 all: generate check doc test
 

config/tikv-v1.toml

@@ -0,0 +1,17 @@
+[coprocessor]
+region-max-keys = 10
+region-split-keys = 7
+batch-split-limit = 100
+
+[raftstore]
+region-split-check-diff = "1B"
+pd-heartbeat-tick-interval = "2s"
+pd-store-heartbeat-tick-interval = "5s"
+split-region-check-tick-interval = "1s"
+raft-entry-max-size = "1MB"
+
+[rocksdb]
+max-open-files = 10000
+
+[raftdb]
+max-open-files = 10000

config/tikv.toml renamed to config/tikv-v1ttl.toml

@@ -17,5 +17,4 @@ max-open-files = 10000
 max-open-files = 10000
 
 [storage]
-api-version = 2
 enable-ttl = true

tests/integration_tests.rs

@@ -5,7 +5,6 @@
 //! Test names should begin with one of the following:
 //! 1. txn_
 //! 2. raw_
-//! 3. misc_
 //!
 //! We make use of the convention to control the order of tests in CI, to allow
 //! transactional and raw tests to coexist, since transactional requests have