Skip to content

Commit 8dbbc8e

Browse files
authored
Merge pull request #651 from apache/main21
Main21
2 parents e5697a0 + 9212cbd commit 8dbbc8e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1200
-1115
lines changed

.github/workflows/auto-jdk-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
jdk: [ 17 ]
24+
jdk: [ 21 ]
2525

2626
env:
2727
JDK_VERSION: ${{ matrix.jdk }}

.github/workflows/auto-os-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
fail-fast: false
2222

2323
matrix:
24-
jdk: [ 17 ]
24+
jdk: [ 21 ]
2525
os: [ windows-latest, ubuntu-latest, macos-latest ]
2626
include:
2727
- os: windows-latest

.github/workflows/check_cpp_files.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Setup Java
2828
uses: actions/setup-java@v4
2929
with:
30-
java-version: '17'
30+
java-version: '21'
3131
distribution: 'temurin'
3232

3333
- name: Configure C++ build

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
distribution: 'temurin'
3737
cache: 'maven'
38-
java-version: '17'
38+
java-version: '21'
3939

4040
- name: Initialize CodeQL
4141
uses: github/codeql-action/init@v3

.github/workflows/javadoc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup Java
1717
uses: actions/setup-java@v4
1818
with:
19-
java-version: '17'
19+
java-version: '21'
2020
distribution: 'temurin'
2121

2222
- name: Echo Java Version

pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ under the License.
3333

3434
<groupId>org.apache.datasketches</groupId>
3535
<artifactId>datasketches-java</artifactId>
36-
<version>7.1.0-SNAPSHOT</version>
36+
<version>8.0.0-SNAPSHOT</version>
3737
<packaging>jar</packaging>
3838

3939
<name>${project.artifactId}</name>
@@ -83,7 +83,7 @@ under the License.
8383
</developers>
8484

8585
<properties>
86-
<datasketches-memory.version>4.1.0</datasketches-memory.version>
86+
<datasketches-memory.version>6.0.0</datasketches-memory.version>
8787

8888
<!-- Test -->
8989
<testng.version>7.10.2</testng.version>
@@ -94,11 +94,11 @@ under the License.
9494

9595
<!-- System-wide properties -->
9696
<maven.version>3.6.3</maven.version>
97-
<java.version>17</java.version>
98-
<add-modules>--add-modules=jdk.incubator.foreign</add-modules>
97+
<java.version>21</java.version>
98+
<jvm-ffm-flag>--enable-preview</jvm-ffm-flag>
9999
<maven.compiler.source>${java.version}</maven.compiler.source>
100100
<maven.compiler.target>${java.version}</maven.compiler.target>
101-
<argLine>-Xmx4g -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8 ${add-modules}</argLine>
101+
<argLine>-Xmx4g -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8 ${jvm-ffm-flag}</argLine>
102102
<charset.encoding>UTF-8</charset.encoding>
103103
<project.build.sourceEncoding>${charset.encoding}</project.build.sourceEncoding>
104104
<project.build.resourceEncoding>${charset.encoding}</project.build.resourceEncoding>
@@ -164,7 +164,7 @@ under the License.
164164
<version>${maven-compiler-plugin.version}</version>
165165
<configuration>
166166
<compilerArgs>
167-
<arg>${add-modules}</arg>
167+
<arg>${jvm-ffm-flag}</arg>
168168
</compilerArgs>
169169
</configuration>
170170
</plugin>
@@ -238,7 +238,7 @@ under the License.
238238
<docfilessubdirs>true</docfilessubdirs>
239239
<show>public</show>
240240
<additionalOptions>
241-
<additionalOption>${add-modules}</additionalOption>
241+
<additionalOption>${jvm-ffm-flag}</additionalOption>
242242
</additionalOptions>
243243
</configuration>
244244
<executions>
@@ -284,7 +284,7 @@ under the License.
284284
<artifactId>maven-surefire-plugin</artifactId>
285285
<version>${maven-surefire-failsafe-plugins.version}</version>
286286
<configuration>
287-
<argLine>${add-modules}</argLine>
287+
<argLine>${jvm-ffm-flag}</argLine>
288288
<trimStackTrace>false</trimStackTrace>
289289
<useManifestOnlyJar>false</useManifestOnlyJar>
290290
<redirectTestOutputToFile>true</redirectTestOutputToFile>

src/main/java/org/apache/datasketches/cpc/CpcCompression.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ static long lowLevelCompressPairs(
288288
final long golombLo = yDelta & golombLoMask; //long for bitBuf
289289
final long golombHi = yDelta >>> numBaseBits; //cannot exceed 2^26
290290

291-
//TODO Inline WriteUnary
291+
// Inline WriteUnary
292292
ptrArr[NEXT_WORD_IDX] = nextWordIndex;
293293
ptrArr[BIT_BUF] = bitBuf;
294294
ptrArr[BUF_BITS] = bufBits;
@@ -372,7 +372,7 @@ static void lowLevelUncompressPairs(
372372
bitBuf >>>= codeWordLength;
373373
bufBits -= codeWordLength;
374374

375-
//TODO Inline ReadUnary
375+
// Inline ReadUnary
376376
ptrArr[NEXT_WORD_IDX] = nextWordIndex;
377377
ptrArr[BIT_BUF] = bitBuf;
378378
ptrArr[BUF_BITS] = bufBits;

0 commit comments

Comments
 (0)