You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by mm...@apache.org on 2017/02/03 20:04:14 UTC
[49/51] [partial] hive git commit: HIVE-11394: Enhance EXPLAIN
display for vectorization (Matt McCline, reviewed by Gopal Vijayaraghavan)
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorColumnOutputMapping.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorColumnOutputMapping.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorColumnOutputMapping.java
index f35aff7..4ceff6b 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorColumnOutputMapping.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorColumnOutputMapping.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.hive.ql.exec.vector;
import org.apache.hadoop.hive.ql.exec.vector.VectorColumnOrderedMap.Mapping;
+import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
/**
* This class collects column information for copying a row from one VectorizedRowBatch to
@@ -35,9 +36,9 @@ public class VectorColumnOutputMapping extends VectorColumnMapping {
}
@Override
- public void add(int sourceColumn, int outputColumn, String typeName) {
+ public void add(int sourceColumn, int outputColumn, TypeInfo typeInfo) {
// Order on outputColumn.
- vectorColumnMapping.add(outputColumn, sourceColumn, typeName);
+ vectorColumnMapping.add(outputColumn, sourceColumn, typeInfo);
}
public boolean containsOutputColumn(int outputColumn) {
@@ -51,7 +52,7 @@ public class VectorColumnOutputMapping extends VectorColumnMapping {
// Ordered columns are the output columns.
sourceColumns = mapping.getValueColumns();
outputColumns = mapping.getOrderedColumns();
- typeNames = mapping.getTypeNames();
+ typeInfos = mapping.getTypeInfos();
// Not needed anymore.
vectorColumnMapping = null;
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorColumnSourceMapping.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorColumnSourceMapping.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorColumnSourceMapping.java
index 4f5ba9a..061e396 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorColumnSourceMapping.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorColumnSourceMapping.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.hive.ql.exec.vector;
import org.apache.hadoop.hive.ql.exec.vector.VectorColumnOrderedMap.Mapping;
+import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
/**
* This class collects column information for copying a row from one VectorizedRowBatch to
@@ -35,9 +36,9 @@ public class VectorColumnSourceMapping extends VectorColumnMapping {
}
@Override
- public void add(int sourceColumn, int outputColumn, String typeName) {
+ public void add(int sourceColumn, int outputColumn, TypeInfo typeInfo) {
// Order on sourceColumn.
- vectorColumnMapping.add(sourceColumn, outputColumn, typeName);
+ vectorColumnMapping.add(sourceColumn, outputColumn, typeInfo);
}
@Override
@@ -47,7 +48,7 @@ public class VectorColumnSourceMapping extends VectorColumnMapping {
// Ordered columns are the source columns.
sourceColumns = mapping.getOrderedColumns();
outputColumns = mapping.getValueColumns();
- typeNames = mapping.getTypeNames();
+ typeInfos = mapping.getTypeInfos();
// Not needed anymore.
vectorColumnMapping = null;
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorCopyRow.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorCopyRow.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorCopyRow.java
index c8e0284..911aeb0 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorCopyRow.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorCopyRow.java
@@ -262,8 +262,7 @@ public class VectorCopyRow {
for (int i = 0; i < count; i++) {
int inputColumn = columnMapping.getInputColumns()[i];
int outputColumn = columnMapping.getOutputColumns()[i];
- String typeName = columnMapping.getTypeNames()[i].toLowerCase();
- TypeInfo typeInfo = TypeInfoUtils.getTypeInfoFromTypeString(typeName);
+ TypeInfo typeInfo = columnMapping.getTypeInfos()[i];
Type columnVectorType = VectorizationContext.getColumnVectorTypeFromTypeInfo(typeInfo);
CopyRow copyRowByValue = null;
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorFilterOperator.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorFilterOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorFilterOperator.java
index 2598445..fd885a9 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorFilterOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorFilterOperator.java
@@ -28,6 +28,7 @@ import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
import org.apache.hadoop.hive.ql.plan.FilterDesc;
import org.apache.hadoop.hive.ql.plan.OperatorDesc;
+import org.apache.hadoop.hive.ql.plan.VectorFilterDesc;
import com.google.common.annotations.VisibleForTesting;
@@ -50,9 +51,8 @@ public class VectorFilterOperator extends FilterOperator {
public VectorFilterOperator(CompilationOpContext ctx,
VectorizationContext vContext, OperatorDesc conf) throws HiveException {
this(ctx);
- ExprNodeDesc oldExpression = ((FilterDesc) conf).getPredicate();
- conditionEvaluator = vContext.getVectorExpression(oldExpression, VectorExpressionDescriptor.Mode.FILTER);
this.conf = (FilterDesc) conf;
+ conditionEvaluator = ((VectorFilterDesc) this.conf.getVectorDesc()).getPredicateExpression();
}
/** Kryo ctor. */
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorGroupByOperator.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorGroupByOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorGroupByOperator.java
index 2605203..fef7c2a 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorGroupByOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorGroupByOperator.java
@@ -41,6 +41,7 @@ import org.apache.hadoop.hive.ql.plan.AggregationDesc;
import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
import org.apache.hadoop.hive.ql.plan.GroupByDesc;
import org.apache.hadoop.hive.ql.plan.OperatorDesc;
+import org.apache.hadoop.hive.ql.plan.VectorGroupByDesc;
import org.apache.hadoop.hive.ql.plan.VectorGroupByDesc.ProcessingMode;
import org.apache.hadoop.hive.ql.plan.api.OperatorType;
import org.apache.hadoop.hive.ql.util.JavaDataModel;
@@ -65,6 +66,8 @@ public class VectorGroupByOperator extends Operator<GroupByDesc> implements
private static final Logger LOG = LoggerFactory.getLogger(
VectorGroupByOperator.class.getName());
+ private VectorGroupByDesc vectorDesc;
+
/**
* This is the vector of aggregators. They are stateless and only implement
* the algorithm of how to compute the aggregation. state is kept in the
@@ -756,16 +759,10 @@ public class VectorGroupByOperator extends Operator<GroupByDesc> implements
this(ctx);
GroupByDesc desc = (GroupByDesc) conf;
this.conf = desc;
- List<ExprNodeDesc> keysDesc = desc.getKeys();
- keyExpressions = vContext.getVectorExpressions(keysDesc);
- ArrayList<AggregationDesc> aggrDesc = desc.getAggregators();
- aggregators = new VectorAggregateExpression[aggrDesc.size()];
- for (int i = 0; i < aggrDesc.size(); ++i) {
- AggregationDesc aggDesc = aggrDesc.get(i);
- aggregators[i] = vContext.getAggregatorExpression(aggDesc);
- }
-
- isVectorOutput = desc.getVectorDesc().isVectorOutput();
+ vectorDesc = (VectorGroupByDesc) desc.getVectorDesc();
+ keyExpressions = vectorDesc.getKeyExpressions();
+ aggregators = vectorDesc.getAggregators();
+ isVectorOutput = vectorDesc.isVectorOutput();
vOutContext = new VectorizationContext(getName(), desc.getOutputColumnNames(),
/* vContextEnvironment */ vContext);
@@ -834,7 +831,7 @@ public class VectorGroupByOperator extends Operator<GroupByDesc> implements
forwardCache = new Object[outputKeyLength + aggregators.length];
- switch (conf.getVectorDesc().getProcessingMode()) {
+ switch (vectorDesc.getProcessingMode()) {
case GLOBAL:
Preconditions.checkState(outputKeyLength == 0);
processingMode = this.new ProcessingModeGlobalAggregate();
@@ -850,7 +847,7 @@ public class VectorGroupByOperator extends Operator<GroupByDesc> implements
break;
default:
throw new RuntimeException("Unsupported vector GROUP BY processing mode " +
- conf.getVectorDesc().getProcessingMode().name());
+ vectorDesc.getProcessingMode().name());
}
processingMode.initialize(hconf);
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorSelectOperator.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorSelectOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorSelectOperator.java
index bb382b1..5c490ef 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorSelectOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorSelectOperator.java
@@ -31,6 +31,7 @@ import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
import org.apache.hadoop.hive.ql.plan.OperatorDesc;
import org.apache.hadoop.hive.ql.plan.SelectDesc;
+import org.apache.hadoop.hive.ql.plan.VectorSelectDesc;
import org.apache.hadoop.hive.ql.plan.api.OperatorType;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory;
@@ -45,9 +46,11 @@ public class VectorSelectOperator extends Operator<SelectDesc> implements
private static final long serialVersionUID = 1L;
- protected VectorExpression[] vExpressions = null;
+ private VectorSelectDesc vectorDesc;
- private transient int [] projectedColumns = null;
+ private VectorExpression[] vExpressions = null;
+
+ private int [] projectedOutputColumns = null;
private transient VectorExpressionWriter [] valueWriters = null;
@@ -58,13 +61,9 @@ public class VectorSelectOperator extends Operator<SelectDesc> implements
VectorizationContext vContext, OperatorDesc conf) throws HiveException {
this(ctx);
this.conf = (SelectDesc) conf;
- List<ExprNodeDesc> colList = this.conf.getColList();
- vExpressions = new VectorExpression[colList.size()];
- for (int i = 0; i < colList.size(); i++) {
- ExprNodeDesc expr = colList.get(i);
- VectorExpression ve = vContext.getVectorExpression(expr);
- vExpressions[i] = ve;
- }
+ vectorDesc = (VectorSelectDesc) this.conf.getVectorDesc();
+ vExpressions = vectorDesc.getSelectExpressions();
+ projectedOutputColumns = vectorDesc.getProjectedOutputColumns();
/**
* Create a new vectorization context to create a new projection, but keep
@@ -73,11 +72,10 @@ public class VectorSelectOperator extends Operator<SelectDesc> implements
vOutContext = new VectorizationContext(getName(), vContext);
vOutContext.resetProjectionColumns();
- for (int i=0; i < colList.size(); ++i) {
- String columnName = this.conf.getOutputColumnNames().get(i);
- VectorExpression ve = vExpressions[i];
- vOutContext.addProjectionColumn(columnName,
- ve.getOutputColumn());
+ List<String> outputColumnNames = this.conf.getOutputColumnNames();
+ for (int i=0; i < projectedOutputColumns.length; ++i) {
+ String columnName = outputColumnNames.get(i);
+ vOutContext.addProjectionColumn(columnName, projectedOutputColumns[i]);
}
}
@@ -110,12 +108,6 @@ public class VectorSelectOperator extends Operator<SelectDesc> implements
List<String> outputFieldNames = conf.getOutputColumnNames();
outputObjInspector = ObjectInspectorFactory.getStandardStructObjectInspector(
outputFieldNames, objectInspectors);
-
- projectedColumns = new int [vExpressions.length];
- for (int i = 0; i < projectedColumns.length; i++) {
- vExpressions[i].init(hconf);
- projectedColumns[i] = vExpressions[i].getOutputColumn();
- }
}
@Override
@@ -140,8 +132,8 @@ public class VectorSelectOperator extends Operator<SelectDesc> implements
// Prepare output, set the projections
int[] originalProjections = vrg.projectedColumns;
int originalProjectionSize = vrg.projectionSize;
- vrg.projectionSize = vExpressions.length;
- vrg.projectedColumns = this.projectedColumns;
+ vrg.projectionSize = projectedOutputColumns.length;
+ vrg.projectedColumns = this.projectedOutputColumns;
forward(vrg, outputObjInspector);
// Revert the projected columns back, because vrg will be re-used.
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java
index 484f615..4802489 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java
@@ -94,6 +94,7 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.*;
import org.apache.hadoop.hive.ql.exec.vector.udf.VectorUDFAdaptor;
import org.apache.hadoop.hive.ql.exec.vector.udf.VectorUDFArgDesc;
import org.apache.hadoop.hive.ql.metadata.HiveException;
+import org.apache.hadoop.hive.ql.optimizer.physical.Vectorizer;
import org.apache.hadoop.hive.ql.parse.SemanticException;
import org.apache.hadoop.hive.ql.plan.AggregationDesc;
import org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc;
@@ -563,7 +564,7 @@ public class VectorizationContext {
} else {
throw new HiveException(
"Could not vectorize expression (mode = " + mode.name() + "): " + exprDesc.toString()
- + " because hive.vectorized.adaptor.usage.mode=chosen "
+ + " because hive.vectorized.adaptor.usage.mode=chosen"
+ " and the UDF wasn't one of the chosen ones");
}
break;
@@ -1286,6 +1287,35 @@ public class VectorizationContext {
return "arguments: " + Arrays.toString(args) + ", argument classes: " + argClasses.toString();
}
+ private static int STACK_LENGTH_LIMIT = 15;
+
+ public static String getStackTraceAsSingleLine(Throwable e) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(e);
+ sb.append(" stack trace: ");
+ StackTraceElement[] stackTrace = e.getStackTrace();
+ int length = stackTrace.length;
+ boolean isTruncated = false;
+ if (length > STACK_LENGTH_LIMIT) {
+ length = STACK_LENGTH_LIMIT;
+ isTruncated = true;
+ }
+ for (int i = 0; i < length; i++) {
+ if (i > 0) {
+ sb.append(", ");
+ }
+ sb.append(stackTrace[i]);
+ }
+ if (isTruncated) {
+ sb.append(", ...");
+ }
+
+ // Attempt to cleanup stack trace elements that vary by VM.
+ String cleaned = sb.toString().replaceAll("GeneratedConstructorAccessor[0-9]*", "GeneratedConstructorAccessor<omitted>");
+
+ return cleaned;
+ }
+
private VectorExpression instantiateExpression(Class<?> vclass, TypeInfo returnType, Object...args)
throws HiveException {
VectorExpression ve = null;
@@ -1297,14 +1327,14 @@ public class VectorizationContext {
ve = (VectorExpression) ctor.newInstance();
} catch (Exception ex) {
throw new HiveException("Could not instantiate " + vclass.getSimpleName() + " with 0 arguments, exception: " +
- StringUtils.stringifyException(ex));
+ getStackTraceAsSingleLine(ex));
}
} else if (numParams == argsLength) {
try {
ve = (VectorExpression) ctor.newInstance(args);
} catch (Exception ex) {
throw new HiveException("Could not instantiate " + vclass.getSimpleName() + " with " + getNewInstanceArgumentString(args) + ", exception: " +
- StringUtils.stringifyException(ex));
+ getStackTraceAsSingleLine(ex));
}
} else if (numParams == argsLength + 1) {
// Additional argument is needed, which is the outputcolumn.
@@ -1332,7 +1362,7 @@ public class VectorizationContext {
ve.setOutputType(returnTypeName);
} catch (Exception ex) {
throw new HiveException("Could not instantiate " + vclass.getSimpleName() + " with arguments " + getNewInstanceArgumentString(newArgs) + ", exception: " +
- StringUtils.stringifyException(ex));
+ getStackTraceAsSingleLine(ex));
}
}
// Add maxLength parameter to UDFs that have CHAR or VARCHAR output.
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContextRegion.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContextRegion.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContextRegion.java
index a403725..914bb1f 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContextRegion.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContextRegion.java
@@ -20,10 +20,10 @@ package org.apache.hadoop.hive.ql.exec.vector;
/**
* VectorizationContextRegion optional interface implemented by vectorized operators
- * that are changing the vectorizaiton context (region boundary operators)
+ * that are changing the vectorization context (region boundary operators)
*/
public interface VectorizationContextRegion {
VectorizationContext getOuputVectorizationContext();
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedRowBatchCtx.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedRowBatchCtx.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedRowBatchCtx.java
index 3e3844e..e546a65 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedRowBatchCtx.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedRowBatchCtx.java
@@ -38,7 +38,10 @@ import org.apache.hadoop.hive.ql.exec.Utilities;
import org.apache.hadoop.hive.ql.io.HiveFileFormatUtils;
import org.apache.hadoop.hive.ql.io.IOPrepareCache;
import org.apache.hadoop.hive.ql.metadata.HiveException;
+import org.apache.hadoop.hive.ql.plan.Explain;
import org.apache.hadoop.hive.ql.plan.PartitionDesc;
+import org.apache.hadoop.hive.ql.plan.Explain.Level;
+import org.apache.hadoop.hive.ql.plan.Explain.Vectorization;
import org.apache.hadoop.hive.serde2.ColumnProjectionUtils;
import org.apache.hadoop.hive.serde2.io.DateWritable;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/AbstractFilterStringColLikeStringScalar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/AbstractFilterStringColLikeStringScalar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/AbstractFilterStringColLikeStringScalar.java
index c50af8d..b49ff39 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/AbstractFilterStringColLikeStringScalar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/AbstractFilterStringColLikeStringScalar.java
@@ -518,6 +518,11 @@ public abstract class AbstractFilterStringColLikeStringScalar extends VectorExpr
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + colNum + ", pattern " + pattern;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastBooleanToCharViaLongToChar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastBooleanToCharViaLongToChar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastBooleanToCharViaLongToChar.java
index 57dc92b..96c08af 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastBooleanToCharViaLongToChar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastBooleanToCharViaLongToChar.java
@@ -51,4 +51,9 @@ public class CastBooleanToCharViaLongToChar extends CastBooleanToStringViaLongTo
public void setMaxLength(int maxLength) {
this.maxLength = maxLength;
}
+
+ @Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn + ", maxLength " + maxLength;
+ }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastBooleanToVarCharViaLongToVarChar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastBooleanToVarCharViaLongToVarChar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastBooleanToVarCharViaLongToVarChar.java
index 1f7697e..a120f2e 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastBooleanToVarCharViaLongToVarChar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastBooleanToVarCharViaLongToVarChar.java
@@ -51,4 +51,9 @@ public class CastBooleanToVarCharViaLongToVarChar extends CastBooleanToStringVia
public void setMaxLength(int maxLength) {
this.maxLength = maxLength;
}
+
+ @Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn + ", maxLength " + maxLength;
+ }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDateToChar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDateToChar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDateToChar.java
index 187f12b..447e258 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDateToChar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDateToChar.java
@@ -51,4 +51,8 @@ public class CastDateToChar extends CastDateToString implements TruncStringOutpu
public void setMaxLength(int maxLength) {
this.maxLength = maxLength;
}
+
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn + ", maxLength " + maxLength;
+ }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDateToVarChar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDateToVarChar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDateToVarChar.java
index 5ad745c..98c1f93 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDateToVarChar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDateToVarChar.java
@@ -51,4 +51,9 @@ public class CastDateToVarChar extends CastDateToString implements TruncStringOu
public void setMaxLength(int maxLength) {
this.maxLength = maxLength;
}
+
+ @Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn + ", maxLength " + maxLength;
+ }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToChar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToChar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToChar.java
index e753a6e..3bcd989 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToChar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToChar.java
@@ -55,4 +55,9 @@ public class CastDecimalToChar extends CastDecimalToString implements TruncStrin
public void setMaxLength(int maxLength) {
this.maxLength = maxLength;
}
+
+ @Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn + ", maxLength " + maxLength;
+ }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToDecimal.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToDecimal.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToDecimal.java
index ea235d9..e1debcd 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToDecimal.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToDecimal.java
@@ -148,6 +148,11 @@ public class CastDecimalToDecimal extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
VectorExpressionDescriptor.Builder b = new VectorExpressionDescriptor.Builder();
b.setMode(VectorExpressionDescriptor.Mode.PROJECTION)
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToVarChar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToVarChar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToVarChar.java
index 3a2c2d0..3b4f05b 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToVarChar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDecimalToVarChar.java
@@ -55,4 +55,9 @@ public class CastDecimalToVarChar extends CastDecimalToString implements TruncSt
public void setMaxLength(int maxLength) {
this.maxLength = maxLength;
}
+
+ @Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn + ", maxLength " + maxLength;
+ }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDoubleToTimestamp.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDoubleToTimestamp.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDoubleToTimestamp.java
index 07f94f5..e38e32b 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDoubleToTimestamp.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastDoubleToTimestamp.java
@@ -114,6 +114,11 @@ public class CastDoubleToTimestamp extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + colNum;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToChar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToChar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToChar.java
index 27674c4..eac45e4 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToChar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToChar.java
@@ -51,4 +51,9 @@ public class CastLongToChar extends CastLongToString implements TruncStringOutpu
public void setMaxLength(int maxLength) {
this.maxLength = maxLength;
}
+
+ @Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn + ", maxLength " + maxLength;
+ }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToDate.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToDate.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToDate.java
index ceefd61..86e0959 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToDate.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToDate.java
@@ -94,6 +94,11 @@ public class CastLongToDate extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
VectorExpressionDescriptor.Builder b = new VectorExpressionDescriptor.Builder();
b.setMode(VectorExpressionDescriptor.Mode.PROJECTION)
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToTimestamp.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToTimestamp.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToTimestamp.java
index 4de95a5..9f71b9a 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToTimestamp.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToTimestamp.java
@@ -111,6 +111,11 @@ public class CastLongToTimestamp extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + colNum;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToVarChar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToVarChar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToVarChar.java
index 7c3dca2..9bc1cdb 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToVarChar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastLongToVarChar.java
@@ -51,4 +51,9 @@ public class CastLongToVarChar extends CastLongToString implements TruncStringOu
public void setMaxLength(int maxLength) {
this.maxLength = maxLength;
}
+
+ @Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn + ", maxLength " + maxLength;
+ }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastMillisecondsLongToTimestamp.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastMillisecondsLongToTimestamp.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastMillisecondsLongToTimestamp.java
index b1c6b2d..4cc120a 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastMillisecondsLongToTimestamp.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastMillisecondsLongToTimestamp.java
@@ -112,6 +112,11 @@ public class CastMillisecondsLongToTimestamp extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + colNum;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringGroupToChar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringGroupToChar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringGroupToChar.java
index 7c06ff5..3469183 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringGroupToChar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringGroupToChar.java
@@ -52,4 +52,8 @@ public class CastStringGroupToChar extends StringUnaryUDFDirect implements Trunc
public void setMaxLength(int maxLength) {
this.maxLength = maxLength;
}
+
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn + ", maxLength " + maxLength;
+ }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringGroupToVarChar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringGroupToVarChar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringGroupToVarChar.java
index 376ce92..fd4c76a 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringGroupToVarChar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringGroupToVarChar.java
@@ -52,4 +52,9 @@ public class CastStringGroupToVarChar extends StringUnaryUDFDirect implements Tr
public void setMaxLength(int maxLength) {
this.maxLength = maxLength;
}
+
+ @Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn + ", maxLength " + maxLength;
+ }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDate.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDate.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDate.java
index e456b12..4b176ae 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDate.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDate.java
@@ -149,6 +149,11 @@ public class CastStringToDate extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
VectorExpressionDescriptor.Builder b = new VectorExpressionDescriptor.Builder();
b.setMode(VectorExpressionDescriptor.Mode.PROJECTION)
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDecimal.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDecimal.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDecimal.java
index 504b354..074f9aa 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDecimal.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToDecimal.java
@@ -154,6 +154,11 @@ public class CastStringToDecimal extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
VectorExpressionDescriptor.Builder b = new VectorExpressionDescriptor.Builder();
b.setMode(VectorExpressionDescriptor.Mode.PROJECTION)
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalDayTime.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalDayTime.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalDayTime.java
index c8844c8..e577628 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalDayTime.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalDayTime.java
@@ -148,6 +148,11 @@ public class CastStringToIntervalDayTime extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
VectorExpressionDescriptor.Builder b = new VectorExpressionDescriptor.Builder();
b.setMode(VectorExpressionDescriptor.Mode.PROJECTION)
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalYearMonth.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalYearMonth.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalYearMonth.java
index 62f3dc9..21b034a 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalYearMonth.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastStringToIntervalYearMonth.java
@@ -146,6 +146,11 @@ public class CastStringToIntervalYearMonth extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
VectorExpressionDescriptor.Builder b = new VectorExpressionDescriptor.Builder();
b.setMode(VectorExpressionDescriptor.Mode.PROJECTION)
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToBoolean.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToBoolean.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToBoolean.java
index b8a58cd..0e23bfb 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToBoolean.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToBoolean.java
@@ -21,8 +21,6 @@ package org.apache.hadoop.hive.ql.exec.vector.expressions;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.exec.vector.expressions.MathExpr;
import org.apache.hadoop.hive.ql.exec.vector.*;
-import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor;
public class CastTimestampToBoolean extends VectorExpression {
private static final long serialVersionUID = 1L;
@@ -125,6 +123,11 @@ public class CastTimestampToBoolean extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + colNum;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToDouble.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToDouble.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToDouble.java
index a955d79..92595d9 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToDouble.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToDouble.java
@@ -118,6 +118,11 @@ public class CastTimestampToDouble extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + colNum;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToLong.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToLong.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToLong.java
index ba2e823..466043e 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToLong.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CastTimestampToLong.java
@@ -21,8 +21,6 @@ package org.apache.hadoop.hive.ql.exec.vector.expressions;
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.exec.vector.expressions.MathExpr;
import org.apache.hadoop.hive.ql.exec.vector.*;
-import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor;
public class CastTimestampToLong extends VectorExpression {
private static final long serialVersionUID = 1L;
@@ -120,6 +118,11 @@ public class CastTimestampToLong extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + colNum;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java
index ff7371d..42f9b60 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java
@@ -314,6 +314,11 @@ public class ColAndCol extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + colNum1 + ", col " + colNum2;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java
index 60ed2d4..297c372 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java
@@ -317,6 +317,11 @@ public class ColOrCol extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + colNum1 + ", col " + colNum2;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ConstantVectorExpression.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ConstantVectorExpression.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ConstantVectorExpression.java
index 72749b7..487c4b0 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ConstantVectorExpression.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ConstantVectorExpression.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.hive.ql.exec.vector.expressions;
+import java.nio.charset.StandardCharsets;
import java.sql.Timestamp;
import org.apache.hadoop.hive.common.type.HiveDecimal;
@@ -268,6 +269,38 @@ public class ConstantVectorExpression extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ String value;
+ if (isNullValue) {
+ value = "null";
+ } else {
+ switch (type) {
+ case LONG:
+ value = Long.toString(longValue);
+ break;
+ case DOUBLE:
+ value = Double.toString(doubleValue);
+ break;
+ case BYTES:
+ value = new String(bytesValue, StandardCharsets.UTF_8);
+ break;
+ case DECIMAL:
+ value = decimalValue.toString();
+ break;
+ case TIMESTAMP:
+ value = timestampValue.toString();
+ break;
+ case INTERVAL_DAY_TIME:
+ value = intervalDayTimeValue.toString();
+ break;
+ default:
+ throw new RuntimeException("Unknown vector column type " + type);
+ }
+ }
+ return "val " + value;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder()).build();
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateColumn.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateColumn.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateColumn.java
index fafacce..e04280f 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateColumn.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateColumn.java
@@ -168,6 +168,10 @@ public class DateColSubtractDateColumn extends VectorExpression {
return "timestamp";
}
+ public String vectorExpressionParameters() {
+ return "col " + colNum1 + ", col " + colNum2;
+ }
+
@Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateScalar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateScalar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateScalar.java
index a9ca93c..bce24ea 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateScalar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateColSubtractDateScalar.java
@@ -132,6 +132,11 @@ public class DateColSubtractDateScalar extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + colNum + ", val " + value;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateScalarSubtractDateColumn.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateScalarSubtractDateColumn.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateScalarSubtractDateColumn.java
index 59cf9da..62f29f1 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateScalarSubtractDateColumn.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DateScalarSubtractDateColumn.java
@@ -135,6 +135,11 @@ public class DateScalarSubtractDateColumn extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "val " + value + ", col " + colNum;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalColumnInList.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalColumnInList.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalColumnInList.java
index d4d8fea..9a42f50 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalColumnInList.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalColumnInList.java
@@ -25,6 +25,7 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
+import java.util.Arrays;
import java.util.HashSet;
/**
@@ -155,4 +156,10 @@ public class DecimalColumnInList extends VectorExpression implements IDecimalInE
public void setInListValues(HiveDecimal[] a) {
this.inListValues = a;
}
+
+ @Override
+ public String vectorExpressionParameters() {
+ return "col " + inputCol + ", values " + Arrays.toString(inListValues);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalToStringUnaryUDF.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalToStringUnaryUDF.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalToStringUnaryUDF.java
index 4b1182c..a9e1f8b 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalToStringUnaryUDF.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DecimalToStringUnaryUDF.java
@@ -134,6 +134,11 @@ abstract public class DecimalToStringUnaryUDF extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
VectorExpressionDescriptor.Builder b = new VectorExpressionDescriptor.Builder();
b.setMode(VectorExpressionDescriptor.Mode.PROJECTION)
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DoubleColumnInList.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DoubleColumnInList.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DoubleColumnInList.java
index dfc1aff..db65460 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DoubleColumnInList.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/DoubleColumnInList.java
@@ -18,6 +18,8 @@
package org.apache.hadoop.hive.ql.exec.vector.expressions;
+import java.util.Arrays;
+
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
@@ -156,6 +158,11 @@ public class DoubleColumnInList extends VectorExpression implements IDoubleInExp
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + colNum + ", values " + Arrays.toString(inListValues);
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
// return null since this will be handled as a special case in VectorizationContext
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColAndScalar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColAndScalar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColAndScalar.java
index bef1c18..578feb0 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColAndScalar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColAndScalar.java
@@ -73,6 +73,11 @@ public class FilterColAndScalar extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + colNum + ", val " + value;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColOrScalar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColOrScalar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColOrScalar.java
index ee0ac69..72f58b1 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColOrScalar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColOrScalar.java
@@ -73,6 +73,11 @@ public class FilterColOrScalar extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + colNum + ", val " + value;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDecimalColumnInList.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDecimalColumnInList.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDecimalColumnInList.java
index 79d3fe3..48f4a93 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDecimalColumnInList.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDecimalColumnInList.java
@@ -24,6 +24,7 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor.Descript
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
+import java.util.Arrays;
import java.util.HashSet;
/**
@@ -171,4 +172,10 @@ public class FilterDecimalColumnInList extends VectorExpression implements IDeci
public void setInListValues(HiveDecimal[] a) {
this.inListValues = a;
}
+
+ @Override
+ public String vectorExpressionParameters() {
+ return "col " + inputCol + ", values " + Arrays.toString(inListValues);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDoubleColumnInList.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDoubleColumnInList.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDoubleColumnInList.java
index 05dcb43..0252236 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDoubleColumnInList.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterDoubleColumnInList.java
@@ -177,4 +177,10 @@ public class FilterDoubleColumnInList extends VectorExpression implements IDoubl
public void setInListValues(double [] a) {
this.inListValues = a;
}
+
+ @Override
+ public String vectorExpressionParameters() {
+ return "col " + inputCol + ", values " + Arrays.toString(inListValues);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java
index 41e3b0f..175b497 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java
@@ -18,6 +18,8 @@
package org.apache.hadoop.hive.ql.exec.vector.expressions;
+import java.util.Arrays;
+
import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
@@ -51,6 +53,12 @@ public class FilterExprAndExpr extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ // The children are input.
+ return null;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
// IMPORTANT NOTE: For Multi-AND, the VectorizationContext class will catch cases with 3 or
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprOrExpr.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprOrExpr.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprOrExpr.java
index dc5139d..5ed1ed8 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprOrExpr.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprOrExpr.java
@@ -232,6 +232,12 @@ public class FilterExprOrExpr extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ // The children are input.
+ return null;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
// IMPORTANT NOTE: For Multi-OR, the VectorizationContext class will catch cases with 3 or
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterLongColumnInList.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterLongColumnInList.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterLongColumnInList.java
index a40f39c..dce1b43 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterLongColumnInList.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterLongColumnInList.java
@@ -177,4 +177,11 @@ public class FilterLongColumnInList extends VectorExpression implements ILongInE
public void setInListValues(long [] a) {
this.inListValues = a;
}
+
+ @Override
+ public String vectorExpressionParameters() {
+ return "col " + inputCol + ", values " + Arrays.toString(inListValues);
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarAndColumn.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarAndColumn.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarAndColumn.java
index bcc8f89..7092f4b 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarAndColumn.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarAndColumn.java
@@ -73,6 +73,11 @@ public class FilterScalarAndColumn extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "val " + value + ", col " + colNum;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarOrColumn.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarOrColumn.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarOrColumn.java
index f515e60..ab242ae 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarOrColumn.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarOrColumn.java
@@ -73,6 +73,11 @@ public class FilterScalarOrColumn extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "val " + value + ", col " + colNum;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColumnInList.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColumnInList.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColumnInList.java
index e34ec75..86c61e5 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColumnInList.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColumnInList.java
@@ -18,6 +18,9 @@
package org.apache.hadoop.hive.ql.exec.vector.expressions;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+
import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor.Descriptor;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
@@ -179,4 +182,14 @@ public class FilterStringColumnInList extends VectorExpression implements IStrin
public void setInListValues(byte [][] a) {
this.inListValues = a;
}
+
+ @Override
+ public String vectorExpressionParameters() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("col ");
+ sb.append(inputCol);
+ sb.append(", values ");
+ sb.append(displayArrayOfUtf8ByteArrays(inListValues));
+ return sb.toString();
+ }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStructColumnInList.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStructColumnInList.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStructColumnInList.java
index 1e21fea..8b873f3 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStructColumnInList.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStructColumnInList.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.hive.ql.exec.vector.expressions;
+import java.util.Arrays;
import java.util.List;
import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector;
@@ -176,4 +177,12 @@ public class FilterStructColumnInList extends FilterStringColumnInList implement
}
this.fieldVectorColumnTypes = fieldVectorColumnTypes;
}
+
+ @Override
+ public String vectorExpressionParameters() {
+ return "structExpressions " + Arrays.toString(structExpressions) +
+ ", fieldVectorColumnTypes " + Arrays.toString(fieldVectorColumnTypes) +
+ ", structColumnMap " + Arrays.toString(structColumnMap);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterTimestampColumnInList.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterTimestampColumnInList.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterTimestampColumnInList.java
index 25a276a..a7666bc 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterTimestampColumnInList.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterTimestampColumnInList.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.hive.ql.exec.vector.expressions;
import java.sql.Timestamp;
+import java.util.Arrays;
import java.util.HashSet;
import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector;
@@ -169,4 +170,10 @@ public class FilterTimestampColumnInList extends VectorExpression implements ITi
public void setInListValues(Timestamp[] a) {
this.inListValues = a;
}
+
+ @Override
+ public String vectorExpressionParameters() {
+ return "col " + inputCol + ", values " + Arrays.toString(inListValues);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToDouble.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToDouble.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToDouble.java
index cc6afa5..76fdeb5 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToDouble.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToDouble.java
@@ -134,6 +134,11 @@ public abstract class FuncDecimalToDouble extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
VectorExpressionDescriptor.Builder b = new VectorExpressionDescriptor.Builder();
b.setMode(VectorExpressionDescriptor.Mode.PROJECTION)
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToLong.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToLong.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToLong.java
index 7f005a1..8dbb7b9 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToLong.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToLong.java
@@ -131,6 +131,11 @@ public abstract class FuncDecimalToLong extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
VectorExpressionDescriptor.Builder b = new VectorExpressionDescriptor.Builder();
b.setMode(VectorExpressionDescriptor.Mode.PROJECTION)
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToTimestamp.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToTimestamp.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToTimestamp.java
index 561c152..569d7f7 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToTimestamp.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDecimalToTimestamp.java
@@ -122,6 +122,11 @@ public abstract class FuncDecimalToTimestamp extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
VectorExpressionDescriptor.Builder b = new VectorExpressionDescriptor.Builder();
b.setMode(VectorExpressionDescriptor.Mode.PROJECTION)
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDoubleToDecimal.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDoubleToDecimal.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDoubleToDecimal.java
index 0120c0a..1b3127c 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDoubleToDecimal.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncDoubleToDecimal.java
@@ -130,6 +130,10 @@ public abstract class FuncDoubleToDecimal extends VectorExpression {
this.inputColumn = inputColumn;
}
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn;
+ }
+
@Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
VectorExpressionDescriptor.Builder b = new VectorExpressionDescriptor.Builder();
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToDecimal.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToDecimal.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToDecimal.java
index b73e851..b527482 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToDecimal.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToDecimal.java
@@ -130,6 +130,10 @@ public abstract class FuncLongToDecimal extends VectorExpression {
this.inputColumn = inputColumn;
}
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn;
+ }
+
@Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
VectorExpressionDescriptor.Builder b = new VectorExpressionDescriptor.Builder();
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToString.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToString.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToString.java
index fa0a746..db45ed4 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToString.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToString.java
@@ -143,6 +143,10 @@ public abstract class FuncLongToString extends VectorExpression {
return "String";
}
+ @Override
+ public String vectorExpressionParameters() {
+ return "col " + inputCol;
+ }
@Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRoundWithNumDigitsDecimalToDecimal.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRoundWithNumDigitsDecimalToDecimal.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRoundWithNumDigitsDecimalToDecimal.java
index a18bb55..9eead7b 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRoundWithNumDigitsDecimalToDecimal.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRoundWithNumDigitsDecimalToDecimal.java
@@ -120,6 +120,10 @@ public class FuncRoundWithNumDigitsDecimalToDecimal extends VectorExpression {
return outputType;
}
+ public String vectorExpressionParameters() {
+ return "col " + colNum + ", decimalPlaces " + decimalPlaces;
+ }
+
@Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToDecimal.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToDecimal.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToDecimal.java
index 774551c..5f4e83a 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToDecimal.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToDecimal.java
@@ -131,6 +131,11 @@ public abstract class FuncTimestampToDecimal extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
VectorExpressionDescriptor.Builder b = new VectorExpressionDescriptor.Builder();
b.setMode(VectorExpressionDescriptor.Mode.PROJECTION)
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToLong.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToLong.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToLong.java
index b84d9be..b652226 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToLong.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncTimestampToLong.java
@@ -132,6 +132,11 @@ public abstract class FuncTimestampToLong extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + inputColumn;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
VectorExpressionDescriptor.Builder b = new VectorExpressionDescriptor.Builder();
b.setMode(VectorExpressionDescriptor.Mode.PROJECTION)
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java
index 402d0f8..2385a40 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java
@@ -81,6 +81,11 @@ public class IdentityExpression extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + colNum;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder()).build();
}
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprDoubleColumnDoubleColumn.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprDoubleColumnDoubleColumn.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprDoubleColumnDoubleColumn.java
index f0f4f6d..514b453 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprDoubleColumnDoubleColumn.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprDoubleColumnDoubleColumn.java
@@ -167,6 +167,11 @@ public class IfExprDoubleColumnDoubleColumn extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + arg1Column + ", col "+ arg2Column + ", col "+ arg3Column;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnColumn.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnColumn.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnColumn.java
index 804923e..98fa29e 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnColumn.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnColumn.java
@@ -136,6 +136,11 @@ public class IfExprIntervalDayTimeColumnColumn extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + arg1Column + ", col "+ arg2Column + ", col "+ arg3Column;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnScalar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnScalar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnScalar.java
index 8face7d..9dc3669 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnScalar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeColumnScalar.java
@@ -130,6 +130,11 @@ public class IfExprIntervalDayTimeColumnScalar extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + arg1Column + ", col "+ arg2Column + ", val "+ arg3Scalar.toString();
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarColumn.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarColumn.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarColumn.java
index 40f2e08..4d4649f 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarColumn.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarColumn.java
@@ -132,6 +132,11 @@ public class IfExprIntervalDayTimeScalarColumn extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + arg1Column + ", val "+ arg2Scalar + ", col "+ arg3Column;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarScalar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarScalar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarScalar.java
index 43676dd..c8f3294 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarScalar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprIntervalDayTimeScalarScalar.java
@@ -120,6 +120,11 @@ public class IfExprIntervalDayTimeScalarScalar extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + arg1Column + ", val "+ arg2Scalar + ", val "+ arg3Scalar;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprLongColumnLongColumn.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprLongColumnLongColumn.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprLongColumnLongColumn.java
index 06ba8f8..4c6015e 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprLongColumnLongColumn.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprLongColumnLongColumn.java
@@ -166,6 +166,11 @@ public class IfExprLongColumnLongColumn extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + arg1Column + ", col "+ arg2Column + ", col "+ arg3Column;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringGroupColumn.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringGroupColumn.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringGroupColumn.java
index ca11a55..c8367c6 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringGroupColumn.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringGroupColumn.java
@@ -177,6 +177,11 @@ public class IfExprStringGroupColumnStringGroupColumn extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + arg1Column + ", col "+ arg2Column + ", col "+ arg3Column;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringScalar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringScalar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringScalar.java
index 4e09448..915c6d8 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringScalar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringGroupColumnStringScalar.java
@@ -18,6 +18,8 @@
package org.apache.hadoop.hive.ql.exec.vector.expressions;
+import java.nio.charset.StandardCharsets;
+
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector;
@@ -164,6 +166,11 @@ public class IfExprStringGroupColumnStringScalar extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + arg1Column + ", col "+ arg2Column + ", val "+ displayUtf8Bytes(arg3Scalar);
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringGroupColumn.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringGroupColumn.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringGroupColumn.java
index 79ed71e..11d51e3 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringGroupColumn.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringGroupColumn.java
@@ -18,6 +18,8 @@
package org.apache.hadoop.hive.ql.exec.vector.expressions;
+import java.nio.charset.StandardCharsets;
+
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector;
@@ -164,6 +166,11 @@ public class IfExprStringScalarStringGroupColumn extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + arg1Column + ", val "+ displayUtf8Bytes(arg2Scalar) + ", col "+ arg3Column;
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(
http://git-wip-us.apache.org/repos/asf/hive/blob/fcb57100/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringScalar.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringScalar.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringScalar.java
index 2a35970..bd6558c 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringScalar.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IfExprStringScalarStringScalar.java
@@ -18,6 +18,8 @@
package org.apache.hadoop.hive.ql.exec.vector.expressions;
+import java.nio.charset.StandardCharsets;
+
import org.apache.hadoop.hive.ql.exec.vector.expressions.VectorExpression;
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector;
@@ -133,6 +135,11 @@ public class IfExprStringScalarStringScalar extends VectorExpression {
}
@Override
+ public String vectorExpressionParameters() {
+ return "col " + arg1Column + ", val "+ displayUtf8Bytes(arg2Scalar) + ", val "+ displayUtf8Bytes(arg3Scalar);
+ }
+
+ @Override
public VectorExpressionDescriptor.Descriptor getDescriptor() {
return (new VectorExpressionDescriptor.Builder())
.setMode(