You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2022/11/20 02:21:19 UTC
[datasketches-memory] branch IntegrateJava17_v2 updated: Consolidating the location of LS.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch IntegrateJava17_v2
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
The following commit(s) were added to refs/heads/IntegrateJava17_v2 by this push:
new 97fec0c Consolidating the location of LS.
97fec0c is described below
commit 97fec0c3665a9d3278c3503a7283f3fe2fb3f405
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Sat Nov 19 18:21:14 2022 -0800
Consolidating the location of LS.
---
.../memory/internal/AllocateDirectMapMemoryTest.java | 2 +-
.../internal/AllocateDirectWritableMapMemoryTest.java | 2 +-
.../apache/datasketches/memory/internal/MemoryTest.java | 2 +-
.../org/apache/datasketches/memory/internal/UtilTest.java | 3 +--
.../java/org/apache/datasketches/memory/BaseBuffer.java | 14 +++++++++++++-
.../java/org/apache/datasketches/memory/BaseState.java | 6 ++++++
.../apache/datasketches/memory/internal/BaseStateImpl.java | 2 +-
.../apache/datasketches/memory/internal/UnsafeUtil.java | 2 --
.../memory/internal/AllocateDirectMapMemoryTest.java | 4 ++--
.../internal/AllocateDirectWritableMapMemoryTest.java | 2 +-
.../apache/datasketches/memory/internal/MemoryTest.java | 2 +-
.../org/apache/datasketches/memory/internal/UtilTest.java | 2 +-
12 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectMapMemoryTest.java b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectMapMemoryTest.java
index 161eb1b..c29a551 100644
--- a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectMapMemoryTest.java
+++ b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectMapMemoryTest.java
@@ -23,6 +23,7 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.LS;
import static org.apache.datasketches.memory.internal.Util.getResourceFile;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
@@ -38,7 +39,6 @@ import org.testng.annotations.Test;
import jdk.incubator.foreign.ResourceScope;
public class AllocateDirectMapMemoryTest {
- private static final String LS = System.getProperty("line.separator");
@Test
public void simpleMap() throws Exception {
diff --git a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java
index 1f33854..af68cee 100644
--- a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java
+++ b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java
@@ -24,6 +24,7 @@
package org.apache.datasketches.memory.internal;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.datasketches.memory.internal.Util.LS;
import static org.apache.datasketches.memory.internal.Util.getResourceFile;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
@@ -47,7 +48,6 @@ import org.testng.annotations.Test;
import jdk.incubator.foreign.ResourceScope;
public class AllocateDirectWritableMapMemoryTest {
- private static final String LS = System.getProperty("line.separator");
private final MemoryRequestServer memReqSvr = BaseState.defaultMemReqSvr;
@BeforeClass
diff --git a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/MemoryTest.java b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/MemoryTest.java
index bc0796c..37d1034 100644
--- a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/MemoryTest.java
+++ b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/MemoryTest.java
@@ -23,6 +23,7 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.LS;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
@@ -46,7 +47,6 @@ import org.testng.collections.Lists;
import jdk.incubator.foreign.ResourceScope;
public class MemoryTest {
- private static final String LS = System.getProperty("line.separator");
private static final MemoryRequestServer memReqSvr = BaseState.defaultMemReqSvr;
diff --git a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/UtilTest.java b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/UtilTest.java
index 2e1c57f..7a34b9c 100644
--- a/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/UtilTest.java
+++ b/datasketches-memory-java17/src/test/java17/org/apache/datasketches/memory/internal/UtilTest.java
@@ -23,6 +23,7 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.LS;
import static org.apache.datasketches.memory.internal.Util.getResourceBytes;
import static org.apache.datasketches.memory.internal.Util.getResourceFile;
import static org.testng.Assert.assertTrue;
@@ -38,8 +39,6 @@ import java.nio.file.attribute.PosixFilePermissions;
import org.testng.annotations.Test;
public class UtilTest {
- private static final String LS = System.getProperty("line.separator");
-
static final String getFileAttributes(File file) throws IOException {
PosixFileAttributes attrs = Files.getFileAttributeView(
diff --git a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/BaseBuffer.java b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/BaseBuffer.java
index 3e1869e..9cd824e 100644
--- a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/BaseBuffer.java
+++ b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/BaseBuffer.java
@@ -21,7 +21,19 @@ package org.apache.datasketches.memory;
/**
* Defines the relative positional API.
- *
+ * This is different from and simpler than Java ByteBuffer positional API.
+ * <ul><li>All based on longs instead of ints.</li>
+ * <li>Eliminated "mark". Rarely used and confusing with its silent side effects.</li>
+ * <li>The invariants are {@code 0 <= start <= position <= end <= capacity}.</li>
+ * <li>It always starts up as (0, 0, capacity, capacity).</li>
+ * <li>You set (start, position, end) in one call with
+ * {@link #setStartPositionEnd(long, long, long)}</li>
+ * <li>Position can be set directly or indirectly when using the positional get/put methods.
+ * <li>Added incrementPosition(long), which is much easier when you know the increment.</li>
+ * <li>This approach eliminated a number of methods and checks, and has no unseen side effects,
+ * e.g., mark being invalidated.</li>
+ * <li>Clearer method naming (IMHO).</li>
+ * </ul>
* @author Lee Rhodes
*/
public interface BaseBuffer extends BaseState {
diff --git a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/BaseState.java b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/BaseState.java
index 2ec75cb..17ec307 100644
--- a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/BaseState.java
+++ b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/BaseState.java
@@ -31,6 +31,12 @@ import org.apache.datasketches.memory.internal.BaseStateImpl;
* @author Lee Rhodes
*/
public interface BaseState {
+
+ /**
+ * The java line separator character as a String.
+ */
+ static final String LS = System.getProperty("line.separator");
+
/**
* The placeholder for the default MemoryRequestServer, if set at all.
*/
diff --git a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java
index 42062c1..2aab739 100644
--- a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java
+++ b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/BaseStateImpl.java
@@ -19,10 +19,10 @@
package org.apache.datasketches.memory.internal;
-import static org.apache.datasketches.memory.internal.UnsafeUtil.LS;
import static org.apache.datasketches.memory.internal.UnsafeUtil.assertBounds;
import static org.apache.datasketches.memory.internal.UnsafeUtil.checkBounds;
import static org.apache.datasketches.memory.internal.UnsafeUtil.unsafe;
+import static org.apache.datasketches.memory.internal.Util.LS;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
diff --git a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/UnsafeUtil.java b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/UnsafeUtil.java
index 0a99211..8b391f2 100644
--- a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/UnsafeUtil.java
+++ b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/UnsafeUtil.java
@@ -78,8 +78,6 @@ public final class UnsafeUtil {
public static final long DOUBLE_SHIFT = 3;
public static final long OBJECT_SHIFT; // varies, 2 or 3 depending on coop
- public static final String LS = System.getProperty("line.separator");
-
//@formatter:on
static {
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMapMemoryTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMapMemoryTest.java
index 4911e7d..54a6b3f 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMapMemoryTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectMapMemoryTest.java
@@ -23,7 +23,8 @@
package org.apache.datasketches.memory.internal;
-import static org.apache.datasketches.memory.internal.Util.*;
+import static org.apache.datasketches.memory.internal.Util.LS;
+import static org.apache.datasketches.memory.internal.Util.getResourceFile;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -39,7 +40,6 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class AllocateDirectMapMemoryTest {
- private static final String LS = System.getProperty("line.separator");
MapHandle hand = null;
@BeforeClass
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java
index 9cecaaa..77df9e3 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/AllocateDirectWritableMapMemoryTest.java
@@ -24,6 +24,7 @@
package org.apache.datasketches.memory.internal;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.datasketches.memory.internal.Util.LS;
import static org.apache.datasketches.memory.internal.Util.getResourceFile;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
@@ -48,7 +49,6 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class AllocateDirectWritableMapMemoryTest {
- private static final String LS = System.getProperty("line.separator");
@BeforeClass
public void setReadOnly() {
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java
index 045c59f..07de3b4 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/MemoryTest.java
@@ -23,6 +23,7 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.LS;
import static org.apache.datasketches.memory.internal.Util.getResourceFile;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
@@ -46,7 +47,6 @@ import org.testng.annotations.Test;
import org.testng.collections.Lists;
public class MemoryTest {
- private static final String LS = System.getProperty("line.separator");
@BeforeClass
public void setReadOnly() {
diff --git a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/UtilTest.java b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/UtilTest.java
index 8dc1081..0b8b42c 100644
--- a/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/UtilTest.java
+++ b/datasketches-memory-java8/src/test/java/org/apache/datasketches/memory/internal/UtilTest.java
@@ -23,6 +23,7 @@
package org.apache.datasketches.memory.internal;
+import static org.apache.datasketches.memory.internal.Util.LS;
import static org.apache.datasketches.memory.internal.Util.characterPad;
import static org.apache.datasketches.memory.internal.Util.getResourceBytes;
import static org.apache.datasketches.memory.internal.Util.getResourceFile;
@@ -46,7 +47,6 @@ import org.apache.datasketches.memory.WritableMemory;
import org.testng.annotations.Test;
public class UtilTest {
- private static final String LS = System.getProperty("line.separator");
//Binary Search
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org