fix: resolve conflict

scchy · Mar 18, 2021 · 584359a · 584359a
1 parent bf28507
commit 584359a
Show file tree

Hide file tree

Showing 524 changed files with 13,850 additions and 13,653 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -36,10 +36,9 @@ build:
  artifacts:
  expire_in: 4h
  paths:
- - build/bin/rtidb
+ - build/bin/fedb
  - build/bin/sql_sdk_test
  - build/bin/sql_cluster_test
- - build/bin/tablet_engine_test
  - build/src/sdk/libsql_jsdk.so
  - build/sql_pysdk/dist/*.whl
  - build/python/dist/*.whl
@@ -55,7 +54,7 @@ daily_build:
  artifacts:
  expire_in: 4h
  paths:
- - build/bin/rtidb
+ - build/bin/fedb
  - build/src/sdk/libsql_jsdk.so
  - build/sql_pysdk/dist/*.whl
  - build/python/dist/*.whl
@@ -65,17 +64,17 @@ daily_build:
 
 # mac_build:
 # variables:
-# CICD_RUNNER_TAG: "rtidb_mac"
+# CICD_RUNNER_TAG: "fedb_mac"
 # tags:
-# - rtidb_mac
+# - fedb_mac
 # stage: build
 # script:
 # - bash steps/simple_compile_mac.sh
-# - mv build/bin/rtidb build/bin/rtidb_mac
+# - mv build/bin/fedb build/bin/fedb_mac
 # artifacts:
 # expire_in: 4h
 # paths:
-# - build/bin/rtidb_mac
+# - build/bin/fedb_mac
 # - build/src/sdk/libsql_jsdk.dylib
 # - build/sql_pysdk/dist/*.whl
 # only:
@@ -91,11 +90,6 @@ fesql_auto_test_level_0:
  - ln -sf /depends/thirdparty thirdparty
  - ln -sf /depends/thirdsrc thirdsrc
  - source /root/.bashrc && LD_LIBRARY_PATH=/depends/thirdparty/lib:$LD_LIBRARY_PATH bash steps/fesql_auto_test.sh "0"
- after_script:
- - tar czf $CI_COMMIT_SHA src/sdk/java/fesql-auto-test-java/target/allure-results
- - bash steps/upload-nexus.sh $CI_COMMIT_SHA
- - curl -s "http://auto.4paradigm.com/job/fesql-test-report/buildWithParameters?token=gitlab&pkg=$CI_COMMIT_SHA&allure_path=src/sdk/java/feql-auto-test-java/target/allure-results&buildname=$CI_PIPELINE_ID"-"$CI_JOB_ID"
- - bash steps/get-report-url.sh rtidb-test-report $CI_PIPELINE_ID"-"$CI_JOB_ID
  artifacts:
  reports:
  junit:
@@ -118,11 +112,6 @@ fesql_auto_test_level_cluster_0:
  - ln -sf /depends/thirdparty thirdparty
  - ln -sf /depends/thirdsrc thirdsrc
  - source /root/.bashrc && LD_LIBRARY_PATH=/depends/thirdparty/lib:$LD_LIBRARY_PATH bash steps/fesql_auto_test_cluster.sh "0"
- after_script:
- - tar czf $CI_COMMIT_SHA src/sdk/java/fesql-auto-test-java/target/allure-results
- - bash steps/upload-nexus.sh $CI_COMMIT_SHA
- - curl -s "http://auto.4paradigm.com/job/fesql-test-report/buildWithParameters?token=gitlab&pkg=$CI_COMMIT_SHA&allure_path=src/sdk/java/feql-auto-test-java/target/allure-results&buildname=$CI_PIPELINE_ID"-"$CI_JOB_ID"
- - bash steps/get-report-url.sh rtidb-test-report $CI_PIPELINE_ID"-"$CI_JOB_ID
  artifacts:
  reports:
  junit:
@@ -136,22 +125,6 @@ fesql_auto_test_level_cluster_0:
  dependencies:
  - build
 
-fesql_sdk_c++_tablet_engine_test_level_0:
- stage: quick
- script:
- - ln -sf /depends/thirdparty thirdparty
- - ln -sf /depends/thirdsrc thirdsrc
- - source /root/.bashrc && LD_LIBRARY_PATH=/depends/thirdparty/lib:$LD_LIBRARY_PATH bash steps/fesql_c_ut.sh 0 tablet_engine_test
- artifacts:
- reports:
- junit:
- - reports/*.xml
- dependencies:
- - build
- except:
- variables:
- - $ENV_BUILD == "daily"
-
 fesql_sdk_c++_sql_cluster_test_level_0:
  stage: quick
  script:
@@ -193,11 +166,6 @@ fesql_auto_test_level_1+:
  - ln -sf /depends/thirdparty thirdparty
  - ln -sf /depends/thirdsrc thirdsrc
  - source /root/.bashrc && LD_LIBRARY_PATH=/depends/thirdparty/lib:$LD_LIBRARY_PATH bash steps/fesql_auto_test.sh "1,2,3,4,5"
- after_script:
- - tar czf $CI_COMMIT_SHA src/sdk/java/fesql-auto-test-java/target/allure-results
- - bash steps/upload-nexus.sh $CI_COMMIT_SHA
- - curl -s "http://auto.4paradigm.com/job/fesql-test-report/buildWithParameters?token=gitlab&pkg=$CI_COMMIT_SHA&allure_path=src/sdk/java/feql-auto-test-java/target/allure-results&buildname=$CI_PIPELINE_ID"-"$CI_JOB_ID"
- - bash steps/get-report-url.sh rtidb-test-report $CI_PIPELINE_ID"-"$CI_JOB_ID
  artifacts:
  reports:
  junit:
@@ -220,11 +188,6 @@ fesql_auto_test_level_cluster_1+:
  - ln -sf /depends/thirdparty thirdparty
  - ln -sf /depends/thirdsrc thirdsrc
  - source /root/.bashrc && LD_LIBRARY_PATH=/depends/thirdparty/lib:$LD_LIBRARY_PATH bash steps/fesql_auto_test_cluster.sh "1,2,3,4,5"
- after_script:
- - tar czf $CI_COMMIT_SHA src/sdk/java/fesql-auto-test-java/target/allure-results
- - bash steps/upload-nexus.sh $CI_COMMIT_SHA
- - curl -s "http://auto.4paradigm.com/job/fesql-test-report/buildWithParameters?token=gitlab&pkg=$CI_COMMIT_SHA&allure_path=src/sdk/java/feql-auto-test-java/target/allure-results&buildname=$CI_PIPELINE_ID"-"$CI_JOB_ID"
- - bash steps/get-report-url.sh rtidb-test-report $CI_PIPELINE_ID"-"$CI_JOB_ID
  artifacts:
  reports:
  junit:
@@ -257,10 +220,10 @@ fesql_sdk_c++_level_1+:
 c++_ut:
  stage: quick
  script:
- - source /root/.bashrc && sh tools/install_fesql.sh
  - ln -sf /depends/thirdparty thirdparty
  - ln -sf /depends/thirdsrc thirdsrc
- - source /root/.bashrc && bash steps/compile.sh
+ - source /root/.bashrc && sh tools/install_fesql.sh
+ - source /root/.bashrc && cd build && cmake -DSQL_PYSDK_ENABLE=OFF -DSQL_JAVASDK_ENABLE=OFF .. && make -j5 && cd ../
  - source /root/.bashrc && LD_LIBRARY_PATH=/depends/thirdparty/lib:$LD_LIBRARY_PATH bash steps/ut.sh
  artifacts:
  reports:
@@ -292,7 +255,7 @@ fesql_auto_test_python:
  - build
 
 fesql_test_python:
- stage: slow
+ stage: quick
  before_script:
  - mkdir /rambuild
  - mount -t tmpfs -o size=3G tmpfs /rambuild
@@ -320,7 +283,7 @@ tablet_one_demension:
  - ln -sf /depends/thirdsrc thirdsrc
  - sed -i 's/log_level\ =\ debug/log_level\ =\ info/g' test-common/integrationtest/conf/test.conf
  - source /root/.bashrc && source /opt/rh/python27/enable && sh steps/integration_test_on_ramdir.sh 0 "test" "ns_client"
- - cp -r /rambuild/rtidb/test-output/integrationtest/test-reports ./
+ - cp -r /rambuild/fedb/test-output/integrationtest/test-reports ./
  artifacts:
  reports:
  junit:
@@ -341,7 +304,7 @@ tablet_multi_demension:
  - ln -sf /depends/thirdsrc thirdsrc
  - sed -i 's/log_level\ =\ debug/log_level\ =\ info/g' test-common/integrationtest/conf/test.conf
  - source /root/.bashrc && source /opt/rh/python27/enable && sh steps/integration_test_on_ramdir.sh 1 "test" "ns_client"
- - cp -r /rambuild/rtidb/test-output/integrationtest/test-reports ./
+ - cp -r /rambuild/fedb/test-output/integrationtest/test-reports ./
  artifacts:
  reports:
  junit:
@@ -362,7 +325,7 @@ ns_one_demension:
  - ln -sf /depends/thirdsrc thirdsrc
  - sed -i 's/log_level\ =\ debug/log_level\ =\ info/g' test-common/integrationtest/conf/test.conf
  - source /root/.bashrc && source /opt/rh/python27/enable && sh steps/integration_test_on_ramdir.sh 0 "ns_client" "disk"
- - cp -r /rambuild/rtidb/test-output/integrationtest/test-reports ./
+ - cp -r /rambuild/fedb/test-output/integrationtest/test-reports ./
  artifacts:
  reports:
  junit:
@@ -382,7 +345,7 @@ ns_multi_demension:
  - ln -sf /depends/thirdparty thirdparty
  - ln -sf /depends/thirdsrc thirdsrc
  - source /root/.bashrc && source /opt/rh/python27/enable && sh steps/integration_test_on_ramdir.sh 1 "ns_client" "disk"
- - cp -r /rambuild/rtidb/test-output/integrationtest/test-reports ./
+ - cp -r /rambuild/fedb/test-output/integrationtest/test-reports ./
  artifacts:
  reports:
  junit:
@@ -406,40 +369,6 @@ deploy-fedb:
  variables:
  - $ENV_BUILD == "daily"
 
-deploy-package:
- stage: deploy
- script:
- - source /root/.bashrc && sh tools/install_fesql.sh
- - ln -sf /depends/thirdparty thirdparty
- - ln -sf /depends/thirdsrc thirdsrc
- - source /root/.bashrc && bash steps/deploy_package.sh
- only:
- - tags
- except:
- variables:
- - $ENV_BUILD == "daily"
- dependencies: []
-
-docker-image:
- stage: deploy
- script:
- - source /root/.bashrc && sh tools/install_fesql.sh
- - ln -sf /depends/thirdparty thirdparty
- - ln -sf /depends/thirdsrc thirdsrc
- - sh docker/copy_file.sh
- - make blob_proxy
- - bash docker/push_meta.sh
- only:
- - tags
- - develop
- - release/*
- - feat/335-fix-blob-proxy-startup-script-in-docker
- except:
- variables:
- - $ENV_BUILD == "daily"
- dependencies:
- - build
-
 fesql_auto_gen_case:
  stage: slow
  before_script:
@@ -448,12 +377,7 @@ fesql_auto_gen_case:
  script:
  - ln -sf /depends/thirdparty thirdparty
  - ln -sf /depends/thirdsrc thirdsrc
- - source /root/.bashrc && LD_LIBRARY_PATH=/depends/thirdparty/lib:$LD_LIBRARY_PATH bash steps/fesql_auto_gen_test_by_rtidb.sh
- after_script:
- - tar czf $CI_COMMIT_SHA src/sdk/java/fesql-auto-test-java/target/allure-results
- - bash steps/upload-nexus.sh $CI_COMMIT_SHA
- - curl -s "http://auto.4paradigm.com/job/fesql-test-report/buildWithParameters?token=gitlab&pkg=$CI_COMMIT_SHA&allure_path=src/sdk/java/feql-auto-test-java/target/allure-results&buildname=$CI_PIPELINE_ID"-"$CI_JOB_ID"
- - bash steps/get-report-url.sh rtidb-test-report $CI_PIPELINE_ID"-"$CI_JOB_ID
+ - source /root/.bashrc && LD_LIBRARY_PATH=/depends/thirdparty/lib:$LD_LIBRARY_PATH bash steps/fesql_auto_gen_test_by_fedb.sh
  artifacts:
  reports:
  junit:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,11 +25,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "")
  set(CMAKE_BUILD_TYPE RelWithDebInfo)
 endif ()
 message (STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
-set(RTIDB_VERSION_MAJOR 1)
-set(RTIDB_VERSION_MEDIUM 6)
-set(RTIDB_VERSION_MINOR 2)
-set(RTIDB_VERSION_BUG 0)
-set(RTIDB_COMMIT_ID 0)
+set(FEDB_VERSION_MAJOR 2)
+set(FEDB_VERSION_MEDIUM 1)
+set(FEDB_VERSION_MINOR 0)
+set(FEDB_COMMIT_ID 0)
 set(FESQL_COMMIT_ID 0)
 
 function(get_commitid CODE_DIR COMMIT_ID)
@@ -45,9 +44,9 @@ function(get_commitid CODE_DIR COMMIT_ID)
  set("${COMMIT_ID}" ${COMMIT_ID_TMP} PARENT_SCOPE)
 endfunction()
 
-get_commitid(${PROJECT_SOURCE_DIR} RTIDB_COMMIT_ID)
+get_commitid(${PROJECT_SOURCE_DIR} FEDB_COMMIT_ID)
 get_commitid(${PROJECT_SOURCE_DIR}/fesql FESQL_COMMIT_ID)
-message(STATUS "COMMIT_ID : ${RTIDB_COMMIT_ID}.${FESQL_COMMIT_ID}")
+message(STATUS "COMMIT_ID : ${FEDB_COMMIT_ID}.${FESQL_COMMIT_ID}")
 configure_file (
  "${PROJECT_SOURCE_DIR}/src/version.h.in"
  "${PROJECT_SOURCE_DIR}/src/version.h"