Skip to content

Commit b79eaa8

Browse files
authored
Merge pull request #657 from apache/main21-2
Main21-2 to main
2 parents b16605c + 1757d77 commit b79eaa8

34 files changed

+95
-24
lines changed

pom.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ under the License.
190190
<configuration>
191191
<rules>
192192
<requireJavaVersion>
193-
<version>${java.version}</version>
193+
<version>[21,)</version> <!-- java.version -->
194194
</requireJavaVersion>
195195
<requireMavenVersion>
196196
<version>[${maven.version},4.0.0)</version>
@@ -237,9 +237,10 @@ under the License.
237237
<configuration>
238238
<docfilessubdirs>true</docfilessubdirs>
239239
<show>public</show>
240-
<additionalOptions>
241-
<additionalOption>${jvm-ffm-flag}</additionalOption>
242-
</additionalOptions>
240+
<doclint>all,-missing</doclint>
241+
<additionalJOptions>
242+
<additionalJOption>${jvm-ffm-flag}</additionalJOption>
243+
</additionalJOptions>
243244
</configuration>
244245
<executions>
245246
<execution>

src/main/java/org/apache/datasketches/common/Family.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public int getID() {
194194
}
195195

196196
/**
197-
*
197+
* Checks the given Family ID
198198
* @param id the given id, a value &lt; 128.
199199
*/
200200
public void checkFamilyID(final int id) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class MergingValidation {
5656
private PrintWriter printWriter;
5757

5858
/**
59-
*
59+
* Constructor
6060
* @param lgMinK lgMinK
6161
* @param lgMaxK lgMaxK
6262
* @param lgMulK lgMulK
@@ -79,7 +79,7 @@ public MergingValidation(final int lgMinK, final int lgMaxK, final int lgMulK, f
7979
}
8080

8181
/**
82-
*
82+
* Start the merging validation process
8383
*/
8484
public void start() {
8585
printf(hfmt, (Object[]) hStrArr); //print header

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class QuickMergingValidation {
5454
private PrintWriter printWriter;
5555

5656
/**
57-
*
57+
* Constructor
5858
* @param lgMinK lgMinK
5959
* @param lgMaxK lgMaxK
6060
* @param incLgK incLgK
@@ -73,7 +73,7 @@ public QuickMergingValidation(final int lgMinK, final int lgMaxK, final int incL
7373
}
7474

7575
/**
76-
*
76+
* Start the Quick Merging Validation process
7777
*/
7878
public void start() {
7979
printf(hfmt, (Object[]) hStrArr); //print header

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class StreamingValidation {
5757
private BitMatrix matrix = null;
5858

5959
/**
60-
*
60+
* Constructor
6161
* @param lgMinK lgMinK
6262
* @param lgMaxK lgMaxK
6363
* @param trials trials
@@ -78,7 +78,7 @@ public StreamingValidation(final int lgMinK, final int lgMaxK, final int trials,
7878
}
7979

8080
/**
81-
*
81+
* Start the streaming validation process
8282
*/
8383
public void start() {
8484
printf(hfmt, (Object[]) hStrArr);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import static org.apache.datasketches.cpc.RuntimeAsserts.rtAssertEquals;
2626

2727
/**
28+
* Utility methods for Test
2829
* @author Lee Rhodes
2930
*/
3031
public class TestUtil {

src/main/java/org/apache/datasketches/fdt/Group.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,41 +66,49 @@ public Group init(final String priKey, final int count, final double estimate, f
6666
}
6767

6868
/**
69-
* @return priKey of type T
69+
* Gets the primary key of type String
70+
* @return priKey of type String
7071
*/
7172
public String getPrimaryKey() { return priKey; }
7273

7374
/**
75+
* Returns the count
7476
* @return the count
7577
*/
7678
public int getCount() { return count; }
7779

7880
/**
81+
* Returns the estimate
7982
* @return the estimate
8083
*/
8184
public double getEstimate() { return est; }
8285

8386
/**
87+
* Returns the upper bound
8488
* @return the upper bound
8589
*/
8690
public double getUpperBound() { return ub; }
8791

8892
/**
93+
* Returns the lower bound
8994
* @return the lower bound
9095
*/
9196
public double getLowerBound() { return lb; }
9297

9398
/**
99+
* Returns the fraction for this group
94100
* @return the fraction for this group
95101
*/
96102
public double getFraction() { return fraction; }
97103

98104
/**
105+
* Returns the RSE
99106
* @return the RSE
100107
*/
101108
public double getRse() { return rse; }
102109

103110
/**
111+
* Returns the descriptive header
104112
* @return the descriptive header
105113
*/
106114
public String getHeader() {
@@ -112,9 +120,6 @@ public String toString() {
112120
return String.format(fmt, count, est, ub, lb, fraction, rse, priKey);
113121
}
114122

115-
/**
116-
* @param that The Group to compare to
117-
*/
118123
@Override
119124
public int compareTo(final Group that) {
120125
return that.count - count; //decreasing
@@ -133,4 +138,3 @@ public int hashCode() {
133138
}
134139

135140
}
136-

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ public Row<T>[] getFrequentItems(final ErrorType errorType) {
397397
}
398398

399399
/**
400+
* Returns an upper bound on the maximum error of getEstimate(item) for any item.
400401
* @return An upper bound on the maximum error of getEstimate(item) for any item.
401402
* This is equivalent to the maximum distance between the upper bound and the lower bound
402403
* for any item.
@@ -415,6 +416,7 @@ public int getMaximumMapCapacity() {
415416
}
416417

417418
/**
419+
* Returns the number of active items in the sketch.
418420
* @return the number of active items in the sketch.
419421
*/
420422
public int getNumActiveItems() {
@@ -624,26 +626,31 @@ public static class Row<T> implements Comparable<Row<T>> {
624626
}
625627

626628
/**
629+
* Returns an item of type T
627630
* @return item of type T
628631
*/
629632
public T getItem() { return item; }
630633

631634
/**
635+
* Returns the estimate
632636
* @return the estimate
633637
*/
634638
public long getEstimate() { return est; }
635639

636640
/**
641+
* Returns the upper bound
637642
* @return the upper bound
638643
*/
639644
public long getUpperBound() { return ub; }
640645

641646
/**
647+
* Returns the lower bound
642648
* @return return the lower bound
643649
*/
644650
public long getLowerBound() { return lb; }
645651

646652
/**
653+
* Returns the descriptive row header
647654
* @return the descriptive row header
648655
*/
649656
public static String getRowHeader() {

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,7 @@ public Row[] getFrequentItems(final ErrorType errorType) {
439439
}
440440

441441
/**
442+
* Returns an upper bound on the maximum error of getEstimate(item) for any item.
442443
* @return An upper bound on the maximum error of getEstimate(item) for any item.
443444
* This is equivalent to the maximum distance between the upper bound and the lower bound
444445
* for any item.
@@ -457,6 +458,7 @@ public int getMaximumMapCapacity() {
457458
}
458459

459460
/**
461+
* Returns the number of active items in the sketch.
460462
* @return the number of active items in the sketch.
461463
*/
462464
public int getNumActiveItems() {
@@ -693,26 +695,31 @@ public static class Row implements Comparable<Row> {
693695
}
694696

695697
/**
696-
* @return item of type T
698+
* Returns item of type long
699+
* @return item of type long
697700
*/
698701
public long getItem() { return item; }
699702

700703
/**
704+
* Returns the estimate
701705
* @return the estimate
702706
*/
703707
public long getEstimate() { return est; }
704708

705709
/**
710+
* Returns the upper bound
706711
* @return the upper bound
707712
*/
708713
public long getUpperBound() { return ub; }
709714

710715
/**
716+
* Returns the lower bound
711717
* @return return the lower bound
712718
*/
713719
public long getLowerBound() { return lb; }
714720

715721
/**
722+
* Returns the descriptive row header
716723
* @return the descriptive row header
717724
*/
718725
public static String getRowHeader() {

src/main/java/org/apache/datasketches/quantiles/UpdateDoublesSketch.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.datasketches.memory.WritableMemory;
2424

2525
/**
26+
* Extends DoubleSketch
2627
* @author Jon Malkin
2728
*/
2829
public abstract class UpdateDoublesSketch extends DoublesSketch {
@@ -61,6 +62,7 @@ public static UpdateDoublesSketch heapify(final Memory srcMem) {
6162
}
6263

6364
/**
65+
* Returns a CompactDoublesSketch of this class
6466
* @return a CompactDoublesSketch of this class
6567
*/
6668
public CompactDoublesSketch compact() {

0 commit comments

Comments
 (0)