OakHashMap Api (#161)

* started OakHashMap * OakHashMap cont * done OakHashMap * reformat code * Hashcode type added * hash function wrapper * reformat code * issue #141 * reformat code * removed oakhashFunction * OakHashMapBuilder removed * concurrentzcmap * removed InternalOakHashMap * reformat code * templated tests * renamed check to checkPreconditions * replaced getvalue mannager with memorySize() * seperated mapapi tests and paramterizedMapApiTest * changed mapapi tests
yahoo · Jun 21, 2021 · 91da8fb · 91da8fb
1 parent c2c882e
commit 91da8fb
Show file tree

Hide file tree

Showing 30 changed files with 1,371 additions and 228 deletions.
diff --git a/benchmarks/jmh/src/main/java/com/yahoo/oak/GetBenchmark.java b/benchmarks/jmh/src/main/java/com/yahoo/oak/GetBenchmark.java
@@ -46,7 +46,7 @@ public static class BenchmarkState {
         @Setup()
         public void setup() {
             OakMapBuilder<String, String> builder = OakCommonBuildersFactory.getDefaultStringBuilder();
-            oakMap = builder.build();
+            oakMap = builder.buildOrderedMap();
 
             keys = new ArrayList<>(numRows);
             for (int i = 0; i < numRows; ++i) {

diff --git a/benchmarks/jmh/src/main/java/com/yahoo/oak/PutBenchmark.java b/benchmarks/jmh/src/main/java/com/yahoo/oak/PutBenchmark.java
@@ -46,7 +46,7 @@ public static class BenchmarkState {
         @Setup(Level.Iteration)
         public void setup() {
             OakMapBuilder<String, String> builder = OakCommonBuildersFactory.getDefaultStringBuilder();
-            oakMap = builder.build();
+            oakMap = builder.buildOrderedMap();
         }
 
         @TearDown

diff --git a/benchmarks/jmh/src/main/java/com/yahoo/oak/ScanBenchmark.java b/benchmarks/jmh/src/main/java/com/yahoo/oak/ScanBenchmark.java
@@ -51,7 +51,7 @@ public class ScanBenchmark {
     @Setup
     public void setup() {
         OakMapBuilder<String, String> builder = OakCommonBuildersFactory.getDefaultStringBuilder();
-        oakMap = builder.build();
+        oakMap = builder.buildOrderedMap();
 
         for (int i = 0; i < numRows; ++i) {
             String key = String.format("%0$" + KEY_SIZE_BYTES / Character.BYTES + "s",

diff --git a/benchmarks/synchrobench/src/main/java/com/yahoo/oak/OakMyBufferMap.java b/benchmarks/synchrobench/src/main/java/com/yahoo/oak/OakMyBufferMap.java
@@ -33,7 +33,7 @@ public OakMyBufferMap() {
                 MyBuffer.DEFAULT_COMPARATOR, MyBuffer.DEFAULT_SERIALIZER, MyBuffer.DEFAULT_SERIALIZER, minKey)
                 .setChunkMaxItems(Chunk.MAX_ITEMS_DEFAULT)
                 .setMemoryAllocator(ma);
-        oak = builder.build();
+        oak = builder.buildOrderedMap();
     }
 
     public long allocated() {
@@ -140,7 +140,7 @@ public void clear() {
                 MyBuffer.DEFAULT_COMPARATOR, MyBuffer.DEFAULT_SERIALIZER, MyBuffer.DEFAULT_SERIALIZER, minKey)
                 .setChunkMaxItems(Chunk.MAX_ITEMS_DEFAULT)
                 .setMemoryAllocator(ma);
-        oak = builder.build();
+        oak = builder.buildOrderedMap();
     }
 
     @Override

diff --git a/core/src/main/java/com/yahoo/oak/ConcurrentZCMap.java b/core/src/main/java/com/yahoo/oak/ConcurrentZCMap.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020, Verizon Media.
+ * Licensed under the terms of the Apache 2.0 license.
+ * Please see LICENSE file in the project root for terms.
+ */
+
+package com.yahoo.oak;
+
+import java.io.Closeable;
+import java.util.concurrent.ConcurrentMap;
+
+public interface ConcurrentZCMap<K , V> extends ConcurrentMap<K , V>, Closeable {
+    ZeroCopyMap<K , V> zc();
+    long memorySize();
+    void close();
+}