You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/08/01 22:30:56 UTC
svn commit: r1509425 [6/6] - in /hive/branches/vectorization/ql/src:
java/org/apache/hadoop/hive/ql/exec/vector/
java/org/apache/hadoop/hive/ql/exec/vector/expressions/
java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/
java/org/apache/...
Modified: hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExpressions.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExpressions.java?rev=1509425&r1=1509424&r2=1509425&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExpressions.java (original)
+++ hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExpressions.java Thu Aug 1 20:30:52 2013
@@ -21,6 +21,7 @@ package org.apache.hadoop.hive.ql.exec.v
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Calendar;
+import java.util.List;
import java.util.Random;
import junit.framework.Assert;
@@ -42,6 +43,9 @@ import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.LongWritable;
import org.junit.Test;
+/**
+ * Unit tests for timestamp expressions.
+ */
public class TestVectorTimestampExpressions {
/* copied over from VectorUDFTimestampFieldLong */
@@ -63,7 +67,7 @@ public class TestVectorTimestampExpressi
}
private long[] getAllBoundaries() {
- ArrayList<Long> boundaries = new ArrayList<Long>(1);
+ List<Long> boundaries = new ArrayList<Long>(1);
Calendar c = Calendar.getInstance();
c.setTimeInMillis(0); // c.set doesn't reset millis
for (int year = 1902; year <= 2038; year++) {
@@ -126,7 +130,7 @@ public class TestVectorTimestampExpressi
Assert.assertEquals(batch.cols[in].noNulls, batch.cols[out].noNulls);
for (int i = 0; i < batch.size; i++) {
- if (batch.cols[in].noNulls || batch.cols[in].isNull[i] == false) {
+ if (batch.cols[in].noNulls || !batch.cols[in].isNull[i]) {
if (!batch.cols[in].noNulls) {
Assert.assertEquals(batch.cols[out].isNull[i], batch.cols[in].isNull[i]);
}
@@ -190,7 +194,7 @@ public class TestVectorTimestampExpressi
Assert.assertEquals(batch.cols[in].noNulls, batch.cols[out].noNulls);
for (int i = 0; i < batch.size; i++) {
- if (batch.cols[in].noNulls || batch.cols[in].isNull[i] == false) {
+ if (batch.cols[in].noNulls || !batch.cols[in].isNull[i]) {
if (!batch.cols[in].noNulls) {
Assert.assertEquals(batch.cols[out].isNull[i], batch.cols[in].isNull[i]);
}
@@ -252,7 +256,7 @@ public class TestVectorTimestampExpressi
Assert.assertEquals(batch.cols[in].noNulls, batch.cols[out].noNulls);
for (int i = 0; i < batch.size; i++) {
- if (batch.cols[in].noNulls || batch.cols[in].isNull[i] == false) {
+ if (batch.cols[in].noNulls || !batch.cols[in].isNull[i]) {
if (!batch.cols[in].noNulls) {
Assert.assertEquals(batch.cols[out].isNull[i], batch.cols[in].isNull[i]);
}
@@ -314,7 +318,7 @@ public class TestVectorTimestampExpressi
Assert.assertEquals(batch.cols[in].noNulls, batch.cols[out].noNulls);
for (int i = 0; i < batch.size; i++) {
- if (batch.cols[in].noNulls || batch.cols[in].isNull[i] == false) {
+ if (batch.cols[in].noNulls || !batch.cols[in].isNull[i]) {
if (!batch.cols[in].noNulls) {
Assert.assertEquals(batch.cols[out].isNull[i], batch.cols[in].isNull[i]);
}
@@ -376,7 +380,7 @@ public class TestVectorTimestampExpressi
Assert.assertEquals(batch.cols[in].noNulls, batch.cols[out].noNulls);
for (int i = 0; i < batch.size; i++) {
- if (batch.cols[in].noNulls || batch.cols[in].isNull[i] == false) {
+ if (batch.cols[in].noNulls || !batch.cols[in].isNull[i]) {
if (!batch.cols[in].noNulls) {
Assert.assertEquals(batch.cols[out].isNull[i], batch.cols[in].isNull[i]);
}
@@ -438,7 +442,7 @@ public class TestVectorTimestampExpressi
Assert.assertEquals(batch.cols[in].noNulls, batch.cols[out].noNulls);
for (int i = 0; i < batch.size; i++) {
- if (batch.cols[in].noNulls || batch.cols[in].isNull[i] == false) {
+ if (batch.cols[in].noNulls || !batch.cols[in].isNull[i]) {
if (!batch.cols[in].noNulls) {
Assert.assertEquals(batch.cols[out].isNull[i], batch.cols[in].isNull[i]);
}
@@ -489,7 +493,8 @@ public class TestVectorTimestampExpressi
TimestampWritable tsw = toTimestampWritable(t);
LongWritable res = udf.evaluate(tsw);
if(res.get() != y) {
- System.out.printf("%d vs %d for %d, %d\n", res.get(), y, t, tsw.getTimestamp().getTime()/1000);
+ System.out.printf("%d vs %d for %d, %d\n", res.get(), y, t,
+ tsw.getTimestamp().getTime()/1000);
}
Assert.assertEquals(res.get(), y);
@@ -504,7 +509,7 @@ public class TestVectorTimestampExpressi
Assert.assertEquals(batch.cols[in].noNulls, batch.cols[out].noNulls);
for (int i = 0; i < batch.size; i++) {
- if (batch.cols[in].noNulls || batch.cols[in].isNull[i] == false) {
+ if (batch.cols[in].noNulls || !batch.cols[in].isNull[i]) {
if (!batch.cols[in].noNulls) {
Assert.assertEquals(batch.cols[out].isNull[i], batch.cols[in].isNull[i]);
}
@@ -566,7 +571,7 @@ public class TestVectorTimestampExpressi
Assert.assertEquals(batch.cols[in].noNulls, batch.cols[out].noNulls);
for (int i = 0; i < batch.size; i++) {
- if (batch.cols[in].noNulls || batch.cols[in].isNull[i] == false) {
+ if (batch.cols[in].noNulls || !batch.cols[in].isNull[i]) {
if (!batch.cols[in].noNulls) {
Assert.assertEquals(batch.cols[out].isNull[i], batch.cols[in].isNull[i]);
}
Modified: hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/util/FakeVectorRowBatchFromObjectIterables.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/util/FakeVectorRowBatchFromObjectIterables.java?rev=1509425&r1=1509424&r2=1509425&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/util/FakeVectorRowBatchFromObjectIterables.java (original)
+++ hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/util/FakeVectorRowBatchFromObjectIterables.java Thu Aug 1 20:30:52 2013
@@ -41,7 +41,7 @@ public class FakeVectorRowBatchFromObjec
private final VectorizedRowBatch batch;
private boolean eof;
private final int batchSize;
-
+
public String[] getTypes() {
return this.types;
}
@@ -49,9 +49,8 @@ public class FakeVectorRowBatchFromObjec
/**
* Helper interface for assigning values to primitive vector column types.
*/
- private static interface ColumnVectorAssign
- {
- public void assign(
+ private static interface ColumnVectorAssign {
+ void assign(
ColumnVector columnVector,
int row,
Object value);
@@ -109,7 +108,7 @@ public class FakeVectorRowBatchFromObjec
lcv.vector[row] = TimestampUtils.getTimeNanoSec(t);
}
};
-
+
} else if (types[i].equalsIgnoreCase("string")) {
batch.cols[i] = new BytesColumnVector(batchSize);
columnAssign[i] = new ColumnVectorAssign() {
Modified: hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/util/VectorizedRowGroupGenUtil.java
URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/util/VectorizedRowGroupGenUtil.java?rev=1509425&r1=1509424&r2=1509425&view=diff
==============================================================================
--- hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/util/VectorizedRowGroupGenUtil.java (original)
+++ hive/branches/vectorization/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/util/VectorizedRowGroupGenUtil.java Thu Aug 1 20:30:52 2013
@@ -24,7 +24,6 @@ import org.apache.hadoop.hive.ql.exec.ve
import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
-
public class VectorizedRowGroupGenUtil {
private static final long LONG_VECTOR_NULL_VALUE = 1;
@@ -73,9 +72,8 @@ public class VectorizedRowGroupGenUtil {
return lcv;
}
- public static DoubleColumnVector generateDoubleColumnVector(
- boolean nulls, boolean repeating, int size, Random rand)
- {
+ public static DoubleColumnVector generateDoubleColumnVector(boolean nulls,
+ boolean repeating, int size, Random rand) {
DoubleColumnVector dcv = new DoubleColumnVector(size);
dcv.noNulls = !nulls;