From 7d97c7348c97505719c5f3fc5567670309cd0827 Mon Sep 17 00:00:00 2001 From: Linlin Sun Date: Tue, 28 Mar 2023 14:49:30 -0700 Subject: [PATCH 1/2] Fix the error caused by separating ion-data-generator from ion-java-benchmark-cli. --- ...n-java-performance-regression-detector.yml | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml index fe19e59f9a..73efb8d9c2 100644 --- a/.github/workflows/ion-java-performance-regression-detector.yml +++ b/.github/workflows/ion-java-performance-regression-detector.yml @@ -3,7 +3,7 @@ name: Ion Java performance regression detector -on: [pull_request] +on: [pull_request, push] jobs: PR-Content-Check: @@ -34,24 +34,34 @@ jobs: uses: actions/checkout@v3 with: repository: amazon-ion/ion-java-benchmark-cli - ref: master + ref: addLogic path: ion-java-benchmark-cli - name: Build ion-java-benchmark-cli run: cd ion-java-benchmark-cli && mvn clean install + - name: Checkout ion-data-generator + uses: actions/checkout@v3 + with: + repository: amazon-ion/ion-data-generator + ref: master + path: ion-data-generator + + - name: Build ion-data-generator + run: cd ion-data-generator && mvn clean install + - name: Check the version of ion-java. run: java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar --version - name: Generate test Ion Data run: | mkdir -p testData - java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/nestedStruct.isl testData/testStructs.10n - java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/nestedList.isl testData/testLists.10n - java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/sexp.isl testData/testSexps.10n - java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/realWorldDataSchema01.isl testData/realWorldData01.10n - java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/realWorldDataSchema02.isl testData/realWorldData02.10n - java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/realWorldDataSchema03.isl testData/realWorldData03.10n + java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/nestedStruct.isl testData/testStructs.10n + java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/nestedList.isl testData/testLists.10n + java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/sexp.isl testData/testSexps.10n + java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/realWorldDataSchema01.isl testData/realWorldData01.10n + java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/realWorldDataSchema02.isl testData/realWorldData02.10n + java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/realWorldDataSchema03.isl testData/realWorldData03.10n - name: Upload test Ion Data to artifacts uses: actions/upload-artifact@v2 From b0320fd3f9992d20da6a05fa4a2d8a630c2dfd11 Mon Sep 17 00:00:00 2001 From: Linlin Sun Date: Tue, 28 Mar 2023 14:59:39 -0700 Subject: [PATCH 2/2] Make minor change to invoke workflow. --- .github/workflows/ion-java-performance-regression-detector.yml | 2 +- src/com/amazon/ion/Decimal.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml index 73efb8d9c2..ab5f399838 100644 --- a/.github/workflows/ion-java-performance-regression-detector.yml +++ b/.github/workflows/ion-java-performance-regression-detector.yml @@ -44,7 +44,7 @@ jobs: uses: actions/checkout@v3 with: repository: amazon-ion/ion-data-generator - ref: master + ref: main path: ion-data-generator - name: Build ion-data-generator diff --git a/src/com/amazon/ion/Decimal.java b/src/com/amazon/ion/Decimal.java index bde45ee1f1..ab66225ceb 100644 --- a/src/com/amazon/ion/Decimal.java +++ b/src/com/amazon/ion/Decimal.java @@ -53,6 +53,7 @@ public class Decimal private static final class NegativeZero extends Decimal { private static final long serialVersionUID = 1L; + //Test the workflow private NegativeZero(int scale) {