Merge pull request #651 from apache/main21

Main21
apache · Feb 25, 2025 · 8dbbc8e · 8dbbc8e
2 parents e5697a0 + 9212cbd
commit 8dbbc8e
Show file tree

Hide file tree

Showing 47 changed files with 1,200 additions and 1,115 deletions.
diff --git a/.github/workflows/auto-jdk-matrix.yml b/.github/workflows/auto-jdk-matrix.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [ 17 ]
+        jdk: [ 21 ]
 
     env:
       JDK_VERSION: ${{ matrix.jdk }}

diff --git a/.github/workflows/auto-os-matrix.yml b/.github/workflows/auto-os-matrix.yml
@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
 
       matrix:
-        jdk: [ 17 ]
+        jdk: [ 21 ]
         os: [ windows-latest, ubuntu-latest, macos-latest ]
         include:
           - os: windows-latest

diff --git a/.github/workflows/check_cpp_files.yml b/.github/workflows/check_cpp_files.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Configure C++ build

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           distribution: 'temurin'
           cache: 'maven'
-          java-version: '17'
+          java-version: '21'
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3

diff --git a/.github/workflows/javadoc.yml b/.github/workflows/javadoc.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Echo Java Version

diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@ under the License.
 
   <groupId>org.apache.datasketches</groupId>
   <artifactId>datasketches-java</artifactId>
-  <version>7.1.0-SNAPSHOT</version>
+  <version>8.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>${project.artifactId}</name>
@@ -83,7 +83,7 @@ under the License.
   </developers>
 
   <properties>
-    <datasketches-memory.version>4.1.0</datasketches-memory.version>
+    <datasketches-memory.version>6.0.0</datasketches-memory.version>
 
     <!-- Test -->
     <testng.version>7.10.2</testng.version>
@@ -94,11 +94,11 @@ under the License.
 
     <!-- System-wide properties -->
     <maven.version>3.6.3</maven.version>
-    <java.version>17</java.version>
-    <add-modules>--add-modules=jdk.incubator.foreign</add-modules>
+    <java.version>21</java.version>
+    <jvm-ffm-flag>--enable-preview</jvm-ffm-flag>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <argLine>-Xmx4g -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8 ${add-modules}</argLine>
+    <argLine>-Xmx4g -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8 ${jvm-ffm-flag}</argLine>
     <charset.encoding>UTF-8</charset.encoding>
     <project.build.sourceEncoding>${charset.encoding}</project.build.sourceEncoding>
     <project.build.resourceEncoding>${charset.encoding}</project.build.resourceEncoding>
@@ -164,7 +164,7 @@ under the License.
           <version>${maven-compiler-plugin.version}</version>
           <configuration>
             <compilerArgs>
-              <arg>${add-modules}</arg>
+              <arg>${jvm-ffm-flag}</arg>
             </compilerArgs>
           </configuration>
         </plugin>
@@ -238,7 +238,7 @@ under the License.
             <docfilessubdirs>true</docfilessubdirs>
             <show>public</show>
             <additionalOptions>
-              <additionalOption>${add-modules}</additionalOption>
+              <additionalOption>${jvm-ffm-flag}</additionalOption>
             </additionalOptions>
           </configuration>
           <executions>
@@ -284,7 +284,7 @@ under the License.
           <artifactId>maven-surefire-plugin</artifactId>
           <version>${maven-surefire-failsafe-plugins.version}</version>
           <configuration>
-            <argLine>${add-modules}</argLine>
+            <argLine>${jvm-ffm-flag}</argLine>
             <trimStackTrace>false</trimStackTrace>
             <useManifestOnlyJar>false</useManifestOnlyJar>
             <redirectTestOutputToFile>true</redirectTestOutputToFile>

diff --git a/src/main/java/org/apache/datasketches/cpc/CpcCompression.java b/src/main/java/org/apache/datasketches/cpc/CpcCompression.java
@@ -288,7 +288,7 @@ static long lowLevelCompressPairs(
       final long golombLo = yDelta & golombLoMask; //long for bitBuf
       final long golombHi = yDelta >>> numBaseBits; //cannot exceed 2^26
 
-      //TODO Inline WriteUnary
+      // Inline WriteUnary
       ptrArr[NEXT_WORD_IDX] = nextWordIndex;
       ptrArr[BIT_BUF] = bitBuf;
       ptrArr[BUF_BITS] = bufBits;
@@ -372,7 +372,7 @@ static void lowLevelUncompressPairs(
       bitBuf >>>= codeWordLength;
       bufBits -= codeWordLength;
 
-      //TODO Inline ReadUnary
+      // Inline ReadUnary
       ptrArr[NEXT_WORD_IDX] = nextWordIndex;
       ptrArr[BIT_BUF] = bitBuf;
       ptrArr[BUF_BITS] = bufBits;