Merge remote-tracking branch 'origin/candidate-9.2.x'

Signed-off-by: Gordon Smith <[email protected]> # Conflicts: # commons-hpcc/pom.xml # dfsclient/pom.xml # pom.xml # wsclient/pom.xml
hpcc-systems · Jul 20, 2023 · 815b405 · 815b405
2 parents 8532695 + d5ca8cf
commit 815b405
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 20 deletions.
diff --git a/.github/workflows/BuildTestCandidateAndMaster.yml b/.github/workflows/BuildTestCandidateAndMaster.yml
@@ -12,10 +12,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
 
     # speed things up with caching from https://docs.github.com/en/actions/guides/building-and-testing-java-with-maven
     - name: Cache Maven packages

diff --git a/.github/workflows/JAPIPRBuildAction.yml b/.github/workflows/JAPIPRBuildAction.yml
@@ -18,10 +18,11 @@ jobs:
         git config user.name 'hpccsystems development'
         git rebase origin/${{ github.event.pull_request.base.ref }}
         git log --pretty=one -n 15
-    - name: Set up JDK 1.8
+
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
 
     # speed things up with caching from https://docs.github.com/en/actions/guides/building-and-testing-java-with-maven
     - name: Cache Maven packages
@@ -30,6 +31,6 @@ jobs:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-m2
-        
+
     - name: Build with Maven
       run: mvn -B package --file pom.xml
diff --git a/.github/workflows/Nightly.yml b/.github/workflows/Nightly.yml
@@ -3,17 +3,17 @@ name: hpcc4j Nightly
 on:
   schedule:
   - cron: "0 2 * * 1-5"
-  
+
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Build with Maven
       run: mvn -B package --file pom.xml
diff --git a/.github/workflows/httpsUnitTests.yml b/.github/workflows/httpsUnitTests.yml
@@ -14,10 +14,10 @@ jobs:
 
     steps:
 
-    - name: Setup JDK 1.8
+    - name: Setup JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
 
     - name: Install K8s
       uses: balchua/[email protected]
@@ -100,14 +100,19 @@ jobs:
         sudo -- sh -c -e "echo '${{ env.ROWSERVICE_IP }} rowservice.default' >> /etc/hosts";
         sudo -- sh -c -e "echo '${{ env.SQL_TO_ECL_IP }} sql2ecl.default' >> /etc/hosts";
 
+    # Notes:
+    # Using keytool -import -cacerts doesn't work as expected, need to specify the cacerts path explicitly
+    # Path changed between JDK 8 & 11, Command for JDK 8:
+    # sudo keytool -import -keystore $JAVA_HOME/jre/lib/security/cacerts -storepass changeit -noprompt -alias eclwatch-tls -file cert.der
     - name: Trust Certs
       run: |
         openssl s_client -showcerts -connect eclwatch.default:8010 < /dev/null | openssl x509 -outform DER > cert.der
-        sudo keytool -import -keystore $JAVA_HOME/jre/lib/security/cacerts -storepass changeit -noprompt -alias eclwatch-tls -file cert.der
+        sudo keytool -import -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit -noprompt -alias eclwatch-tls -file cert.der
         openssl s_client -showcerts -connect rowservice.default:7600 < /dev/null | openssl x509 -outform DER > cert.der
-        sudo keytool -import -keystore $JAVA_HOME/jre/lib/security/cacerts -storepass changeit -noprompt -alias dafilesrv-tls -file cert.der
+        sudo keytool -import -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit -noprompt -alias dafilesrv-tls -file cert.der
         openssl s_client -showcerts -connect sql2ecl.default:8510 < /dev/null | openssl x509 -outform DER > cert.der
-        sudo keytool -import -keystore $JAVA_HOME/jre/lib/security/cacerts -storepass changeit -noprompt -alias sqltoecl-tls -file cert.der
+        sudo keytool -import -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit -noprompt -alias sqltoecl-tls -file cert.der
+
 
     # speed things up with caching from https://docs.github.com/en/actions/guides/building-and-testing-java-with-maven
     - name: Cache Maven packages

diff --git a/.github/workflows/javadocTest.yml b/.github/workflows/javadocTest.yml
@@ -1,6 +1,6 @@
 name: Javadoc Test
 
-on: 
+on:
   pull_request:
     branches:
       - "master"
@@ -11,13 +11,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      
+
     - uses: actions/checkout@v2
 
-    - name: Setup JDK 1.8
+    - name: Setup JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
 
     # speed things up with caching from https://docs.github.com/en/actions/guides/building-and-testing-java-with-maven
     - name: Cache Maven packages
@@ -26,6 +26,6 @@ jobs:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-m2
-  
+
     - name: Build with Maven
       run: mvn -B -Dmaven.test.skip=True clean install javadoc:javadoc
diff --git a/dfsclient/src/main/java/org/hpccsystems/dfs/client/BinaryRecordWriter.java b/dfsclient/src/main/java/org/hpccsystems/dfs/client/BinaryRecordWriter.java
@@ -415,10 +415,36 @@ else if (fd.getDataLen() < 8 && fd.getDataLen() > 0)
                 {
                     value = (Double) fieldValue;
                 }
-                else if (fieldValue instanceof Integer)
+                else if (fieldValue instanceof Float)
                 {
                     value = ((Float) fieldValue).doubleValue();
                 }
+                else if (fieldValue instanceof Integer)
+                {
+                    value = ((Integer) fieldValue).doubleValue();
+                }
+                else if (fieldValue instanceof Long)
+                {
+                    value = ((Long) fieldValue).doubleValue();
+                }
+                else if (fieldValue instanceof BigInteger)
+                {
+                    value = ((BigInteger) fieldValue).doubleValue();
+                    messages.addMessage("Warning: Potential loss of precision converting BigInteger to Double", fd.getFieldName());
+                }
+                else if (fieldValue instanceof BigDecimal)
+                {
+                    value = ((BigDecimal) fieldValue).doubleValue();
+                    messages.addMessage("Warning: Potential loss of precision converting BigDecimal to Double", fd.getFieldName());
+                }
+                else if (fieldValue instanceof Short)
+                {
+                    value = ((Short) fieldValue).doubleValue();
+                }
+                else if (fieldValue instanceof Byte)
+                {
+                    value = ((Byte) fieldValue).doubleValue();
+                }
 
                 if (fd.getDataLen() == 4)
                 {

diff --git a/wsclient/src/main/java/org/hpccsystems/ws/client/HPCCWsWorkUnitsClient.java b/wsclient/src/main/java/org/hpccsystems/ws/client/HPCCWsWorkUnitsClient.java
@@ -793,7 +793,6 @@ public void publishWU(String wuid) throws Exception
      *             the array of esp exception wrapper
      * @param wuinfodetailsparams
      *            - workunit info request wrapper
-     * @return - ECLWorkunit object with information pertaining to the WU
      * @throws Exception a {@link java.lang.Exception} object.
      *             - Caller must handle exceptions
      * @throws ArrayOfEspExceptionWrapper a {@link org.hpccsystems.ws.client.wrappers.ArrayOfEspExceptionWrapper} object.