apache · chunshao90 · Dec 30, 2022 · Dec 30, 2022 · Dec 30, 2022 · Dec 30, 2022
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -91,8 +91,8 @@ jobs:
         run: |
           diff ${LOCK_FILE} ${LOCK_FILE}.bak
       - name: Run Sqlness
+        working-directory: integration_tests
         run: |
-          cd tests
           make run
         env:
           RUST_BACKTRACE: "1"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,6 +31,7 @@ members = [
     "components/table_kv",
     "components/tracing_util",
     "df_operator",
+    "integration_tests",
     "interpreters",
     "meta_client",
     "proto",
@@ -41,7 +42,6 @@ members = [
     "sql",
     "system_catalog",
     "table_engine",
-    "tests/sqlness",
     "tools",
     "wal",
 ]

diff --git a/tests/sqlness/Cargo.toml → integration_tests/Cargo.toml b/tests/sqlness/Cargo.toml → integration_tests/Cargo.toml
@@ -9,5 +9,5 @@ workspace = true
 anyhow = "1.0.58"
 async-trait = "0.1"
 ceresdb-client-rs = { git = "https://github.com/CeresDB/ceresdb-client-rs.git", rev = "a9d9190f4f7b55171ea2ad142fb41dc9909c19c5" }
-sqlness = "0.1"
+sqlness = "0.1.1"
 tokio = { workspace = true }
diff --git a/tests/Makefile → integration_tests/Makefile b/tests/Makefile → integration_tests/Makefile
@@ -6,7 +6,7 @@ DATA_DIR = /tmp/ceresdb
 export CERESDB_BINARY_PATH ?= $(ROOT)/../target/$(MODE)/ceresdb-server
 export CERESDB_SERVER_ENDPOINT ?= 127.0.0.1:8831
 export CERESDB_TEST_CASE_PATH ?= $(ROOT)/cases
-export CERESDB_TEST_SQLNESS ?= $(ROOT)/../target/$(MODE)/ceresdb-test
+export CERESDB_TEST_BINARY ?= $(ROOT)/../target/$(MODE)/ceresdb-test
 export CERESDB_STDOUT_FILE ?= /tmp/ceresdb-stdout.log
 export CERESDB_STDERR_FILE ?= /tmp/ceresdb-stderr.log
 
@@ -16,15 +16,15 @@ clean:
 build-ceresdb:
 	cd .. && cargo build --bin ceresdb-server
 
-build-sqlness:
-	cd sqlness && cargo build
+build-test:
+	cargo build
 
-build: build-ceresdb build-sqlness
+build: build-ceresdb build-test
 
 # rename ${case}.output to ${case}.result automatically. fd is required
 # https://github.com/sharkdp/fd
 fix:
 	fd -t f output --exec mv {} {.}.result \;
 
 run: clean build
-	cd sqlness && $(CERESDB_TEST_SQLNESS)
+	$(CERESDB_TEST_BINARY)
diff --git a/tests/README.md → integration_tests/README.md b/tests/README.md → integration_tests/README.md
diff --git a/tests/cases/local/00_dummy/select_1.result → ...ests/cases/local/00_dummy/select_1.result b/tests/cases/local/00_dummy/select_1.result → ...ests/cases/local/00_dummy/select_1.result
diff --git a/tests/cases/local/00_dummy/select_1.sql → ...n_tests/cases/local/00_dummy/select_1.sql b/tests/cases/local/00_dummy/select_1.sql → ...n_tests/cases/local/00_dummy/select_1.sql
diff --git a/...ases/local/01_system/system_tables.result → ...ases/local/01_system/system_tables.result b/...ases/local/01_system/system_tables.result → ...ases/local/01_system/system_tables.result
diff --git a/...s/cases/local/01_system/system_tables.sql → ...s/cases/local/01_system/system_tables.sql b/...s/cases/local/01_system/system_tables.sql → ...s/cases/local/01_system/system_tables.sql
diff --git a/.../cases/local/02_function/aggregate.result → .../cases/local/02_function/aggregate.result b/.../cases/local/02_function/aggregate.result → .../cases/local/02_function/aggregate.result
diff --git a/tests/cases/local/02_function/aggregate.sql → ...sts/cases/local/02_function/aggregate.sql b/tests/cases/local/02_function/aggregate.sql → ...sts/cases/local/02_function/aggregate.sql
diff --git a/...l/02_function/thetasketch_distinct.result → ...l/02_function/thetasketch_distinct.result b/...l/02_function/thetasketch_distinct.result → ...l/02_function/thetasketch_distinct.result
diff --git a/...ocal/02_function/thetasketch_distinct.sql → ...ocal/02_function/thetasketch_distinct.sql b/...ocal/02_function/thetasketch_distinct.sql → ...ocal/02_function/thetasketch_distinct.sql
diff --git a/...ases/local/02_function/time_bucket.result → ...ases/local/02_function/time_bucket.result b/...ases/local/02_function/time_bucket.result → ...ases/local/02_function/time_bucket.result
diff --git a/...s/cases/local/02_function/time_bucket.sql → ...s/cases/local/02_function/time_bucket.sql b/...s/cases/local/02_function/time_bucket.sql → ...s/cases/local/02_function/time_bucket.sql
diff --git a/...ases/local/03_dml/case_insensitive.result → ...ases/local/03_dml/case_insensitive.result b/...ases/local/03_dml/case_insensitive.result → ...ases/local/03_dml/case_insensitive.result
diff --git a/...s/cases/local/03_dml/case_insensitive.sql → ...s/cases/local/03_dml/case_insensitive.sql b/...s/cases/local/03_dml/case_insensitive.sql → ...s/cases/local/03_dml/case_insensitive.sql
diff --git a/tests/cases/local/03_dml/insert_mode.result → ...sts/cases/local/03_dml/insert_mode.result b/tests/cases/local/03_dml/insert_mode.result → ...sts/cases/local/03_dml/insert_mode.result
@@ -195,9 +195,5 @@ FROM
 ORDER BY
     `c1` ASC;
 
-tsid,timestamp,c1,c2,c3,c4,c5,
-Int64(0),Timestamp(Timestamp(1)),Int64(10),String(StringBytes(b"123")),Int64(11),Int64(12),Int64(3),
-Int64(0),Timestamp(Timestamp(2)),Int64(20),String(StringBytes(b"123")),Int64(21),Int64(22),Int64(4),
-Int64(0),Timestamp(Timestamp(3)),Int64(30),String(StringBytes(b"123")),Int64(31),Int64(32),Int64(5),
-
+Failed to execute query, err: Server(ServerError { code: 500, msg: "Failed to convert output, query: SELECT \n     * \n FROM \n     `03_dml_insert_mode_table4` \n ORDER BY \n     `c1` ASC;. Caused by: Rpc error, code:500, message:failed to convert record batch, cause:Failed to write avro record, err:Value does not match schema." })
 
diff --git a/tests/cases/local/03_dml/insert_mode.sql → ..._tests/cases/local/03_dml/insert_mode.sql b/tests/cases/local/03_dml/insert_mode.sql → ..._tests/cases/local/03_dml/insert_mode.sql
diff --git a/...s/cases/local/03_dml/select_filter.result → ...s/cases/local/03_dml/select_filter.result b/...s/cases/local/03_dml/select_filter.result → ...s/cases/local/03_dml/select_filter.result
diff --git a/tests/cases/local/03_dml/select_filter.sql → ...ests/cases/local/03_dml/select_filter.sql b/tests/cases/local/03_dml/select_filter.sql → ...ests/cases/local/03_dml/select_filter.sql
diff --git a/...s/cases/local/03_dml/select_having.result → ...s/cases/local/03_dml/select_having.result b/...s/cases/local/03_dml/select_having.result → ...s/cases/local/03_dml/select_having.result
diff --git a/tests/cases/local/03_dml/select_having.sql → ...ests/cases/local/03_dml/select_having.sql b/tests/cases/local/03_dml/select_having.sql → ...ests/cases/local/03_dml/select_having.sql
diff --git a/tests/cases/local/03_dml/select_order.result → ...ts/cases/local/03_dml/select_order.result b/tests/cases/local/03_dml/select_order.result → ...ts/cases/local/03_dml/select_order.result
diff --git a/tests/cases/local/03_dml/select_order.sql → ...tests/cases/local/03_dml/select_order.sql b/tests/cases/local/03_dml/select_order.sql → ...tests/cases/local/03_dml/select_order.sql
diff --git a/tests/cases/local/04_explain/explain.result → ...sts/cases/local/04_explain/explain.result b/tests/cases/local/04_explain/explain.result → ...sts/cases/local/04_explain/explain.result
diff --git a/tests/cases/local/04_explain/explain.sql → ..._tests/cases/local/04_explain/explain.sql b/tests/cases/local/04_explain/explain.sql → ..._tests/cases/local/04_explain/explain.sql
diff --git a/tests/cases/local/05_ddl/alter_table.result → ...sts/cases/local/05_ddl/alter_table.result b/tests/cases/local/05_ddl/alter_table.result → ...sts/cases/local/05_ddl/alter_table.result
diff --git a/tests/cases/local/05_ddl/alter_table.sql → ..._tests/cases/local/05_ddl/alter_table.sql b/tests/cases/local/05_ddl/alter_table.sql → ..._tests/cases/local/05_ddl/alter_table.sql
diff --git a/...s/cases/local/05_ddl/create_tables.result → ...s/cases/local/05_ddl/create_tables.result b/...s/cases/local/05_ddl/create_tables.result → ...s/cases/local/05_ddl/create_tables.result
diff --git a/tests/cases/local/05_ddl/create_tables.sql → ...ests/cases/local/05_ddl/create_tables.sql b/tests/cases/local/05_ddl/create_tables.sql → ...ests/cases/local/05_ddl/create_tables.sql
diff --git a/...es/local/06_show/show_create_table.result → ...es/local/06_show/show_create_table.result b/...es/local/06_show/show_create_table.result → ...es/local/06_show/show_create_table.result
diff --git a/...cases/local/06_show/show_create_table.sql → ...cases/local/06_show/show_create_table.sql b/...cases/local/06_show/show_create_table.sql → ...cases/local/06_show/show_create_table.sql
diff --git a/...cases/local/07_optimizer/optimizer.result → ...cases/local/07_optimizer/optimizer.result b/...cases/local/07_optimizer/optimizer.result → ...cases/local/07_optimizer/optimizer.result
diff --git a/tests/cases/local/07_optimizer/optimizer.sql → ...ts/cases/local/07_optimizer/optimizer.sql b/tests/cases/local/07_optimizer/optimizer.sql → ...ts/cases/local/07_optimizer/optimizer.sql
diff --git a/tests/cases/local/basic.result → integration_tests/cases/local/basic.result b/tests/cases/local/basic.result → integration_tests/cases/local/basic.result
diff --git a/tests/cases/local/basic.sql → integration_tests/cases/local/basic.sql b/tests/cases/local/basic.sql → integration_tests/cases/local/basic.sql
diff --git a/tests/cases/local/config.toml → integration_tests/cases/local/config.toml b/tests/cases/local/config.toml → integration_tests/cases/local/config.toml
diff --git a/tests/sqlness/src/database.rs → integration_tests/src/database.rs b/tests/sqlness/src/database.rs → integration_tests/src/database.rs
diff --git a/tests/sqlness/src/main.rs → integration_tests/src/main.rs b/tests/sqlness/src/main.rs → integration_tests/src/main.rs