Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions java/vector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,6 @@
<artifactId>arrow-memory-unsafe</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</dependency>
<dependency>
<groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-java</artifactId>
Expand All @@ -74,6 +70,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.collections</groupId>
<artifactId>eclipse-collections</artifactId>
<version>11.1.0</version>
</dependency>
</dependencies>

<pluginRepositories>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,11 @@
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;

import org.apache.arrow.util.Preconditions;
import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import io.netty.util.collection.IntObjectHashMap;
import io.netty.util.collection.IntObjectMap;

/**
* An implementation of map that supports constant time look-up by a generic key or an ordinal.
*
Expand Down Expand Up @@ -133,9 +129,7 @@ public Set<K> keySet() {

@Override
public Collection<V> values() {
return StreamSupport.stream(secondary.entries().spliterator(), false)
.map((IntObjectMap.PrimitiveEntry<V> t) -> Preconditions.checkNotNull(t).value())
.collect(Collectors.toList());
return secondary.values();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import java.util.Set;
import java.util.stream.Collectors;

import io.netty.util.collection.IntObjectHashMap;
import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap;

/**
* An implementation of a multimap that supports constant time look-up by a generic key or an ordinal.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.arrow.vector.util;

import static junit.framework.TestCase.assertNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import java.util.Collection;

import org.junit.Before;
import org.junit.Test;

public class TestMapWithOrdinal {

private MapWithOrdinal<String, String> map;

@Before
public void setUp() {
map = new MapWithOrdinalImpl<>();
}

@Test
public void testGetByOrdinal() {
map.put("key0", "val0", true);
assertEquals("val0", map.getByOrdinal(0));

map.put("key1", "val1", true);
assertEquals("val1", map.getByOrdinal(1));
assertEquals("val0", map.getByOrdinal(0));
}

@Test
public void testGetByKey() {
map.put("key0", "val0", true);
assertEquals("val0", map.get("key0"));

map.put("key1", "val1", true);
assertEquals("val1", map.get("key1"));
assertEquals("val0", map.get("key0"));
}

@Test
public void testInvalidOrdinal() {
map.put("key0", "val0", true);
assertNull(map.getByOrdinal(1));

map.removeAll("key0");
assertNull(map.getByOrdinal(0));
}

@Test
public void testInvalidKey() {
MapWithOrdinalImpl<String, String> map = new MapWithOrdinalImpl<>();
map.put("key0", "val0", true);
assertNull(map.get("fake_key"));

map.removeAll("key0");
assertNull(map.get("key0"));
}

@Test
public void testValues() {
map.put("key0", "val0", true);
map.put("key1", "val1", true);

Collection<String> values = map.values();
assertTrue(values.contains("val0"));
assertTrue(values.contains("val1"));

map.put("key1", "new_val1", true);
values = map.values();
assertTrue(values.contains("val0"));
assertTrue(values.contains("new_val1"));
assertFalse(values.contains("val1"));

map.removeAll("key0");
assertTrue(values.contains("new_val1"));
assertFalse(values.contains("val0"));
}
}