You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by pa...@apache.org on 2015/06/29 20:42:35 UTC
drill git commit: DRILL-3199 Implemented GenericAccessor.isNull(),
added unit tests
Repository: drill
Updated Branches:
refs/heads/master c1998605d -> dbd8925a4
DRILL-3199 Implemented GenericAccessor.isNull(), added unit tests
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/dbd8925a
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/dbd8925a
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/dbd8925a
Branch: refs/heads/master
Commit: dbd8925a4fbabbb92ced632696226a2578241024
Parents: c199860
Author: Matthew Burgess <mb...@pentaho.com>
Authored: Sun Jun 28 21:19:31 2015 -0400
Committer: Parth Chandra <pa...@apache.org>
Committed: Mon Jun 29 11:42:07 2015 -0700
----------------------------------------------------------------------
.../exec/vector/accessor/GenericAccessor.java | 2 +-
.../vector/accessor/GenericAccessorTest.java | 105 +++++++++++++++++++
2 files changed, 106 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/dbd8925a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/GenericAccessor.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/GenericAccessor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/GenericAccessor.java
index 347cf26..65c34ad 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/GenericAccessor.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/GenericAccessor.java
@@ -30,7 +30,7 @@ public class GenericAccessor extends AbstractSqlAccessor {
@Override
public boolean isNull(int index) {
- throw new UnsupportedOperationException();
+ return v.getAccessor().isNull(index);
}
@Override
http://git-wip-us.apache.org/repos/asf/drill/blob/dbd8925a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/accessor/GenericAccessorTest.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/accessor/GenericAccessorTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/accessor/GenericAccessorTest.java
new file mode 100644
index 0000000..423ac01
--- /dev/null
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/accessor/GenericAccessorTest.java
@@ -0,0 +1,105 @@
+/**
+ * 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.drill.exec.vector.accessor;
+
+import org.apache.drill.exec.proto.UserBitShared;
+import org.apache.drill.exec.vector.ValueVector;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class GenericAccessorTest {
+
+ public static final Object NON_NULL_VALUE = "Non-null value";
+
+ private GenericAccessor genericAccessor;
+ private ValueVector valueVector;
+ private ValueVector.Accessor accessor;
+ private UserBitShared.SerializedField metadata;
+
+ @Before
+ public void setUp() throws Exception {
+ // Set up a mock accessor that has two columns, one non-null and one null
+ accessor = mock(ValueVector.Accessor.class);
+ when(accessor.getObject(anyInt())).thenAnswer(new Answer<Object>() {
+
+ @Override
+ public Object answer(InvocationOnMock invocationOnMock) throws Throwable {
+ Object[] args = invocationOnMock.getArguments();
+ Integer index = (Integer) args[0];
+ if(index == 0) {
+ return NON_NULL_VALUE;
+ }
+ if(index == 1) {
+ return null;
+ }
+ throw new IndexOutOfBoundsException("Index out of bounds");
+ }
+ });
+ when(accessor.isNull(anyInt())).thenAnswer(new Answer<Object>() {
+
+ @Override
+ public Object answer(InvocationOnMock invocationOnMock) throws Throwable {
+ Object[] args = invocationOnMock.getArguments();
+ Integer index = (Integer) args[0];
+ if(index == 0) {
+ return false;
+ }
+ return true;
+ }
+ });
+
+ metadata = UserBitShared.SerializedField.getDefaultInstance();
+ valueVector = mock(ValueVector.class);
+ when(valueVector.getAccessor()).thenReturn(accessor);
+ when(valueVector.getMetadata()).thenReturn(metadata);
+
+ genericAccessor = new GenericAccessor(valueVector);
+ }
+
+ @Test
+ public void testIsNull() throws Exception {
+ assertFalse(genericAccessor.isNull(0));
+ assertTrue(genericAccessor.isNull(1));
+ }
+
+ @Test
+ public void testGetObject() throws Exception {
+ assertEquals(NON_NULL_VALUE, genericAccessor.getObject(0));
+ assertNull(genericAccessor.getObject(1));
+ }
+
+ @Test(expected=IndexOutOfBoundsException.class)
+ public void testGetObject_indexOutOfBounds() throws Exception {
+ genericAccessor.getObject(2);
+ }
+
+ @Test
+ public void testGetType() throws Exception {
+ assertEquals(UserBitShared.SerializedField.getDefaultInstance().getMajorType(), genericAccessor.getType());
+ }
+}