Skip to content

Commit

Permalink
[]
Browse files Browse the repository at this point in the history
  • Loading branch information
liuqiyuan committed Jan 25, 2024
1 parent 8b7f625 commit 3f3b7ec
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
4 changes: 2 additions & 2 deletions cases/integration_test/expression/test_type.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ cases:
- [true,30,30,30,30.0,30.0,30,"30"]
3:
rows:
- [true,30,30,30,30.0,30.0,30,"30.0"]
- [true,30,30,30,30.0,30.0,30,"30"]
4:
rows:
- [true,30,30,30,30.0,30.0,30,"30.0"]
- [true,30,30,30,30.0,30.0,30,"30"]
5:
rows:
- [false,0,0,0,0.0,0.0,0,"false"]
Expand Down
2 changes: 1 addition & 1 deletion test/steps/build-java-sdk.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

ROOT_DIR=$(pwd)
cd java || exit
mvn clean install -Dmaven.test.skip=true -Dgpg.skip
mvn clean install -B -Dmaven.test.skip=true -Dgpg.skip
#mvn clean install -DskipTests=true -Dscalatest.skip=true -Dwagon.skip=true -Dmaven.test.skip=true -Dgpg.skip
cd "${ROOT_DIR}" || exit
17 changes: 9 additions & 8 deletions test/steps/openmldb-integration-test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,17 @@ fi

JAVA_SDK_VERSION=$(more java/pom.xml | grep "<version>.*</version>" | head -1 | sed 's#.*<version>\(.*\)</version>.*#\1#')

Check warning on line 43 in test/steps/openmldb-integration-test.sh

View workflow job for this annotation

GitHub Actions / shellcheck 

[shellcheck] reported by reviewdog 🐶
JAVA_SDK_VERSION appears unused. Verify use (or export if used externally). [SC2034](https://github.com/koalaman/shellcheck/wiki/SC2034)

Raw Output:
./test/steps/openmldb-integration-test.sh:43:1:warning:JAVA_SDK_VERSION appears unused. Verify use (or export if used externally). [SC2034](https://github.com/koalaman/shellcheck/wiki/SC2034)
sh test/steps/modify_java_sdk_config.sh "${CASE_XML}" "${DEPLOY_MODE}" "${JAR_VERSION}" "" "${JAR_VERSION}" "${JAR_VERSION}" "${TABLE_STORAGE_MODE}"
mkdir -p mvnrepo
export MAVEN_OPTS="-Dmaven.repo.local=$(pwd)/mvnrepo"
mvn install:install-file -Dfile=openmldb-batch.jar -DartifactId=openmldb-batch -DgroupId=com.4paradigm.openmldb -Dversion=${JAR_VERSION} -Dpackaging=jar
mvn install:install-file -Dfile=openmldb-jdbc.jar -DartifactId=openmldb-jdbc -DgroupId=com.4paradigm.openmldb -Dversion=${JAR_VERSION} -Dpackaging=jar
mvn install:install-file -Dfile=openmldb-native.jar -DartifactId=openmldb-native -DgroupId=com.4paradigm.openmldb -Dversion=${JAR_VERSION} -Dpackaging=jar
mkdir -p ../mvnrepo
export MAVEN_OPTS="-Dmaven.repo.local=$(pwd)/../mvnrepo"

Check warning on line 46 in test/steps/openmldb-integration-test.sh

View workflow job for this annotation

GitHub Actions / shellcheck 

[shellcheck] reported by reviewdog 🐶
Declare and assign separately to avoid masking return values. [SC2155](https://github.com/koalaman/shellcheck/wiki/SC2155)

Raw Output:
./test/steps/openmldb-integration-test.sh:46:8:warning:Declare and assign separately to avoid masking return values. [SC2155](https://github.com/koalaman/shellcheck/wiki/SC2155)
mvn install:install-file -Dfile=openmldb-batch.jar -DartifactId=openmldb-batch -DgroupId=com.4paradigm.openmldb -Dversion="${JAR_VERSION}" -Dpackaging=jar
mvn install:install-file -Dfile=openmldb-jdbc.jar -DartifactId=openmldb-jdbc -DgroupId=com.4paradigm.openmldb -Dversion="${JAR_VERSION}" -Dpackaging=jar
mvn install:install-file -Dfile=openmldb-native.jar -DartifactId=openmldb-native -DgroupId=com.4paradigm.openmldb -Dversion="${JAR_VERSION}" -Dpackaging=jar
mvn install:install-file -Dfile=openmldb-spark-connector.jar -DartifactId=openmldb-spark-connector -DgroupId=com.4paradigm.openmldb -Dversion="${JAR_VERSION}" -Dpackaging=jar

mvn clean install -B -Dmaven.test.skip=true -f test/test-tool/command-tool/pom.xml
mvn clean install -B -Dmaven.test.skip=true -f test/integration-test/openmldb-test-java/pom.xml -Dopenmldb.native.version=${JAR_VERSION} -Dopenmldb.jdbc.version=${JAR_VERSION} -Dopenmldb.batch.version=${JAR_VERSION}
mvn clean install -B -Dmaven.test.skip=true -f test/integration-test/openmldb-test-java/pom.xml -Dopenmldb.native.version="${JAR_VERSION}" -Dopenmldb.jdbc.version="${JAR_VERSION}" -Dopenmldb.batch.version="${JAR_VERSION}"
if [[ "${EXECUTE_MODE}" == "javasdk" ]]; then
mvn clean test -B -e -U -DsuiteXmlFile=test_suite/"${CASE_XML}" -f test/integration-test/openmldb-test-java/openmldb-sdk-test/pom.xml -DcaseLevel="${CASE_LEVEL}" -Dopenmldb.native.version=${JAR_VERSION} -Dopenmldb.jdbc.version=${JAR_VERSION} -Dopenmldb.batch.version=${JAR_VERSION}
mvn clean test -B -e -U -DsuiteXmlFile=test_suite/"${CASE_XML}" -f test/integration-test/openmldb-test-java/openmldb-sdk-test/pom.xml -DcaseLevel="${CASE_LEVEL}" -Dopenmldb.native.version="${JAR_VERSION}" -Dopenmldb.jdbc.version="${JAR_VERSION}" -Dopenmldb.batch.version="${JAR_VERSION}"
elif [[ "${EXECUTE_MODE}" == "apiserver" ]]; then
mvn clean test -B -e -U -DsuiteXmlFile=test_suite/"${CASE_XML}" -f test/integration-test/openmldb-test-java/openmldb-http-test/pom.xml -DcaseLevel="${CASE_LEVEL}" -Dopenmldb.native.version=${JAR_VERSION} -Dopenmldb.jdbc.version=${JAR_VERSION} -Dopenmldb.batch.version=${JAR_VERSION}
mvn clean test -B -e -U -DsuiteXmlFile=test_suite/"${CASE_XML}" -f test/integration-test/openmldb-test-java/openmldb-http-test/pom.xml -DcaseLevel="${CASE_LEVEL}" -Dopenmldb.native.version="${JAR_VERSION}" -Dopenmldb.jdbc.version="${JAR_VERSION}" -Dopenmldb.batch.version="${JAR_VERSION}"
fi

0 comments on commit 3f3b7ec

Please sign in to comment.