From e3529f68d195f1c00d03145c177cf67b69f96f02 Mon Sep 17 00:00:00 2001 From: Ivan Sadikov Date: Wed, 29 Nov 2017 16:06:53 +1300 Subject: [PATCH] fix low cost identity hash map name --- .../org/apache/arrow/memory/AllocationManager.java | 2 +- ...IdentityHasMap.java => LowCostIdentityHashMap.java} | 10 +++++----- ...tityHasMap.java => TestLowCostIdentityHashMap.java} | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) rename java/memory/src/main/java/org/apache/arrow/memory/{LowCostIdentityHasMap.java => LowCostIdentityHashMap.java} (98%) rename java/memory/src/test/java/org/apache/arrow/memory/{TestLowCostIdentityHasMap.java => TestLowCostIdentityHashMap.java} (95%) diff --git a/java/memory/src/main/java/org/apache/arrow/memory/AllocationManager.java b/java/memory/src/main/java/org/apache/arrow/memory/AllocationManager.java index 14687b54634..419be342972 100644 --- a/java/memory/src/main/java/org/apache/arrow/memory/AllocationManager.java +++ b/java/memory/src/main/java/org/apache/arrow/memory/AllocationManager.java @@ -76,7 +76,7 @@ public class AllocationManager { private final UnsafeDirectLittleEndian underlying; // ARROW-1627 Trying to minimize memory overhead caused by previously used IdentityHashMap // see JIRA for details - private final LowCostIdentityHasMap map = new LowCostIdentityHasMap<>(); + private final LowCostIdentityHashMap map = new LowCostIdentityHashMap<>(); private final ReadWriteLock lock = new ReentrantReadWriteLock(); private final AutoCloseableLock readLock = new AutoCloseableLock(lock.readLock()); private final AutoCloseableLock writeLock = new AutoCloseableLock(lock.writeLock()); diff --git a/java/memory/src/main/java/org/apache/arrow/memory/LowCostIdentityHasMap.java b/java/memory/src/main/java/org/apache/arrow/memory/LowCostIdentityHashMap.java similarity index 98% rename from java/memory/src/main/java/org/apache/arrow/memory/LowCostIdentityHasMap.java rename to java/memory/src/main/java/org/apache/arrow/memory/LowCostIdentityHashMap.java index 1153fb59364..fb7033815d5 100644 --- a/java/memory/src/main/java/org/apache/arrow/memory/LowCostIdentityHasMap.java +++ b/java/memory/src/main/java/org/apache/arrow/memory/LowCostIdentityHashMap.java @@ -28,7 +28,7 @@ * that provides "getKey" method * @param */ -public class LowCostIdentityHasMap> { +public class LowCostIdentityHashMap> { /* * The internal data structure to hold values. @@ -52,7 +52,7 @@ public class LowCostIdentityHasMap> { /** * Creates an Map with default expected maximum size. */ - public LowCostIdentityHasMap() { + public LowCostIdentityHashMap() { this(DEFAULT_MIN_SIZE); } @@ -63,7 +63,7 @@ public LowCostIdentityHasMap() { * The estimated maximum number of entries that will be put in * this map. */ - public LowCostIdentityHasMap(int maxSize) { + public LowCostIdentityHashMap(int maxSize) { if (maxSize >= 0) { this.size = 0; threshold = getThreshold(maxSize); @@ -96,7 +96,7 @@ private int computeElementArraySize() { private Object[] newElementArray(int s) { return new Object[s]; } - + /** * Removes all elements from this map, leaving it empty. * @@ -331,4 +331,4 @@ public V getNextValue() { } return null; } -} \ No newline at end of file +} diff --git a/java/memory/src/test/java/org/apache/arrow/memory/TestLowCostIdentityHasMap.java b/java/memory/src/test/java/org/apache/arrow/memory/TestLowCostIdentityHashMap.java similarity index 95% rename from java/memory/src/test/java/org/apache/arrow/memory/TestLowCostIdentityHasMap.java rename to java/memory/src/test/java/org/apache/arrow/memory/TestLowCostIdentityHashMap.java index c1196147b49..0237b38048f 100644 --- a/java/memory/src/test/java/org/apache/arrow/memory/TestLowCostIdentityHasMap.java +++ b/java/memory/src/test/java/org/apache/arrow/memory/TestLowCostIdentityHashMap.java @@ -27,11 +27,11 @@ /** * To test simplified implementation of IdentityHashMap */ -public class TestLowCostIdentityHasMap { +public class TestLowCostIdentityHashMap { @Test public void testIdentityHashMap() throws Exception { - LowCostIdentityHasMap hashMap = new LowCostIdentityHasMap<>(); + LowCostIdentityHashMap hashMap = new LowCostIdentityHashMap<>(); StringWithKey obj1 = new StringWithKey("s1key", "s1value"); StringWithKey obj2 = new StringWithKey("s2key", "s2value"); @@ -88,7 +88,7 @@ public void testIdentityHashMap() throws Exception { @Test public void testLargeMap() throws Exception { - LowCostIdentityHasMap hashMap = new LowCostIdentityHasMap<>(); + LowCostIdentityHashMap hashMap = new LowCostIdentityHashMap<>(); String [] keys = new String[200]; for (int i = 0; i < 200; i++) {