You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@datasketches.apache.org by "leerho (via GitHub)" <gi...@apache.org> on 2025/10/10 00:33:47 UTC
[PR] Cleanup names phase 4 (datasketches-java)
leerho opened a new pull request, #689:
URL: https://github.com/apache/datasketches-java/pull/689
(no comment)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For additional commands, e-mail: dev-help@datasketches.apache.org
Re: [PR] Cleanup names phase 4 (datasketches-java)
Posted by "leerho (via GitHub)" <gi...@apache.org>.
leerho commented on code in PR #689:
URL: https://github.com/apache/datasketches-java/pull/689#discussion_r2418273540
##########
src/test/java/org/apache/datasketches/theta/DirectIntersectionTest.java:
##########
@@ -374,55 +374,55 @@
public void checkOverflow() {
final int lgK = 9; //512
final int k = 1<<lgK;
- Intersection inter;
- UpdateSketch sk1;
- final UpdateSketch sk2;
- final CompactSketch comp1;
+ ThetaIntersection inter;
+ UpdatableThetaSketch sk1;
+ final UpdatableThetaSketch sk2;
+ final CompactThetaSketch comp1;
Review Comment:
his was in Test, so pretty harmless, nonetheless:
Removed unused var & removed unused SuppressWarnings("unused").
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For additional commands, e-mail: dev-help@datasketches.apache.org
Re: [PR] Cleanup names phase 4 (datasketches-java)
Posted by "github-advanced-security[bot] (via GitHub)" <gi...@apache.org>.
github-advanced-security[bot] commented on code in PR #689:
URL: https://github.com/apache/datasketches-java/pull/689#discussion_r2430752584
##########
src/main/java/org/apache/datasketches/tuple/TupleSketch.java:
##########
@@ -221,4 +226,46 @@
return sb.toString();
}
+ /**
+ * Instantiate an UpdatableTupleSketch from a given MemorySegment on the heap,
+ * @param <U> Type of update value
+ * @param <S> Type of Summary
+ * @param seg MemorySegment object representing an UpdatableTupleSketch
+ * @param deserializer instance of SummaryDeserializer
+ * @param summaryFactory instance of SummaryFactory
+ * @return UpdatableTupleSketch created from its MemorySegment representation
+ */
+ public static <U, S extends UpdatableSummary<U>> UpdatableTupleSketch<U, S> heapifyUpdatableSketch(
+ final MemorySegment seg,
+ final SummaryDeserializer<S> deserializer,
+ final SummaryFactory<S> summaryFactory) {
+ return new UpdatableTupleSketch<>(seg, deserializer, summaryFactory);
+ }
+
+ /**
+ * Instantiate a TupleSketch from a given MemorySegment.
+ * @param <S> Type of Summary
+ * @param seg MemorySegment object representing a TupleSketch
+ * @param deserializer instance of SummaryDeserializer
+ * @return TupleSketch created from its MemorySegment representation
+ */
+ public static <S extends Summary> TupleSketch<S> heapifySketch(
+ final MemorySegment seg,
+ final SummaryDeserializer<S> deserializer) {
+ final SerializerDeserializer.SketchType sketchType = SerializerDeserializer.getSketchType(seg);
+ if (sketchType == SerializerDeserializer.SketchType.QuickSelectSketch) {
+ return new QuickSelectSketch<>(seg, deserializer, null);
Review Comment:
## Deprecated method or constructor invocation
Invoking [QuickSelectSketch.QuickSelectSketch](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/datasketches-java/security/code-scanning/913)
##########
src/test/java/org/apache/datasketches/tuple/adouble/AdoubleTest.java:
##########
@@ -73,14 +72,14 @@
public void serDeTest() {
final int lgK = 12;
final int K = 1 << lgK;
- final DoubleSketch a1Sk = new DoubleSketch(lgK, Mode.AlwaysOne);
+ final DoubleTupleSketch a1Sk = new DoubleTupleSketch(lgK, Mode.AlwaysOne);
final int m = 2 * K;
for (int key = 0; key < m; key++) {
a1Sk.update(key, 1.0);
}
final double est1 = a1Sk.getEstimate();
final MemorySegment seg = MemorySegment.ofArray(a1Sk.toByteArray());
- final DoubleSketch a1Sk2 = new DoubleSketch(seg, Mode.AlwaysOne);
+ final DoubleTupleSketch a1Sk2 = new DoubleTupleSketch(seg, Mode.AlwaysOne);
Review Comment:
## Deprecated method or constructor invocation
Invoking [DoubleTupleSketch.DoubleTupleSketch](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/datasketches-java/security/code-scanning/914)
##########
src/test/java/org/apache/datasketches/tuple/aninteger/IntegerSketchTest.java:
##########
@@ -42,14 +39,14 @@
final int lgK = 12;
final int K = 1 << lgK;
final IntegerSummary.Mode a1Mode = IntegerSummary.Mode.AlwaysOne;
- final IntegerSketch a1Sk = new IntegerSketch(lgK, a1Mode);
+ final IntegerTupleSketch a1Sk = new IntegerTupleSketch(lgK, a1Mode);
final int m = 2 * K;
for (int i = 0; i < m; i++) {
a1Sk.update(i, 1);
}
final double est1 = a1Sk.getEstimate();
final MemorySegment seg = MemorySegment.ofArray(a1Sk.toByteArray());
- final IntegerSketch a1Sk2 = new IntegerSketch(seg, a1Mode);
+ final IntegerTupleSketch a1Sk2 = new IntegerTupleSketch(seg, a1Mode);
Review Comment:
## Deprecated method or constructor invocation
Invoking [IntegerTupleSketch.IntegerTupleSketch](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/datasketches-java/security/code-scanning/915)
##########
src/main/java/org/apache/datasketches/tuple/TupleSketch.java:
##########
@@ -221,4 +226,46 @@
return sb.toString();
}
+ /**
+ * Instantiate an UpdatableTupleSketch from a given MemorySegment on the heap,
+ * @param <U> Type of update value
+ * @param <S> Type of Summary
+ * @param seg MemorySegment object representing an UpdatableTupleSketch
+ * @param deserializer instance of SummaryDeserializer
+ * @param summaryFactory instance of SummaryFactory
+ * @return UpdatableTupleSketch created from its MemorySegment representation
+ */
+ public static <U, S extends UpdatableSummary<U>> UpdatableTupleSketch<U, S> heapifyUpdatableSketch(
+ final MemorySegment seg,
+ final SummaryDeserializer<S> deserializer,
+ final SummaryFactory<S> summaryFactory) {
+ return new UpdatableTupleSketch<>(seg, deserializer, summaryFactory);
Review Comment:
## Deprecated method or constructor invocation
Invoking [UpdatableTupleSketch.UpdatableTupleSketch](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/datasketches-java/security/code-scanning/912)
##########
src/test/java/org/apache/datasketches/tuple/strings/ArrayOfStringsSketchTest.java:
##########
@@ -53,36 +53,36 @@
printSummaries(sketch1.iterator());
byte[] array = sketch1.toByteArray();
MemorySegment wseg = MemorySegment.ofArray(array);
- ArrayOfStringsSketch sketch2 = new ArrayOfStringsSketch(wseg);
+ ArrayOfStringsTupleSketch sketch2 = new ArrayOfStringsTupleSketch(wseg);
Review Comment:
## Deprecated method or constructor invocation
Invoking [ArrayOfStringsTupleSketch.ArrayOfStringsTupleSketch](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/datasketches-java/security/code-scanning/916)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For additional commands, e-mail: dev-help@datasketches.apache.org
Re: [PR] Cleanup names phase 4 (datasketches-java)
Posted by "leerho (via GitHub)" <gi...@apache.org>.
leerho closed pull request #689: Cleanup names phase 4
URL: https://github.com/apache/datasketches-java/pull/689
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For additional commands, e-mail: dev-help@datasketches.apache.org
Re: [PR] Cleanup names phase 4 (datasketches-java)
Posted by "leerho (via GitHub)" <gi...@apache.org>.
leerho commented on code in PR #689:
URL: https://github.com/apache/datasketches-java/pull/689#discussion_r2421834661
##########
src/test/java/org/apache/datasketches/theta/UpdateSketchTest.java:
##########
@@ -209,9 +209,9 @@
@Test
public void checkCompactOpsMemorySegmentToCompact() {
MemorySegment skwseg, cskwseg1, cskwseg2, cskwseg3;
- CompactSketch csk1, csk2, csk3;
+ CompactThetaSketch csk1, csk2, csk3;
Review Comment:
Fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For additional commands, e-mail: dev-help@datasketches.apache.org
Re: [PR] Cleanup names phase 4 (datasketches-java)
Posted by "leerho (via GitHub)" <gi...@apache.org>.
leerho commented on code in PR #689:
URL: https://github.com/apache/datasketches-java/pull/689#discussion_r2418273540
##########
src/test/java/org/apache/datasketches/theta/DirectIntersectionTest.java:
##########
@@ -374,55 +374,55 @@
public void checkOverflow() {
final int lgK = 9; //512
final int k = 1<<lgK;
- Intersection inter;
- UpdateSketch sk1;
- final UpdateSketch sk2;
- final CompactSketch comp1;
+ ThetaIntersection inter;
+ UpdatableThetaSketch sk1;
+ final UpdatableThetaSketch sk2;
+ final CompactThetaSketch comp1;
Review Comment:
This was in Test, so pretty harmless, nonetheless:
Removed unused var & removed unused SuppressWarnings("unused").
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For additional commands, e-mail: dev-help@datasketches.apache.org
Re: [PR] Cleanup names phase 4 (datasketches-java)
Posted by "github-advanced-security[bot] (via GitHub)" <gi...@apache.org>.
github-advanced-security[bot] commented on code in PR #689:
URL: https://github.com/apache/datasketches-java/pull/689#discussion_r2418246503
##########
src/test/java/org/apache/datasketches/theta/DirectIntersectionTest.java:
##########
@@ -374,55 +374,55 @@
public void checkOverflow() {
final int lgK = 9; //512
final int k = 1<<lgK;
- Intersection inter;
- UpdateSketch sk1;
- final UpdateSketch sk2;
- final CompactSketch comp1;
+ ThetaIntersection inter;
+ UpdatableThetaSketch sk1;
+ final UpdatableThetaSketch sk2;
Review Comment:
## Unread local variable
Variable 'UpdatableThetaSketch sk2' is never read.
[Show more details](https://github.com/apache/datasketches-java/security/code-scanning/906)
##########
src/test/java/org/apache/datasketches/theta/UpdateSketchTest.java:
##########
@@ -209,9 +209,9 @@
@Test
public void checkCompactOpsMemorySegmentToCompact() {
MemorySegment skwseg, cskwseg1, cskwseg2, cskwseg3;
- CompactSketch csk1, csk2, csk3;
+ CompactThetaSketch csk1, csk2, csk3;
Review Comment:
## Unread local variable
Variable 'CompactThetaSketch csk3' is never read.
[Show more details](https://github.com/apache/datasketches-java/security/code-scanning/911)
##########
src/test/java/org/apache/datasketches/theta/HeapAlphaSketchTest.java:
##########
@@ -666,21 +666,21 @@
@Test
public void checkFamily() {
- UpdateSketch sketch = UpdateSketch.builder().setFamily(ALPHA).build();
+ UpdatableThetaSketch sketch = UpdatableThetaSketch.builder().setFamily(ALPHA).build();
assertEquals(sketch.getFamily(), Family.ALPHA);
}
@SuppressWarnings("unused")
@Test(expectedExceptions = SketchesArgumentException.class)
public void corruptionLgNomLongs() {
final int k = 512;
- UpdateSketch sketch = UpdateSketch.builder().setNominalEntries(k)
+ UpdatableThetaSketch sketch = UpdatableThetaSketch.builder().setNominalEntries(k)
.setFamily(ALPHA).build();
for (int i = 0; i < k; i++) { sketch.update(i); }
byte[] byteArr = sketch.toByteArray();
MemorySegment wseg = MemorySegment.ofArray(byteArr);
wseg.set(JAVA_BYTE, LG_NOM_LONGS_BYTE, (byte) 8); //corrupt LgNomLongs
- UpdateSketch sk = UpdateSketch.heapify(wseg);
+ UpdatableThetaSketch sk = UpdatableThetaSketch.heapify(wseg);
Review Comment:
## Unread local variable
Variable 'UpdatableThetaSketch sk' is never read.
[Show more details](https://github.com/apache/datasketches-java/security/code-scanning/908)
##########
src/test/java/org/apache/datasketches/theta/UpdateSketchTest.java:
##########
@@ -209,9 +209,9 @@
@Test
public void checkCompactOpsMemorySegmentToCompact() {
MemorySegment skwseg, cskwseg1, cskwseg2, cskwseg3;
- CompactSketch csk1, csk2, csk3;
+ CompactThetaSketch csk1, csk2, csk3;
Review Comment:
## Unread local variable
Variable 'CompactThetaSketch csk2' is never read.
[Show more details](https://github.com/apache/datasketches-java/security/code-scanning/910)
##########
src/test/java/org/apache/datasketches/theta/DirectIntersectionTest.java:
##########
@@ -374,55 +374,55 @@
public void checkOverflow() {
final int lgK = 9; //512
final int k = 1<<lgK;
- Intersection inter;
- UpdateSketch sk1;
- final UpdateSketch sk2;
- final CompactSketch comp1;
+ ThetaIntersection inter;
+ UpdatableThetaSketch sk1;
+ final UpdatableThetaSketch sk2;
+ final CompactThetaSketch comp1;
Review Comment:
## Unread local variable
Variable 'CompactThetaSketch comp1' is never read.
[Show more details](https://github.com/apache/datasketches-java/security/code-scanning/907)
##########
src/test/java/org/apache/datasketches/theta/UpdateSketchTest.java:
##########
@@ -209,9 +209,9 @@
@Test
public void checkCompactOpsMemorySegmentToCompact() {
MemorySegment skwseg, cskwseg1, cskwseg2, cskwseg3;
- CompactSketch csk1, csk2, csk3;
+ CompactThetaSketch csk1, csk2, csk3;
Review Comment:
## Unread local variable
Variable 'CompactThetaSketch csk1' is never read.
[Show more details](https://github.com/apache/datasketches-java/security/code-scanning/909)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For additional commands, e-mail: dev-help@datasketches.apache.org
Re: [PR] Cleanup names phase 4 (datasketches-java)
Posted by "leerho (via GitHub)" <gi...@apache.org>.
leerho commented on code in PR #689:
URL: https://github.com/apache/datasketches-java/pull/689#discussion_r2421803238
##########
src/test/java/org/apache/datasketches/theta/UpdateSketchTest.java:
##########
@@ -209,9 +209,9 @@
@Test
public void checkCompactOpsMemorySegmentToCompact() {
MemorySegment skwseg, cskwseg1, cskwseg2, cskwseg3;
- CompactSketch csk1, csk2, csk3;
+ CompactThetaSketch csk1, csk2, csk3;
Review Comment:
Fixed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For additional commands, e-mail: dev-help@datasketches.apache.org
Re: [PR] Cleanup names phase 4 (datasketches-java)
Posted by "leerho (via GitHub)" <gi...@apache.org>.
leerho commented on code in PR #689:
URL: https://github.com/apache/datasketches-java/pull/689#discussion_r2421833001
##########
src/test/java/org/apache/datasketches/theta/UpdateSketchTest.java:
##########
@@ -209,9 +209,9 @@
@Test
public void checkCompactOpsMemorySegmentToCompact() {
MemorySegment skwseg, cskwseg1, cskwseg2, cskwseg3;
- CompactSketch csk1, csk2, csk3;
+ CompactThetaSketch csk1, csk2, csk3;
Review Comment:
Fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For additional commands, e-mail: dev-help@datasketches.apache.org
Re: [PR] Cleanup names phase 4 (datasketches-java)
Posted by "leerho (via GitHub)" <gi...@apache.org>.
leerho commented on PR #689:
URL: https://github.com/apache/datasketches-java/pull/689#issuecomment-3404092803
I am about to leave for an extended vacation in a few days and I need to focus on getting ready for this long trip. So I need to pause my refactoring until I get back on Nov 5th.
I have completed, I think, all the necessary name changes for /theta/ and /tuple/ … and that is quite a lot, 124 files for just those two families!
Bear in mind that there are no code logic changes whatsoever. But of course, the name changes constitute breaking changes on their own. All the unit tests run just fine, even the CI tests.
I primarily focused on the public classes where:
There was overlap of classes with the same name between /theta/ and /tuple/.
Where there might be reasons to want to import the same named class from /theta/ and from /tuple/ within the same user class.
I did not attempt to rename the many public classes where the name was already unique and it was not duplicated in any other family. I felt that those were easy to understand what family they belonged to by their context.
Nonetheless, CoPilot complains about the fact that the deprecated methods are still used in test, and still have a few transient references in main that a are unavoidable — unless we remove all of the deprecated methods, which I don’t have the energy or desire to do for this release.
I will not be able to check on this PR while I’m gone, but I will be grateful if someone could approve it, and merge it in the meantime.
Thanks
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For additional commands, e-mail: dev-help@datasketches.apache.org
Re: [PR] Cleanup names phase 4 (datasketches-java)
Posted by "leerho (via GitHub)" <gi...@apache.org>.
leerho commented on code in PR #689:
URL: https://github.com/apache/datasketches-java/pull/689#discussion_r2418277524
##########
src/test/java/org/apache/datasketches/theta/HeapAlphaSketchTest.java:
##########
@@ -666,21 +666,21 @@
@Test
public void checkFamily() {
- UpdateSketch sketch = UpdateSketch.builder().setFamily(ALPHA).build();
+ UpdatableThetaSketch sketch = UpdatableThetaSketch.builder().setFamily(ALPHA).build();
assertEquals(sketch.getFamily(), Family.ALPHA);
}
@SuppressWarnings("unused")
@Test(expectedExceptions = SketchesArgumentException.class)
public void corruptionLgNomLongs() {
final int k = 512;
- UpdateSketch sketch = UpdateSketch.builder().setNominalEntries(k)
+ UpdatableThetaSketch sketch = UpdatableThetaSketch.builder().setNominalEntries(k)
.setFamily(ALPHA).build();
for (int i = 0; i < k; i++) { sketch.update(i); }
byte[] byteArr = sketch.toByteArray();
MemorySegment wseg = MemorySegment.ofArray(byteArr);
wseg.set(JAVA_BYTE, LG_NOM_LONGS_BYTE, (byte) 8); //corrupt LgNomLongs
- UpdateSketch sk = UpdateSketch.heapify(wseg);
+ UpdatableThetaSketch sk = UpdatableThetaSketch.heapify(wseg);
Review Comment:
This was in Test, so pretty harmless, nonetheless:
Removed unused var & removed unused SuppressWarnings("unused").
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For additional commands, e-mail: dev-help@datasketches.apache.org
Re: [PR] Cleanup names phase 4 (datasketches-java)
Posted by "leerho (via GitHub)" <gi...@apache.org>.
leerho commented on code in PR #689:
URL: https://github.com/apache/datasketches-java/pull/689#discussion_r2418265863
##########
src/test/java/org/apache/datasketches/theta/DirectIntersectionTest.java:
##########
@@ -374,55 +374,55 @@
public void checkOverflow() {
final int lgK = 9; //512
final int k = 1<<lgK;
- Intersection inter;
- UpdateSketch sk1;
- final UpdateSketch sk2;
- final CompactSketch comp1;
+ ThetaIntersection inter;
+ UpdatableThetaSketch sk1;
+ final UpdatableThetaSketch sk2;
Review Comment:
This was in Test, so pretty harmless, nonetheless:
Removed unused var & removed unused SuppressWarnings("unused").
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@datasketches.apache.org
For additional commands, e-mail: dev-help@datasketches.apache.org