You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2014/09/08 06:38:26 UTC
svn commit: r1623263 [24/28] - in /hive/branches/spark: ./
accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/
ant/src/org/apache/hadoop/hive/ant/ beeline/src/java/org/apache/hive/beeline/
beeline/src/test/org/apache/hive/beeline/ bin/...
Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPEqualOrLessThan.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPEqualOrLessThan.java?rev=1623263&r1=1623262&r2=1623263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPEqualOrLessThan.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPEqualOrLessThan.java Mon Sep 8 04:38:17 2014
@@ -35,9 +35,14 @@ import org.apache.hadoop.io.Text;
DoubleColLessEqualLongScalar.class, DoubleColLessEqualDoubleScalar.class,
LongScalarLessEqualLongColumn.class, LongScalarLessEqualDoubleColumn.class,
DoubleScalarLessEqualLongColumn.class, DoubleScalarLessEqualDoubleColumn.class,
- StringColLessEqualStringColumn.class, StringColLessEqualStringScalar.class,
- StringScalarLessEqualStringColumn.class, FilterStringColLessEqualStringColumn.class,
- FilterStringColLessEqualStringScalar.class, FilterStringScalarLessEqualStringColumn.class,
+ StringGroupColLessEqualStringGroupColumn.class, FilterStringGroupColLessEqualStringGroupColumn.class,
+ StringGroupColLessEqualStringScalar.class,
+ StringGroupColLessEqualVarCharScalar.class, StringGroupColLessEqualCharScalar.class,
+ StringScalarLessEqualStringGroupColumn.class,
+ VarCharScalarLessEqualStringGroupColumn.class, CharScalarLessEqualStringGroupColumn.class,
+ FilterStringGroupColLessEqualStringScalar.class, FilterStringScalarLessEqualStringGroupColumn.class,
+ FilterStringGroupColLessEqualVarCharScalar.class, FilterVarCharScalarLessEqualStringGroupColumn.class,
+ FilterStringGroupColLessEqualCharScalar.class, FilterCharScalarLessEqualStringGroupColumn.class,
FilterLongColLessEqualLongColumn.class, FilterLongColLessEqualDoubleColumn.class,
FilterDoubleColLessEqualLongColumn.class, FilterDoubleColLessEqualDoubleColumn.class,
FilterLongColLessEqualLongScalar.class, FilterLongColLessEqualDoubleScalar.class,
Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPGreaterThan.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPGreaterThan.java?rev=1623263&r1=1623262&r2=1623263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPGreaterThan.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPGreaterThan.java Mon Sep 8 04:38:17 2014
@@ -35,9 +35,14 @@ import org.apache.hadoop.io.Text;
DoubleColGreaterLongScalar.class, DoubleColGreaterDoubleScalar.class,
LongScalarGreaterLongColumn.class, LongScalarGreaterDoubleColumn.class,
DoubleScalarGreaterLongColumn.class, DoubleScalarGreaterDoubleColumn.class,
- StringColGreaterStringColumn.class, StringColGreaterStringScalar.class,
- StringScalarGreaterStringColumn.class, FilterStringColGreaterStringColumn.class,
- FilterStringColGreaterStringScalar.class, FilterStringScalarGreaterStringColumn.class,
+ StringGroupColGreaterStringGroupColumn.class, FilterStringGroupColGreaterStringGroupColumn.class,
+ StringGroupColGreaterStringScalar.class,
+ StringGroupColGreaterVarCharScalar.class, StringGroupColGreaterCharScalar.class,
+ StringScalarGreaterStringGroupColumn.class,
+ VarCharScalarGreaterStringGroupColumn.class, CharScalarGreaterStringGroupColumn.class,
+ FilterStringGroupColGreaterStringScalar.class, FilterStringScalarGreaterStringGroupColumn.class,
+ FilterStringGroupColGreaterVarCharScalar.class, FilterVarCharScalarGreaterStringGroupColumn.class,
+ FilterStringGroupColGreaterCharScalar.class, FilterCharScalarGreaterStringGroupColumn.class,
FilterLongColGreaterLongColumn.class, FilterLongColGreaterDoubleColumn.class,
FilterDoubleColGreaterLongColumn.class, FilterDoubleColGreaterDoubleColumn.class,
FilterLongColGreaterLongScalar.class, FilterLongColGreaterDoubleScalar.class,
Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPLessThan.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPLessThan.java?rev=1623263&r1=1623262&r2=1623263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPLessThan.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPLessThan.java Mon Sep 8 04:38:17 2014
@@ -35,9 +35,14 @@ import org.apache.hadoop.io.Text;
DoubleColLessLongScalar.class, DoubleColLessDoubleScalar.class,
LongScalarLessLongColumn.class, LongScalarLessDoubleColumn.class,
DoubleScalarLessLongColumn.class, DoubleScalarLessDoubleColumn.class,
- StringColLessStringColumn.class, StringColLessStringScalar.class,
- StringScalarLessStringColumn.class, FilterStringColLessStringColumn.class,
- FilterStringColLessStringScalar.class, FilterStringScalarLessStringColumn.class,
+ StringGroupColLessStringGroupColumn.class, FilterStringGroupColLessStringGroupColumn.class,
+ StringGroupColLessStringScalar.class,
+ StringGroupColLessVarCharScalar.class, StringGroupColLessCharScalar.class,
+ StringScalarLessStringGroupColumn.class,
+ VarCharScalarLessStringGroupColumn.class, CharScalarLessStringGroupColumn.class,
+ FilterStringGroupColLessStringScalar.class, FilterStringScalarLessStringGroupColumn.class,
+ FilterStringGroupColLessVarCharScalar.class, FilterVarCharScalarLessStringGroupColumn.class,
+ FilterStringGroupColLessCharScalar.class, FilterCharScalarLessStringGroupColumn.class,
FilterLongColLessLongColumn.class, FilterLongColLessDoubleColumn.class,
FilterDoubleColLessLongColumn.class, FilterDoubleColLessDoubleColumn.class,
FilterLongColLessLongScalar.class, FilterLongColLessDoubleScalar.class,
Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPNotEqual.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPNotEqual.java?rev=1623263&r1=1623262&r2=1623263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPNotEqual.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPNotEqual.java Mon Sep 8 04:38:17 2014
@@ -34,9 +34,14 @@ import org.apache.hadoop.hive.serde2.obj
DoubleColNotEqualLongScalar.class, DoubleColNotEqualDoubleScalar.class,
LongScalarNotEqualLongColumn.class, LongScalarNotEqualDoubleColumn.class,
DoubleScalarNotEqualLongColumn.class, DoubleScalarNotEqualDoubleColumn.class,
- StringColNotEqualStringColumn.class, StringColNotEqualStringScalar.class,
- StringScalarNotEqualStringColumn.class, FilterStringColNotEqualStringColumn.class,
- FilterStringColNotEqualStringScalar.class, FilterStringScalarNotEqualStringColumn.class,
+ StringGroupColNotEqualStringGroupColumn.class, FilterStringGroupColNotEqualStringGroupColumn.class,
+ StringGroupColNotEqualStringScalar.class,
+ StringGroupColNotEqualVarCharScalar.class, StringGroupColNotEqualCharScalar.class,
+ StringScalarNotEqualStringGroupColumn.class,
+ VarCharScalarNotEqualStringGroupColumn.class, CharScalarNotEqualStringGroupColumn.class,
+ FilterStringGroupColNotEqualStringScalar.class, FilterStringScalarNotEqualStringGroupColumn.class,
+ FilterStringGroupColNotEqualVarCharScalar.class, FilterVarCharScalarNotEqualStringGroupColumn.class,
+ FilterStringGroupColNotEqualCharScalar.class, FilterCharScalarNotEqualStringGroupColumn.class,
FilterLongColNotEqualLongColumn.class, FilterLongColNotEqualDoubleColumn.class,
FilterDoubleColNotEqualLongColumn.class, FilterDoubleColNotEqualDoubleColumn.class,
FilterLongColNotEqualLongScalar.class, FilterLongColNotEqualDoubleScalar.class,
Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFRpad.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFRpad.java?rev=1623263&r1=1623262&r2=1623263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFRpad.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFRpad.java Mon Sep 8 04:38:17 2014
@@ -48,7 +48,7 @@ public class GenericUDFRpad extends Gene
// Copy the padding
while (pos < len) {
for (int i = 0; i < pad.getLength() && i < len - pos; i++) {
- data[pos + i] = padTxt[i];
+ data[pos + i] = padTxt[i];
}
pos += pad.getLength();
}
Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToBinary.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToBinary.java?rev=1623263&r1=1623262&r2=1623263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToBinary.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToBinary.java Mon Sep 8 04:38:17 2014
@@ -59,7 +59,7 @@ public class GenericUDFToBinary extends
|| (argumentOI instanceof StringObjectInspector)
|| (argumentOI instanceof VoidObjectInspector))){
throw new UDFArgumentException("Only string, char, varchar or binary data can be cast into binary " +
- "data types.");
+ "data types.");
}
baConverter = new BinaryConverter(argumentOI,
PrimitiveObjectInspectorFactory.writableBinaryObjectInspector);
Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFJSONTuple.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFJSONTuple.java?rev=1623263&r1=1623262&r2=1623263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFJSONTuple.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFJSONTuple.java Mon Sep 8 04:38:17 2014
@@ -47,7 +47,7 @@ import org.codehaus.jackson.type.JavaTyp
*/
@Description(name = "json_tuple",
value = "_FUNC_(jsonStr, p1, p2, ..., pn) - like get_json_object, but it takes multiple names and return a tuple. " +
- "All the input parameters and output column types are string.")
+ "All the input parameters and output column types are string.")
public class GenericUDTFJSONTuple extends GenericUDTF {
@@ -106,7 +106,7 @@ public class GenericUDTFJSONTuple extend
if (numCols < 1) {
throw new UDFArgumentException("json_tuple() takes at least two arguments: " +
- "the json string and a path expression");
+ "the json string and a path expression");
}
for (int i = 0; i < args.length; ++i) {
Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFParseUrlTuple.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFParseUrlTuple.java?rev=1623263&r1=1623262&r2=1623263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFParseUrlTuple.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFParseUrlTuple.java Mon Sep 8 04:38:17 2014
@@ -86,7 +86,7 @@ public class GenericUDTFParseUrlTuple ex
if (numCols < 1) {
throw new UDFArgumentException("parse_url_tuple() takes at least two arguments: " +
- "the url string and a part name");
+ "the url string and a part name");
}
for (int i = 0; i < args.length; ++i) {
Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/ptf/MatchPath.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/ptf/MatchPath.java?rev=1623263&r1=1623262&r2=1623263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/ptf/MatchPath.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/udf/ptf/MatchPath.java Mon Sep 8 04:38:17 2014
@@ -225,7 +225,7 @@ public class MatchPath extends TableFunc
if ( symbolArgsSz % 2 != 0)
{
throwErrorWithSignature("Symbol Name, Expression need to be specified in pairs: " +
- "there are odd number of symbol args");
+ "there are odd number of symbol args");
}
evaluator.symInfo = new SymbolsInfo(symbolArgsSz/2);
@@ -253,7 +253,7 @@ public class MatchPath extends TableFunc
PrimitiveObjectInspector.PrimitiveCategory.BOOLEAN )
{
throwErrorWithSignature(String.format("Currently a Symbol Expression(%s) " +
- "must be a boolean expression", symolExprArg.getExpressionTreeString()));
+ "must be a boolean expression", symolExprArg.getExpressionTreeString()));
}
evaluator.symInfo.add(symbolName, symolExprArg);
}
Modified: hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/TestUtilities.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/TestUtilities.java?rev=1623263&r1=1623262&r2=1623263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/TestUtilities.java (original)
+++ hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/TestUtilities.java Mon Sep 8 04:38:17 2014
@@ -20,15 +20,22 @@ package org.apache.hadoop.hive.ql.exec;
import static org.apache.hadoop.hive.ql.exec.Utilities.getFileExtension;
+import java.io.File;
import java.io.IOException;
import java.sql.Timestamp;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
+import com.google.common.collect.Sets;
+import com.google.common.io.Files;
+import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat;
import org.apache.hadoop.hive.ql.metadata.HiveException;
@@ -39,9 +46,9 @@ import org.apache.hadoop.hive.ql.session
import org.apache.hadoop.hive.ql.udf.generic.GenericUDFFromUtcTimestamp;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
import org.apache.hadoop.mapred.JobConf;
-import org.junit.Test;
public class TestUtilities extends TestCase {
+ public static final Log LOG = LogFactory.getLog(TestUtilities.class);
public void testGetFileExtension() {
JobConf jc = new JobConf();
@@ -77,9 +84,9 @@ public class TestUtilities extends TestC
List<ExprNodeDesc> children = new ArrayList<ExprNodeDesc>(1);
children.add(constant);
ExprNodeGenericFuncDesc desc = new ExprNodeGenericFuncDesc(TypeInfoFactory.timestampTypeInfo,
- new GenericUDFFromUtcTimestamp(), children);
+ new GenericUDFFromUtcTimestamp(), children);
assertEquals(desc.getExprString(), Utilities.deserializeExpression(
- Utilities.serializeExpression(desc)).getExprString());
+ Utilities.serializeExpression(desc)).getExprString());
}
public void testgetDbTableName() throws HiveException{
@@ -110,22 +117,27 @@ public class TestUtilities extends TestC
}
}
- @Test
- public void testFSUmaskReset() throws Exception {
- // ensure that FS Umask is not reset (HIVE-7001)
- checkFSUMaskReset(true);
- checkFSUMaskReset(false);
- }
-
- private void checkFSUMaskReset(boolean recursiveArg) throws IllegalArgumentException, IOException {
- final String FS_MASK_VAL = "055";
- HiveConf conf = new HiveConf();
- String dir = System.getProperty("test.tmp.dir") + "/testUtilitiesUMaskReset";
- conf.set(FsPermission.UMASK_LABEL, FS_MASK_VAL);
- Utilities.createDirsWithPermission(conf, new Path(dir), new FsPermission((short) 00777),
- recursiveArg);
- assertEquals(conf.get(FsPermission.UMASK_LABEL), FS_MASK_VAL);
+ public void testGetJarFilesByPath() {
+ File f = Files.createTempDir();
+ String jarFileName1 = f.getAbsolutePath() + File.separator + "a.jar";
+ String jarFileName2 = f.getAbsolutePath() + File.separator + "b.jar";
+ File jarFile = new File(jarFileName1);
+ try {
+ FileUtils.touch(jarFile);
+ HashSet<String> jars = (HashSet) Utilities.getJarFilesByPath(f.getAbsolutePath());
+ Assert.assertEquals(Sets.newHashSet(jarFile.getAbsolutePath()),jars);
+
+ File jarFile2 = new File(jarFileName2);
+ FileUtils.touch(jarFile2);
+ String newPath = "file://" + jarFileName1 + "," + "file://" + jarFileName2;
+ jars = (HashSet) Utilities.getJarFilesByPath(newPath);
+
+ Assert.assertEquals(Sets.newHashSet("file://" + jarFileName1, "file://" + jarFileName2), jars);
+ } catch (IOException e) {
+ LOG.error("failed to copy file to reloading folder", e);
+ Assert.fail(e.getMessage());
+ } finally {
+ FileUtils.deleteQuietly(f);
+ }
}
-
-
}
Modified: hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java?rev=1623263&r1=1623262&r2=1623263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java (original)
+++ hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTask.java Mon Sep 8 04:38:17 2014
@@ -33,7 +33,6 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -54,7 +53,7 @@ import org.apache.hadoop.hive.ql.session
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.yarn.api.records.LocalResource;
import org.apache.hadoop.yarn.api.records.Resource;
-import org.apache.tez.client.TezSession;
+import org.apache.tez.client.TezClient;
import org.apache.tez.dag.api.DAG;
import org.apache.tez.dag.api.Edge;
import org.apache.tez.dag.api.EdgeProperty;
@@ -75,7 +74,7 @@ public class TestTezTask {
ReduceWork[] rws;
TezWork work;
TezTask task;
- TezSession session;
+ TezClient session;
TezSessionState sessionState;
JobConf conf;
LocalResource appLr;
@@ -97,18 +96,18 @@ public class TestTezTask {
@Override
public Vertex answer(InvocationOnMock invocation) throws Throwable {
Object[] args = invocation.getArguments();
- return new Vertex(((BaseWork)args[1]).getName(),
+ return Vertex.create(((BaseWork)args[1]).getName(),
mock(ProcessorDescriptor.class), 0, mock(Resource.class));
}
});
- when(utils.createEdge(any(JobConf.class), any(Vertex.class), any(JobConf.class),
+ when(utils.createEdge(any(JobConf.class), any(Vertex.class),
any(Vertex.class), any(TezEdgeProperty.class))).thenAnswer(new Answer<Edge>() {
@Override
public Edge answer(InvocationOnMock invocation) throws Throwable {
Object[] args = invocation.getArguments();
- return new Edge((Vertex)args[1], (Vertex)args[3], mock(EdgeProperty.class));
+ return Edge.create((Vertex)args[1], (Vertex)args[2], mock(EdgeProperty.class));
}
});
@@ -158,10 +157,10 @@ public class TestTezTask {
appLr = mock(LocalResource.class);
SessionState.start(new HiveConf());
- session = mock(TezSession.class);
+ session = mock(TezClient.class);
sessionState = mock(TezSessionState.class);
when(sessionState.getSession()).thenReturn(session);
- when(session.submitDAG(any(DAG.class), any(Map.class)))
+ when(session.submitDAG(any(DAG.class)))
.thenThrow(new SessionNotRunning(""))
.thenReturn(mock(DAGClient.class));
}
@@ -186,7 +185,7 @@ public class TestTezTask {
for (BaseWork x: work.getChildren(w)) {
boolean found = false;
for (Vertex u: outs) {
- if (u.getVertexName().equals(x.getName())) {
+ if (u.getName().equals(x.getName())) {
found = true;
break;
}
@@ -204,12 +203,12 @@ public class TestTezTask {
@Test
public void testSubmit() throws Exception {
- DAG dag = new DAG("test");
+ DAG dag = DAG.create("test");
task.submit(conf, dag, path, appLr, sessionState, new LinkedList());
// validate close/reopen
verify(sessionState, times(1)).open(any(HiveConf.class));
verify(sessionState, times(1)).close(eq(false)); // now uses pool after HIVE-7043
- verify(session, times(2)).submitDAG(any(DAG.class), any(Map.class));
+ verify(session, times(2)).submitDAG(any(DAG.class));
}
@Test
Modified: hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorizationContext.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorizationContext.java?rev=1623263&r1=1623262&r2=1623263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorizationContext.java (original)
+++ hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorizationContext.java Mon Sep 8 04:38:17 2014
@@ -29,7 +29,9 @@ import java.util.Map;
import junit.framework.Assert;
+import org.apache.hadoop.hive.common.type.HiveChar;
import org.apache.hadoop.hive.common.type.HiveDecimal;
+import org.apache.hadoop.hive.common.type.HiveVarchar;
import org.apache.hadoop.hive.ql.exec.vector.expressions.ColAndCol;
import org.apache.hadoop.hive.ql.exec.vector.expressions.ColOrCol;
import org.apache.hadoop.hive.ql.exec.vector.expressions.DoubleColumnInList;
@@ -38,10 +40,14 @@ import org.apache.hadoop.hive.ql.exec.ve
import org.apache.hadoop.hive.ql.exec.vector.expressions.FuncLogWithBaseDoubleToDouble;
import org.apache.hadoop.hive.ql.exec.vector.expressions.FuncLogWithBaseLongToDouble;
import org.apache.hadoop.hive.ql.exec.vector.expressions.FuncPowerDoubleToDouble;
-import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringColumnStringColumn;
-import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringColumnStringScalar;
-import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringScalarStringColumn;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprCharScalarStringGroupColumn;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringGroupColumnCharScalar;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringGroupColumnStringGroupColumn;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringGroupColumnStringScalar;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringGroupColumnVarCharScalar;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringScalarStringGroupColumn;
import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringScalarStringScalar;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprVarCharScalarStringGroupColumn;
import org.apache.hadoop.hive.ql.exec.vector.expressions.IsNotNull;
import org.apache.hadoop.hive.ql.exec.vector.expressions.IsNull;
import org.apache.hadoop.hive.ql.exec.vector.expressions.LongColumnInList;
@@ -80,10 +86,14 @@ import org.apache.hadoop.hive.ql.exec.ve
import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FilterLongColumnBetween;
import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FilterLongColumnNotBetween;
import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FilterLongScalarGreaterLongColumn;
-import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FilterStringColGreaterStringColumn;
-import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FilterStringColGreaterStringScalar;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FilterStringGroupColGreaterStringGroupColumn;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FilterStringGroupColGreaterStringScalar;
import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FilterStringColumnBetween;
import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FilterStringColumnNotBetween;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FilterVarCharColumnBetween;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FilterVarCharColumnNotBetween;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FilterCharColumnBetween;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FilterCharColumnNotBetween;
import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FuncLnDoubleToDouble;
import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FuncRoundDoubleToDouble;
import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.FuncSinDoubleToDouble;
@@ -128,6 +138,8 @@ import org.apache.hadoop.hive.ql.udf.gen
import org.apache.hadoop.hive.ql.udf.generic.GenericUDFToDecimal;
import org.apache.hadoop.hive.ql.udf.generic.GenericUDFToUnixTimeStamp;
import org.apache.hadoop.hive.ql.udf.generic.GenericUDFTimestamp;
+import org.apache.hadoop.hive.serde2.typeinfo.CharTypeInfo;
+import org.apache.hadoop.hive.serde2.typeinfo.VarcharTypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.DecimalTypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
import org.junit.Test;
@@ -139,39 +151,39 @@ public class TestVectorizationContext {
VectorUDFUnixTimeStampLong v1 = new VectorUDFUnixTimeStampLong();
VectorExpressionDescriptor.Builder builder1 = new VectorExpressionDescriptor.Builder();
VectorExpressionDescriptor.Descriptor d1 = builder1.setMode(VectorExpressionDescriptor.Mode.PROJECTION)
- .setNumArguments(1).setArgumentTypes(VectorExpressionDescriptor.ArgumentType.LONG)
+ .setNumArguments(1).setArgumentTypes(VectorExpressionDescriptor.ArgumentType.INT_DATETIME_FAMILY)
.setInputExpressionTypes(VectorExpressionDescriptor.InputExpressionType.COLUMN).build();
- Assert.assertEquals(d1, v1.getDescriptor());
+ assertTrue(d1.matches(v1.getDescriptor()));
VectorExpressionDescriptor.Builder builder2 = new VectorExpressionDescriptor.Builder();
VectorExpressionDescriptor.Descriptor d2 = builder2.setMode(VectorExpressionDescriptor.Mode.FILTER)
- .setNumArguments(2).setArgumentTypes(VectorExpressionDescriptor.ArgumentType.LONG,
- VectorExpressionDescriptor.ArgumentType.DOUBLE).setInputExpressionTypes(
+ .setNumArguments(2).setArgumentTypes(VectorExpressionDescriptor.ArgumentType.INT_FAMILY,
+ VectorExpressionDescriptor.ArgumentType.FLOAT_FAMILY).setInputExpressionTypes(
VectorExpressionDescriptor.InputExpressionType.COLUMN,
VectorExpressionDescriptor.InputExpressionType.SCALAR).build();
FilterLongColLessDoubleScalar v2 = new FilterLongColLessDoubleScalar();
- Assert.assertEquals(d2, v2.getDescriptor());
+ assertTrue(d2.matches(v2.getDescriptor()));
VectorExpressionDescriptor.Builder builder3 = new VectorExpressionDescriptor.Builder();
VectorExpressionDescriptor.Descriptor d3 = builder3.setMode(VectorExpressionDescriptor.Mode.PROJECTION)
.setNumArguments(1).setArgumentTypes(VectorExpressionDescriptor.ArgumentType.STRING)
.setInputExpressionTypes(VectorExpressionDescriptor.InputExpressionType.COLUMN).build();
StringLower v3 = new StringLower();
- Assert.assertEquals(d3, v3.getDescriptor());
+ assertTrue(d3.matches(v3.getDescriptor()));
VectorExpressionDescriptor.Builder builder4 = new VectorExpressionDescriptor.Builder();
VectorExpressionDescriptor.Descriptor d4 = builder4.setMode(VectorExpressionDescriptor.Mode.PROJECTION)
- .setNumArguments(1).setArgumentTypes(VectorExpressionDescriptor.ArgumentType.ANY)
+ .setNumArguments(1).setArgumentTypes(VectorExpressionDescriptor.ArgumentType.ALL_FAMILY)
.setInputExpressionTypes(VectorExpressionDescriptor.InputExpressionType.COLUMN).build();
StringUpper v4 = new StringUpper();
- Assert.assertEquals(d4, v4.getDescriptor());
+ assertTrue(d4.matches(v4.getDescriptor()));
VectorExpressionDescriptor.Builder builder5 = new VectorExpressionDescriptor.Builder();
VectorExpressionDescriptor.Descriptor d5 = builder5.setMode(VectorExpressionDescriptor.Mode.PROJECTION)
.setNumArguments(1).setArgumentTypes(VectorExpressionDescriptor.ArgumentType.STRING)
.setInputExpressionTypes(VectorExpressionDescriptor.InputExpressionType.COLUMN).build();
IsNull v5 = new IsNull();
- Assert.assertEquals(d5, v5.getDescriptor());
+ assertTrue(d5.matches(v5.getDescriptor()));
}
@Test
@@ -289,11 +301,12 @@ public class TestVectorizationContext {
VectorExpression ve = vc.getVectorExpression(exprDesc, VectorExpressionDescriptor.Mode.FILTER);
- assertTrue(ve instanceof FilterStringColGreaterStringScalar);
+ assertTrue(ve instanceof FilterStringGroupColGreaterStringScalar);
}
@Test
public void testFilterStringColCompareStringColumnExpressions() throws HiveException {
+ // Strings test
ExprNodeColumnDesc col1Expr = new ExprNodeColumnDesc(String.class, "col1", "table", false);
ExprNodeColumnDesc col2Expr = new ExprNodeColumnDesc(String.class, "col2", "table", false);
@@ -313,7 +326,97 @@ public class TestVectorizationContext {
VectorExpression ve = vc.getVectorExpression(exprDesc, VectorExpressionDescriptor.Mode.FILTER);
- assertTrue(ve instanceof FilterStringColGreaterStringColumn);
+ assertTrue(ve instanceof FilterStringGroupColGreaterStringGroupColumn);
+
+ // 2 CHAR test
+ CharTypeInfo charTypeInfo = new CharTypeInfo(10);
+ col1Expr = new ExprNodeColumnDesc(charTypeInfo, "col1", "table", false);
+ col2Expr = new ExprNodeColumnDesc(charTypeInfo, "col2", "table", false);
+
+ udf = new GenericUDFOPGreaterThan();
+ exprDesc = new ExprNodeGenericFuncDesc();
+ exprDesc.setGenericUDF(udf);
+ children1 = new ArrayList<ExprNodeDesc>(2);
+ children1.add(col1Expr);
+ children1.add(col2Expr);
+ exprDesc.setChildren(children1);
+
+ vc = new VectorizationContext(columnMap, 2);
+
+ ve = vc.getVectorExpression(exprDesc, VectorExpressionDescriptor.Mode.FILTER);
+
+ assertTrue(ve instanceof FilterStringGroupColGreaterStringGroupColumn);
+
+ // 2 VARCHAR test
+ VarcharTypeInfo varcharTypeInfo = new VarcharTypeInfo(10);
+ col1Expr = new ExprNodeColumnDesc(varcharTypeInfo, "col1", "table", false);
+ col2Expr = new ExprNodeColumnDesc(varcharTypeInfo, "col2", "table", false);
+
+ udf = new GenericUDFOPGreaterThan();
+ exprDesc = new ExprNodeGenericFuncDesc();
+ exprDesc.setGenericUDF(udf);
+ children1 = new ArrayList<ExprNodeDesc>(2);
+ children1.add(col1Expr);
+ children1.add(col2Expr);
+ exprDesc.setChildren(children1);
+
+ vc = new VectorizationContext(columnMap, 2);
+
+ ve = vc.getVectorExpression(exprDesc, VectorExpressionDescriptor.Mode.FILTER);
+
+ assertTrue(ve instanceof FilterStringGroupColGreaterStringGroupColumn);
+
+ // Some mix tests (STRING, CHAR), (VARCHAR, CHAR), (VARCHAR, STRING)...
+ col1Expr = new ExprNodeColumnDesc(String.class, "col1", "table", false);
+ col2Expr = new ExprNodeColumnDesc(charTypeInfo, "col2", "table", false);
+
+ udf = new GenericUDFOPGreaterThan();
+ exprDesc = new ExprNodeGenericFuncDesc();
+ exprDesc.setGenericUDF(udf);
+ children1 = new ArrayList<ExprNodeDesc>(2);
+ children1.add(col1Expr);
+ children1.add(col2Expr);
+ exprDesc.setChildren(children1);
+
+ vc = new VectorizationContext(columnMap, 2);
+
+ ve = vc.getVectorExpression(exprDesc, VectorExpressionDescriptor.Mode.FILTER);
+
+ assertTrue(ve instanceof FilterStringGroupColGreaterStringGroupColumn);
+
+ col1Expr = new ExprNodeColumnDesc(varcharTypeInfo, "col1", "table", false);
+ col2Expr = new ExprNodeColumnDesc(charTypeInfo, "col2", "table", false);
+
+ udf = new GenericUDFOPGreaterThan();
+ exprDesc = new ExprNodeGenericFuncDesc();
+ exprDesc.setGenericUDF(udf);
+ children1 = new ArrayList<ExprNodeDesc>(2);
+ children1.add(col1Expr);
+ children1.add(col2Expr);
+ exprDesc.setChildren(children1);
+
+ vc = new VectorizationContext(columnMap, 2);
+
+ ve = vc.getVectorExpression(exprDesc, VectorExpressionDescriptor.Mode.FILTER);
+
+ assertTrue(ve instanceof FilterStringGroupColGreaterStringGroupColumn);
+
+ col1Expr = new ExprNodeColumnDesc(varcharTypeInfo, "col1", "table", false);
+ col2Expr = new ExprNodeColumnDesc(String.class, "col2", "table", false);
+
+ udf = new GenericUDFOPGreaterThan();
+ exprDesc = new ExprNodeGenericFuncDesc();
+ exprDesc.setGenericUDF(udf);
+ children1 = new ArrayList<ExprNodeDesc>(2);
+ children1.add(col1Expr);
+ children1.add(col2Expr);
+ exprDesc.setChildren(children1);
+
+ vc = new VectorizationContext(columnMap, 2);
+
+ ve = vc.getVectorExpression(exprDesc, VectorExpressionDescriptor.Mode.FILTER);
+
+ assertTrue(ve instanceof FilterStringGroupColGreaterStringGroupColumn);
}
@Test
@@ -908,6 +1011,7 @@ public class TestVectorizationContext {
@Test
public void testBetweenFilters() throws HiveException {
+ // string tests
ExprNodeColumnDesc col1Expr = new ExprNodeColumnDesc(String.class, "col1", "table", false);
ExprNodeConstantDesc constDesc = new ExprNodeConstantDesc("Alpha");
ExprNodeConstantDesc constDesc2 = new ExprNodeConstantDesc("Bravo");
@@ -934,6 +1038,56 @@ public class TestVectorizationContext {
ve = vc.getVectorExpression(exprDesc, VectorExpressionDescriptor.Mode.FILTER);
assertTrue(ve instanceof FilterStringColumnNotBetween);
+ // CHAR tests
+ CharTypeInfo charTypeInfo = new CharTypeInfo(10);
+ col1Expr = new ExprNodeColumnDesc(charTypeInfo, "col1", "table", false);
+ constDesc = new ExprNodeConstantDesc(charTypeInfo, new HiveChar("Alpha", 10));
+ constDesc2 = new ExprNodeConstantDesc(charTypeInfo, new HiveChar("Bravo", 10));
+
+ // CHAR BETWEEN
+ udf = new GenericUDFBetween();
+ children1 = new ArrayList<ExprNodeDesc>();
+ children1.add(new ExprNodeConstantDesc(new Boolean(false))); // no NOT keyword
+ children1.add(col1Expr);
+ children1.add(constDesc);
+ children1.add(constDesc2);
+ exprDesc = new ExprNodeGenericFuncDesc(TypeInfoFactory.booleanTypeInfo, udf,
+ children1);
+
+ vc = new VectorizationContext(columnMap, 2);
+ ve = vc.getVectorExpression(exprDesc, VectorExpressionDescriptor.Mode.FILTER);
+ assertTrue(ve instanceof FilterCharColumnBetween);
+
+ // CHAR NOT BETWEEN
+ children1.set(0, new ExprNodeConstantDesc(new Boolean(true))); // has NOT keyword
+ ve = vc.getVectorExpression(exprDesc, VectorExpressionDescriptor.Mode.FILTER);
+ assertTrue(ve instanceof FilterCharColumnNotBetween);
+
+ // VARCHAR tests
+ VarcharTypeInfo varcharTypeInfo = new VarcharTypeInfo(10);
+ col1Expr = new ExprNodeColumnDesc(varcharTypeInfo, "col1", "table", false);
+ constDesc = new ExprNodeConstantDesc(varcharTypeInfo, new HiveVarchar("Alpha", 10));
+ constDesc2 = new ExprNodeConstantDesc(varcharTypeInfo, new HiveVarchar("Bravo", 10));
+
+ // VARCHAR BETWEEN
+ udf = new GenericUDFBetween();
+ children1 = new ArrayList<ExprNodeDesc>();
+ children1.add(new ExprNodeConstantDesc(new Boolean(false))); // no NOT keyword
+ children1.add(col1Expr);
+ children1.add(constDesc);
+ children1.add(constDesc2);
+ exprDesc = new ExprNodeGenericFuncDesc(TypeInfoFactory.booleanTypeInfo, udf,
+ children1);
+
+ vc = new VectorizationContext(columnMap, 2);
+ ve = vc.getVectorExpression(exprDesc, VectorExpressionDescriptor.Mode.FILTER);
+ assertTrue(ve instanceof FilterVarCharColumnBetween);
+
+ // VARCHAR NOT BETWEEN
+ children1.set(0, new ExprNodeConstantDesc(new Boolean(true))); // has NOT keyword
+ ve = vc.getVectorExpression(exprDesc, VectorExpressionDescriptor.Mode.FILTER);
+ assertTrue(ve instanceof FilterVarCharColumnNotBetween);
+
// long BETWEEN
children1.set(0, new ExprNodeConstantDesc(new Boolean(false)));
children1.set(1, new ExprNodeColumnDesc(Long.class, "col1", "table", false));
@@ -1173,12 +1327,12 @@ public class TestVectorizationContext {
children1.set(1, col2Expr);
children1.set(2, col3Expr);
ve = vc.getVectorExpression(exprDesc);
- assertTrue(ve instanceof IfExprStringColumnStringColumn);
+ assertTrue(ve instanceof IfExprStringGroupColumnStringGroupColumn);
// column/scalar
children1.set(2, constDesc3);
ve = vc.getVectorExpression(exprDesc);
- assertTrue(ve instanceof IfExprStringColumnStringScalar);
+ assertTrue(ve instanceof IfExprStringGroupColumnStringScalar);
// scalar/scalar
children1.set(1, constDesc2);
@@ -1188,7 +1342,62 @@ public class TestVectorizationContext {
// scalar/column
children1.set(2, col3Expr);
ve = vc.getVectorExpression(exprDesc);
- assertTrue(ve instanceof IfExprStringScalarStringColumn);
- }
+ assertTrue(ve instanceof IfExprStringScalarStringGroupColumn);
+
+ // test for CHAR type
+ CharTypeInfo charTypeInfo = new CharTypeInfo(10);
+ constDesc2 = new ExprNodeConstantDesc(charTypeInfo, new HiveChar("Alpha", 10));
+ constDesc3 = new ExprNodeConstantDesc(charTypeInfo, new HiveChar("Bravo", 10));
+ col2Expr = new ExprNodeColumnDesc(charTypeInfo, "col2", "table", false);
+ col3Expr = new ExprNodeColumnDesc(charTypeInfo, "col3", "table", false);
+
+ // column/column
+ children1.set(1, col2Expr);
+ children1.set(2, col3Expr);
+ ve = vc.getVectorExpression(exprDesc);
+ assertTrue(ve instanceof IfExprStringGroupColumnStringGroupColumn);
+
+ // column/scalar
+ children1.set(2, constDesc3);
+ ve = vc.getVectorExpression(exprDesc);
+ assertTrue(ve instanceof IfExprStringGroupColumnCharScalar);
+
+ // scalar/scalar
+ children1.set(1, constDesc2);
+// ve = vc.getVectorExpression(exprDesc);
+// assertTrue(ve instanceof IfExprCharScalarCharScalar);
+
+ // scalar/column
+ children1.set(2, col3Expr);
+ ve = vc.getVectorExpression(exprDesc);
+ assertTrue(ve instanceof IfExprCharScalarStringGroupColumn);
+
+ // test for VARCHAR type
+ VarcharTypeInfo varcharTypeInfo = new VarcharTypeInfo(10);
+ constDesc2 = new ExprNodeConstantDesc(varcharTypeInfo, new HiveVarchar("Alpha", 10));
+ constDesc3 = new ExprNodeConstantDesc(varcharTypeInfo, new HiveVarchar("Bravo", 10));
+ col2Expr = new ExprNodeColumnDesc(varcharTypeInfo, "col2", "table", false);
+ col3Expr = new ExprNodeColumnDesc(varcharTypeInfo, "col3", "table", false);
+
+ // column/column
+ children1.set(1, col2Expr);
+ children1.set(2, col3Expr);
+ ve = vc.getVectorExpression(exprDesc);
+ assertTrue(ve instanceof IfExprStringGroupColumnStringGroupColumn);
+
+ // column/scalar
+ children1.set(2, constDesc3);
+ ve = vc.getVectorExpression(exprDesc);
+ assertTrue(ve instanceof IfExprStringGroupColumnVarCharScalar);
+ // scalar/scalar
+ children1.set(1, constDesc2);
+// ve = vc.getVectorExpression(exprDesc);
+// assertTrue(ve instanceof IfExprVarCharScalarVarCharScalar);
+
+ // scalar/column
+ children1.set(2, col3Expr);
+ ve = vc.getVectorExpression(exprDesc);
+ assertTrue(ve instanceof IfExprVarCharScalarStringGroupColumn);
+ }
}
Modified: hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorConditionalExpressions.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorConditionalExpressions.java?rev=1623263&r1=1623262&r2=1623263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorConditionalExpressions.java (original)
+++ hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorConditionalExpressions.java Mon Sep 8 04:38:17 2014
@@ -32,10 +32,10 @@ import org.apache.hadoop.hive.ql.exec.ve
import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.IfExprDoubleScalarDoubleScalar;
import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.IfExprDoubleScalarDoubleColumn;
import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.IfExprDoubleColumnDoubleScalar;
-import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringColumnStringColumn;
-import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringColumnStringScalar;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringGroupColumnStringGroupColumn;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringGroupColumnStringScalar;
+import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringScalarStringGroupColumn;
import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringScalarStringScalar;
-import org.apache.hadoop.hive.ql.exec.vector.expressions.IfExprStringScalarStringColumn;
import org.junit.Test;
@@ -388,7 +388,7 @@ public class TestVectorConditionalExpres
@Test
public void testIfExprStringColumnStringColumn() {
VectorizedRowBatch batch = getBatch1Long3BytesVectors();
- VectorExpression expr = new IfExprStringColumnStringColumn(0, 1, 2, 3);
+ VectorExpression expr = new IfExprStringGroupColumnStringGroupColumn(0, 1, 2, 3);
BytesColumnVector r = (BytesColumnVector) batch.cols[3];
expr.evaluate(batch);
assertTrue(getString(r, 0).equals("arg3_0"));
@@ -474,7 +474,7 @@ public class TestVectorConditionalExpres
public void testIfExprStringColumnStringScalar() {
VectorizedRowBatch batch = getBatch1Long3BytesVectors();
byte[] scalar = getUTF8Bytes("scalar");
- VectorExpression expr = new IfExprStringColumnStringScalar(0, 1, scalar, 3);
+ VectorExpression expr = new IfExprStringGroupColumnStringScalar(0, 1, scalar, 3);
BytesColumnVector r = (BytesColumnVector) batch.cols[3];
expr.evaluate(batch);
assertTrue(getString(r, 0).equals("scalar"));
@@ -498,7 +498,7 @@ public class TestVectorConditionalExpres
public void testIfExprStringScalarStringColumn() {
VectorizedRowBatch batch = getBatch1Long3BytesVectors();
byte[] scalar = getUTF8Bytes("scalar");
- VectorExpression expr = new IfExprStringScalarStringColumn(0,scalar, 2, 3);
+ VectorExpression expr = new IfExprStringScalarStringGroupColumn(0,scalar, 2, 3);
BytesColumnVector r = (BytesColumnVector) batch.cols[3];
expr.evaluate(batch);
assertTrue(getString(r, 0).equals("arg3_0"));
Modified: hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorGenericDateExpressions.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorGenericDateExpressions.java?rev=1623263&r1=1623262&r2=1623263&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorGenericDateExpressions.java (original)
+++ hive/branches/spark/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorGenericDateExpressions.java Mon Sep 8 04:38:17 2014
@@ -27,7 +27,6 @@ import org.apache.hadoop.hive.serde2.io.
import org.junit.Assert;
import org.junit.Test;
-
import java.io.UnsupportedEncodingException;
import java.sql.Date;
import java.text.SimpleDateFormat;
@@ -136,9 +135,12 @@ public class TestVectorGenericDateExpres
return toTimestamp(date);
case STRING:
+ case CHAR:
+ case VARCHAR:
return toString(date);
+ default:
+ throw new Error("Unsupported input type " + type.name());
}
- return null;
}
private void testDateAddColScalar(VectorExpression.Type colType1, boolean isPositive) {
@@ -214,8 +216,12 @@ public class TestVectorGenericDateExpres
udf = new VectorUDFDateAddScalarCol(toTimestamp(scalar1), 0, 1);
break;
case STRING:
+ case CHAR:
+ case VARCHAR:
udf = new VectorUDFDateAddScalarCol(toString(scalar1), 0, 1);
break;
+ default:
+ throw new Error("Invalid input type: " + colType1.name());
}
} else {
switch (colType1) {
@@ -226,8 +232,12 @@ public class TestVectorGenericDateExpres
udf = new VectorUDFDateSubScalarCol(toTimestamp(scalar1), 0, 1);
break;
case STRING:
+ case CHAR:
+ case VARCHAR:
udf = new VectorUDFDateSubScalarCol(toString(scalar1), 0, 1);
break;
+ default:
+ throw new Error("Invalid input type: " + colType1.name());
}
}
udf.setInputTypes(colType1, VectorExpression.Type.OTHER);
@@ -694,7 +704,9 @@ public class TestVectorGenericDateExpres
private void validateToDate(VectorizedRowBatch batch, VectorExpression.Type colType, LongColumnVector date) {
VectorExpression udf;
- if (colType == VectorExpression.Type.STRING) {
+ if (colType == VectorExpression.Type.STRING ||
+ colType == VectorExpression.Type.CHAR ||
+ colType == VectorExpression.Type.VARCHAR) {
udf = new CastStringToDate(0, 1);
} else {
udf = new CastLongToDate(0, 1);