feat:调整pg插件的代码结构

Author: chuntaojun

.github/workflows/integration.yaml

@@ -59,6 +59,21 @@ jobs:
             goos: linux
 
     runs-on: ${{ matrix.os }}
+    services:
+      # Label used to access the service container
+      redis:
+        # Docker Hub image
+        image: redis
+        # Set health checks to wait until redis has started
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps port 6379 on service container to the host
+          - 6379:6379
+      # TODO 拉起一个PG docker 实例
     steps:
       # Setup the environment.
       - name: Setup Go
@@ -74,44 +89,61 @@ jobs:
         env:
           GOOS: ${{ matrix.goos }}
           GOARCH: ${{ matrix.goarch }}
-        run: make build
+        run: make build STORE_PG_PLUGIN_VERSION= POLARIS_SERVER_VERSION=v1.17.2
 
       # Run interface tests
       - name: run tests
         run: |
-        #   work_dir=$(ls | grep polaris-server-release | sed -n '1p')
-        #   echo "work_dir is $work_dir"
-        #   cd $work_dir
+          export STORE_MODE=sqldb
+          echo "cur STORE MODE=${STORE_MODE}"
+  
+          # # 设置严格模式
+          # mysql -h127.0.0.1 -P3306 -uroot -p"polaris" -e "set sql_mode='STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'";
+          # # 清空数据
+          # mysql -h127.0.0.1 -P3306 -uroot -p"polaris" -e "DROP DATABASE IF EXISTS polaris_server";
+          # # 初始化 polaris 数据库
+          # mysql -h127.0.0.1 -P3306 -uroot -p"polaris" < store/mysql/scripts/polaris_server.sql
+          # # 临时放开 DB 的最大连接数
+          # mysql -h127.0.0.1 -P3306 -uroot -p"polaris" -e "set GLOBAL max_connections = 3000;"
+  
 
-        #   ls -alR
-
-        #   if [[ "$(uname)" == "Darwin" ]]; then
-        #       # Mac OS X 操作系统
-        #       echo "Run on MacOS"
-        #       # sed -i '' 's/consoleOpen: true/consoleOpen: false/g' conf/polaris-server.yaml
-        #   else
-        #       # GNU/Linux操作系统
-        #       echo "Run on Linux"
-        #       # sed -i 's/consoleOpen: \(true\|false\)/consoleOpen: false/g' conf/polaris-server.yaml
-        #   fi
-
-        #   chmod +x ./tool/*.sh
-        #   ./tool/start.sh
-
-        #   sleep 120s
-        #   ls -alR
-        #   cat ./log/stdout 2>&1
-
-        #   cd ..
-        #   ls -lstrh
-        #   # 先测试普通的集成测试
-        #   pushd ./test/integrate
-        #   echo "[INTEGRATION TEST] begin"
-        #   curl http://127.0.0.1:8090
-        #   go test -count=1 -v -tags integration
-        #   echo "[INTEGRATION TEST] end"
-        #   popd
-        #   cd $work_dir
-        #   ./tool/stop.sh
-        #   cd ..
+          work_dir="build_resource/polaris/polaris-server-release-xxxx"
+          work_dir=$(ls | grep polaris-server-release | sed -n '1p')
+          echo "work_dir is $work_dir"
+  
+          cp -rf ./test/data/polaris-server.yaml $work_dir/
+  
+          cd $work_dir
+  
+          ls -alR
+  
+          if [[ "$(uname)" == "Darwin" ]]; then
+              # Mac OS X 操作系统
+              echo "Run on MacOS"
+              # sed -i '' 's/consoleOpen: true/consoleOpen: false/g' conf/polaris-server.yaml
+          else
+              # GNU/Linux操作系统
+              echo "Run on Linux"
+              # sed -i 's/consoleOpen: \(true\|false\)/consoleOpen: false/g' conf/polaris-server.yaml
+          fi
+  
+          chmod +x ./tool/*.sh
+          ./tool/start.sh
+  
+          sleep 120s
+          ls -alR
+          cat ./log/stdout 2>&1
+  
+          cd ..
+          ls -lstrh
+          # 先测试普通的集成测试
+          pushd ./test/integrate
+          echo "[INTEGRATION TEST] begin"
+          curl http://127.0.0.1:8090
+          go test -count=1 -v -tags integration -timeout 60m
+          echo "[INTEGRATION TEST] end"
+          popd
+          cd $work_dir
+          ./tool/stop.sh
+          cd ..
 

README.md

@@ -4,12 +4,12 @@
 
 #### 构建
 
-执行构建脚本 `build.sh` 即可
+执行构建脚本 `Makefile` 即可
 
 ```bash
 # ${store_pg_plugin_version}: store-postgresql 插件版本，默认为 main 的最新 commit
 # ${polaris_server_tag}: 北极星服务端版本信息，默认为 main 分支
-make build STORE_PG_PLUGIN_VERSION=${store_pg_plugin_version} POLARIS_SERVER_VERSION=${polaris_server_tag}
+make build STORE_PG_PLUGIN_VERSION=latest POLARIS_SERVER_VERSION=${polaris_server_tag}
 ```
 
 #### 配置文件调整
@@ -34,8 +34,3 @@ store:
       connMaxLifetime: 300 # Unit second
       txIsolationLevel: 2 #LevelReadCommitted
 ```
-
-
-## 其他
-
-- NACOS 中的 struct 数据结构定义大部份引用自 [nacos-sdk-go](https://github.com/nacos-group/nacos-sdk-go)

build.sh

@@ -41,10 +41,11 @@ fi
 cat ../plugin_store_pg.go.temp >plugin_store_pg.go
 
 go clean --modcache
-go get -ugithub.com/polaris-contrib/polaris-store-postgresql@${store_pg_plugin_version}
+go get -u github.com/polaris-contrib/polaris-store-postgresql@${store_pg_plugin_version}
 go mod tidy
 
 make build VERSION=${polaris_server_tag}
 
 release_file=$(ls -lstrh | grep ".zip" | awk '{print $10}' | grep -v "md5")
 cp ${release_file} ${workdir}
+