Skip to content

Commit 259aa39

Browse files
leerholeerho
authored
Merge pull request #614 from apache/align_master_with_6.1.X
align master with 6.1.X Also
2 parents 33d8ad5 + 4f92140 commit 259aa39

Some content is hidden

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

48 files changed

+120
-169
lines changed

.github/workflows/check_cpp_files.yml renamed to .github/workflows/auto-check_cpp_files.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ name: Serialization Compatibility Test
22

33
on:
44
push:
5-
branches:
6-
- master
5+
branches: [ master, main ]
76
workflow_dispatch:
87

98
jobs:
@@ -19,7 +18,7 @@ jobs:
1918
repository: apache/datasketches-cpp
2019
path: cpp
2120
- name: Setup Java
22-
uses: actions/setup-java@v2
21+
uses: actions/setup-java@v4
2322
with:
2423
java-version: '11'
2524
distribution: 'temurin'

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: DataSketches-Java Auto JDK Matrix Test & Install
33
on:
44
pull_request:
55
push:
6-
branches: [ master ]
6+
branches: [ master, main ]
77
workflow_dispatch:
88

99
env:
@@ -13,43 +13,47 @@ jobs:
1313
build:
1414
name: Build, Test, Install
1515
runs-on: ubuntu-latest
16+
1617
strategy:
1718
fail-fast: false
1819
matrix:
1920
jdk: [ 8,11 ]
21+
2022
env:
2123
JDK_VERSION: ${{ matrix.jdk }}
2224

2325
steps:
2426
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
25-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2628
with:
2729
persist-credentials: false
2830

31+
- name: Print Current workflow
32+
run: >
33+
cat .github/workflows/auto-jdk-matrix.yml
34+
2935
- name: Cache local Maven repository
30-
uses: actions/cache@v3
36+
uses: actions/cache@v4
3137
with:
3238
path: ~/.m2/repository
3339
key: build-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
3440
restore-keys: build-${{ runner.os }}-maven-
3541

3642
- name: Install Matrix JDK
37-
uses: actions/setup-java@v3
43+
uses: actions/setup-java@v4
3844
with:
3945
java-version: ${{ matrix.jdk }}
4046
distribution: 'temurin'
4147
java-package: jdk
4248
architecture: x64
43-
# Architecture options: x86, x64, armv7, aarch64, ppc64le
44-
# setup-java@v3 has a "with cache" option
4549

4650
- name: Echo Java Version
4751
run: >
4852
java -version
4953
5054
- name: Test
5155
run: >
52-
mvn clean test
56+
mvn clean test -B
5357
-Dmaven.javadoc.skip=true
5458
-Dgpg.skip=true
5559
@@ -59,7 +63,10 @@ jobs:
5963
-DskipTests=true
6064
-Dgpg.skip=true
6165
66+
# Architecture options: x86, x64, armv7, aarch64, ppc64le
67+
# setup-java@v3 has a "with cache" option
6268
# Lifecycle: validate, compile, test, package, verify, install, deploy
6369
# -B batch mode
6470
# -V show Version without stopping
71+
# -X debug mode
6572
# -q quiet, only show errors

.github/workflows/manual-os-matrix.yml renamed to .github/workflows/auto-os-matrix.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
1-
name: DataSketches-Java Manual OS Matrix Test & Install
1+
name: DataSketches-Java 8 Auto OS Matrix Test & Install
22

33
on:
4+
pull_request:
5+
push:
6+
branches: [ master, main ]
47
workflow_dispatch:
58

69
env:
7-
MAVEN_OPTS: -Xmx4g -Xms1g
10+
MAVEN_OPTS: -Xmx1g -Xms1g
811

912
jobs:
1013
build:
1114
name: Build, Test, Install
12-
runs-on: ${{matrix.os}}
15+
1316
strategy:
1417
fail-fast: false
18+
1519
matrix:
16-
jdk: [ 8, 11 ]
20+
jdk: [ 8 ]
1721
os: [ windows-latest, ubuntu-latest, macos-latest ]
1822
include:
1923
- os: windows-latest
@@ -26,31 +30,31 @@ jobs:
2630
skip_javadoc: -Dmaven.javadoc.skip=true
2731
skip_gpg: -Dgpg.skip=true
2832

33+
runs-on: ${{matrix.os}}
34+
2935
env:
3036
JDK_VERSION: ${{ matrix.jdk }}
3137

3238
steps:
3339
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
34-
uses: actions/checkout@v3
40+
uses: actions/checkout@v4
3541
with:
3642
persist-credentials: false
3743

3844
- name: Cache local Maven repository
39-
uses: actions/cache@v3
45+
uses: actions/cache@v4
4046
with:
4147
path: ~/.m2/repository
4248
key: build-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
4349
restore-keys: build-${{ runner.os }}-maven-
4450

