Skip to content

Commit a5527b4

Browse files
authored
Merge pull request #613 from apache/6.1.X_align_with_master
This aligns 6.1.X with master
2 parents 6724a39 + 9fa8799 commit a5527b4

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

+173
-93
lines changed

.github/workflows/check_cpp_files.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,17 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
- name: Checkout C++
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
with:
1919
repository: apache/datasketches-cpp
2020
path: cpp
21+
- name: Setup Java
22+
uses: actions/setup-java@v2
23+
with:
24+
java-version: '11'
25+
distribution: 'temurin'
2126
- name: Configure C++ build
2227
run: cd cpp/build && cmake .. -DGENERATE=true
2328
- name: Build C++ unit tests

pom.xml

Lines changed: 1 addition & 1 deletion
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>6.1.1</version>
36+
<version>6.2.0-SNAPSHOT</version>
3737
<packaging>jar</packaging>
3838

3939
<name>${project.artifactId}</name>

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>

src/main/java/org/apache/datasketches/frequencies/PreambleUtil.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@
3131
/**
3232
* This class defines the preamble data structure and provides basic utilities for some of the key
3333
* fields.
34-
* <p>
35-
* The intent of the design of this class was to isolate the detailed knowledge of the bit and byte
34+
*
35+
* <p>The intent of the design of this class was to isolate the detailed knowledge of the bit and byte
3636
* layout of the serialized form of the sketches derived from the Sketch class into one place. This
3737
* allows the possibility of the introduction of different serialization schemes with minimal impact
38-
* on the rest of the library.
39-
* </p>
38+
* on the rest of the library.</p>
4039
*
4140
* <p>
4241
* MAP: Low significance bytes of this <i>long</i> data structure are on the right. However, the

src/main/java/org/apache/datasketches/hash/MurmurHash3.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@
2929
import org.apache.datasketches.memory.Memory;
3030

3131
/**
32-
* <p>
3332
* The MurmurHash3 is a fast, non-cryptographic, 128-bit hash function that has
3433
* excellent avalanche and 2-way bit independence properties.
35-
* </p>
3634
*
3735
* <p>
3836
* Austin Appleby's C++

src/main/java/org/apache/datasketches/hash/package-info.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@
1818
*/
1919

2020
/**
21-
* <p>The hash package contains a high-performing and extended Java implementations
21+
* The hash package contains a high-performing and extended Java implementations
2222
* of Austin Appleby's 128-bit MurmurHash3 hash function originally coded in C.
2323
* This core MurmurHash3.java class is used throughout many of the sketch classes for consistency
2424
* and as long as the user specifies the same seed will result in coordinated hash operations.
2525
* This package also contains an adaptor class that extends the basic class with more functions
2626
* commonly associated with hashing.
27-
* </p>
2827
*/
2928
package org.apache.datasketches.hash;

src/main/java/org/apache/datasketches/kll/KllDoublesHelper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ private static void randomlyHalveUpDoubles(final double[] buf, final int start,
312312

313313
/**
314314
* Compression algorithm used to merge higher levels.
315+
*
315316
* <p>Here is what we do for each level:</p>
316317
* <ul><li>If it does not need to be compacted, then simply copy it over.</li>
317318
* <li>Otherwise, it does need to be compacted, so...

0 commit comments

Comments
 (0)