4551
- name: Install Matrix JDK
46-
uses: actions/setup-java@v3
52+
uses: actions/setup-java@v4
4753
with:
4854
java-version: ${{ matrix.jdk }}
4955
distribution: 'temurin'
5056
java-package: jdk
5157
architecture: x64
52-
# Architecture options: x86, x64, armv7, aarch64, ppc64le
53-
# setup-java@v3 has a "with cache" option
5458

5559
- name: Echo Java Version
5660
run: >
@@ -69,7 +73,9 @@ jobs:
6973
-D skipTests=true
7074
${{matrix.os.skip_gpg}}
7175
76+
# Architecture options: x86, x64, armv7, aarch64, ppc64le
77+
# setup-java@v4 has a "with cache" option
7278
# Lifecycle: validate, compile, test, package, verify, install, deploy
7379
# -B batch mode
7480
# -V show Version without stopping
75-
# -q quiet, only show errors
81+
# -q quiet, only show errors

.github/workflows/codeql-analysis.yml renamed to .github/workflows/manual-codeql-analysis.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
name: "CodeQL"
22

33
on:
4-
push:
5-
branches: [ 'master' ]
6-
pull_request:
7-
# The branches below must be a subset of the branches above
8-
branches: [ 'master' ]
9-
schedule:
10-
- cron: '10 17 * * 4'
114
workflow_dispatch:
125

136
jobs:
@@ -28,11 +21,11 @@ jobs:
2821

2922
steps:
3023
- name: Checkout repository
31-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
3225

3326
# Initializes the CodeQL tools for scanning.
3427
- name: Initialize CodeQL
35-
uses: github/codeql-action/init@v3
28+
uses: github/codeql-action/init@v4
3629
with:
3730
languages: ${{ matrix.language }}
3831
# If you wish to specify custom queries, you can do so here or in a config file.

‎.github/workflows/manual-coverage.yml‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

.github/workflows/javadoc.yml renamed to .github/workflows/manual-javadoc.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
name: JavaDoc
22

33
on:
4-
push:
5-
branches:
6-
- master
74
workflow_dispatch:
85

96
jobs:
107
javadoc:
118
runs-on: ubuntu-latest
129
steps:
1310
- name: Checkout
14-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1512
- name: Generate JavaDoc
1613
run: mvn javadoc:javadoc
1714
- name: Deploy JavaDoc

‎src/main/java/org/apache/datasketches/filters/bloomfilter/BloomFilter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
import org.apache.datasketches.memory.XxHash;
3434

3535
/**
36-
* <p>A Bloom filter is a data structure that can be used for probabilistic
37-
* set membership.</p>
36+
* A Bloom filter is a data structure that can be used for probabilistic
37+
* set membership.
3838
*
3939
* <p>When querying a Bloom filter, there are no false positives. Specifically:
4040
* When querying an item that has already been inserted to the filter, the filter will

‎src/main/java/org/apache/datasketches/filters/bloomfilter/BloomFilterBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import org.apache.datasketches.memory.WritableMemory;
2626

2727
/**
28-
* <p>This class provides methods to help estimate the correct parameters when
29-
* creating a Bloom filter, and methods to create the filter using those values.</p>
28+
* This class provides methods to help estimate the correct parameters when
29+
* creating a Bloom filter, and methods to create the filter using those values.
3030
*
3131
* <p>The underlying math is described in the
3232
* <a href='https://en.wikipedia.org/wiki/Bloom_filter#Optimal_number_of_hash_functions'>

‎src/main/java/org/apache/datasketches/frequencies/ItemsSketch.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555
import org.apache.datasketches.memory.WritableMemory;
5656

5757
/**
58-
* <p>This sketch is useful for tracking approximate frequencies of items of type <i>&lt;T&gt;</i>
58+
* This sketch is useful for tracking approximate frequencies of items of type <i>&lt;T&gt;</i>
5959
* with optional associated counts (<i>&lt;T&gt;</i> item, <i>long</i> count) that are members of a
6060
* multiset of such items. The true frequency of an item is defined to be the sum of associated
61-
* counts.</p>
61+
* counts.
6262
*
6363
* <p>This implementation provides the following capabilities:</p>
6464
* <ul>

‎src/main/java/org/apache/datasketches/frequencies/LongsSketch.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
import org.apache.datasketches.memory.WritableMemory;
5555

5656
/**
57-
* <p>This sketch is useful for tracking approximate frequencies of <i>long</i> items with optional
57+
* This sketch is useful for tracking approximate frequencies of <i>long</i> items with optional
5858
* associated counts (<i>long</i> item, <i>long</i> count) that are members of a multiset of
59-
* such items. The true frequency of an item is defined to be the sum of associated counts.</p>
59+
* such items. The true frequency of an item is defined to be the sum of associated counts.
6060
*
6161
* <p>This implementation provides the following capabilities:</p>
6262
* <ul>

0 commit comments

Comments
 (0)