You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2017/10/13 09:26:53 UTC
[04/10] carbondata git commit: [CARBONDATA-1539] Change data type
from enum to class
http://git-wip-us.apache.org/repos/asf/carbondata/blob/956833e5/core/src/test/java/org/apache/carbondata/core/scan/expression/ExpressionResultTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/scan/expression/ExpressionResultTest.java b/core/src/test/java/org/apache/carbondata/core/scan/expression/ExpressionResultTest.java
index 2cdb46e..cdc7fb9 100644
--- a/core/src/test/java/org/apache/carbondata/core/scan/expression/ExpressionResultTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/scan/expression/ExpressionResultTest.java
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.carbondata.core.metadata.datatype.DataType;
import org.apache.carbondata.core.constants.CarbonCommonConstants;
+import org.apache.carbondata.core.metadata.datatype.DataTypes;
import org.apache.carbondata.core.scan.expression.exception.FilterIllegalMemberException;
import org.junit.BeforeClass;
@@ -43,7 +44,7 @@ public class ExpressionResultTest {
private static ExpressionResult expressionResult;
@BeforeClass public static void setUp() {
- expressionResult = new ExpressionResult(DataType.INT, null);
+ expressionResult = new ExpressionResult(DataTypes.INT, null);
}
@Test public void testGetIntForNull() throws FilterIllegalMemberException {
@@ -51,7 +52,7 @@ public class ExpressionResultTest {
}
@Test public void testGetIntForString() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForString = new ExpressionResult(DataType.STRING, "5");
+ ExpressionResult expressionResultForString = new ExpressionResult(DataTypes.STRING, "5");
int actualValue = expressionResultForString.getInt();
int expectedValue = 5;
assertEquals(expectedValue, actualValue);
@@ -59,19 +60,19 @@ public class ExpressionResultTest {
@Test(expected = FilterIllegalMemberException.class)
public void testGetIntForNumberFormatException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForString = new ExpressionResult(DataType.STRING, "FOOBAR");
+ ExpressionResult expressionResultForString = new ExpressionResult(DataTypes.STRING, "FOOBAR");
expressionResultForString.getInt();
}
@Test public void testGetIntForDouble() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForDouble = new ExpressionResult(DataType.DOUBLE, 5.0);
+ ExpressionResult expressionResultForDouble = new ExpressionResult(DataTypes.DOUBLE, 5.0);
int actualValue = expressionResultForDouble.getInt();
int expectedValue = 5;
assertEquals(expectedValue, actualValue);
}
@Test public void testGetIntForInt() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForInt = new ExpressionResult(DataType.INT, 5);
+ ExpressionResult expressionResultForInt = new ExpressionResult(DataTypes.INT, 5);
int actualValue = expressionResultForInt.getInt();
int expectedValue = 5;
assertEquals(expectedValue, actualValue);
@@ -79,13 +80,13 @@ public class ExpressionResultTest {
@Test(expected = FilterIllegalMemberException.class)
public void testGetIntForIllegalMemberException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForInt = new ExpressionResult(DataType.FLOAT, 25.36);
+ ExpressionResult expressionResultForInt = new ExpressionResult(DataTypes.FLOAT, 25.36);
expressionResultForInt.getInt();
}
@Test(expected = FilterIllegalMemberException.class) public void testGetIntForClassCastException()
throws FilterIllegalMemberException {
- ExpressionResult expressionResultForInt = new ExpressionResult(DataType.INT, "STRING");
+ ExpressionResult expressionResultForInt = new ExpressionResult(DataTypes.INT, "STRING");
expressionResultForInt.getInt();
}
@@ -94,7 +95,7 @@ public class ExpressionResultTest {
}
@Test public void testGetShortForString() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForString = new ExpressionResult(DataType.STRING, "5");
+ ExpressionResult expressionResultForString = new ExpressionResult(DataTypes.STRING, "5");
short actualValue = expressionResultForString.getShort();
short expectedValue = 5;
assertEquals(expectedValue, actualValue);
@@ -102,19 +103,19 @@ public class ExpressionResultTest {
@Test(expected = FilterIllegalMemberException.class)
public void testGetShortForNumberFormatException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForString = new ExpressionResult(DataType.STRING, "FOOBAR");
+ ExpressionResult expressionResultForString = new ExpressionResult(DataTypes.STRING, "FOOBAR");
expressionResultForString.getShort();
}
@Test public void testGetShortForDouble() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForDouble = new ExpressionResult(DataType.DOUBLE, 5.0);
+ ExpressionResult expressionResultForDouble = new ExpressionResult(DataTypes.DOUBLE, 5.0);
short actualValue = expressionResultForDouble.getShort();
short expectedValue = 5;
assertEquals(expectedValue, actualValue);
}
@Test public void testGetShortForInt() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForInt = new ExpressionResult(DataType.INT, 5);
+ ExpressionResult expressionResultForInt = new ExpressionResult(DataTypes.INT, 5);
short actualValue = expressionResultForInt.getShort();
short expectedValue = 5;
assertEquals(expectedValue, actualValue);
@@ -122,13 +123,13 @@ public class ExpressionResultTest {
@Test(expected = FilterIllegalMemberException.class)
public void testGetShortForIllegalMemberException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForInt = new ExpressionResult(DataType.FLOAT, 25.36);
+ ExpressionResult expressionResultForInt = new ExpressionResult(DataTypes.FLOAT, 25.36);
expressionResultForInt.getShort();
}
@Test(expected = FilterIllegalMemberException.class)
public void testGetShortForClassCastException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForInt = new ExpressionResult(DataType.INT, "STRING");
+ ExpressionResult expressionResultForInt = new ExpressionResult(DataTypes.INT, "STRING");
expressionResultForInt.getShort();
}
@@ -137,14 +138,14 @@ public class ExpressionResultTest {
}
@Test public void testGetStringForString() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForString = new ExpressionResult(DataType.STRING, "5");
+ ExpressionResult expressionResultForString = new ExpressionResult(DataTypes.STRING, "5");
String actualValue = expressionResultForString.getString();
String expectedValue = "5";
assertEquals(expectedValue, actualValue);
}
@Test public void testGetStringForException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForString = new ExpressionResult(DataType.INT, "5");
+ ExpressionResult expressionResultForString = new ExpressionResult(DataTypes.INT, "5");
String actualValue = expressionResultForString.getString();
String expectedValue = "5";
assertEquals(expectedValue, actualValue);
@@ -155,7 +156,7 @@ public class ExpressionResultTest {
}
@Test public void testGetDoubleForString() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForString = new ExpressionResult(DataType.STRING, "5");
+ ExpressionResult expressionResultForString = new ExpressionResult(DataTypes.STRING, "5");
double actualValue = expressionResultForString.getDouble();
double expectedValue = 5;
assertEquals(expectedValue, actualValue, DELTA);
@@ -163,19 +164,19 @@ public class ExpressionResultTest {
@Test(expected = FilterIllegalMemberException.class)
public void testGetDoubleForNumberFormatException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForString = new ExpressionResult(DataType.STRING, "FOOBAR");
+ ExpressionResult expressionResultForString = new ExpressionResult(DataTypes.STRING, "FOOBAR");
expressionResultForString.getDouble();
}
@Test public void testGetDoubleForInt() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForDouble = new ExpressionResult(DataType.INT, 5);
+ ExpressionResult expressionResultForDouble = new ExpressionResult(DataTypes.INT, 5);
double actualValue = expressionResultForDouble.getDouble();
double expectedValue = 5.0;
assertEquals(expectedValue, actualValue, DELTA);
}
@Test public void testGetDoubleForDouble() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForDouble = new ExpressionResult(DataType.DOUBLE, 5.0);
+ ExpressionResult expressionResultForDouble = new ExpressionResult(DataTypes.DOUBLE, 5.0);
double actualValue = expressionResultForDouble.getDouble();
double expectedValue = 5;
assertEquals(expectedValue, actualValue, DELTA);
@@ -183,13 +184,13 @@ public class ExpressionResultTest {
@Test(expected = FilterIllegalMemberException.class)
public void testGetDoubleForIllegalMemberException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForDouble = new ExpressionResult(DataType.FLOAT, 25.36);
+ ExpressionResult expressionResultForDouble = new ExpressionResult(DataTypes.FLOAT, 25.36);
expressionResultForDouble.getDouble();
}
@Test(expected = FilterIllegalMemberException.class)
public void testGetDoubleForClassCastException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForDouble = new ExpressionResult(DataType.DOUBLE, "STRING");
+ ExpressionResult expressionResultForDouble = new ExpressionResult(DataTypes.DOUBLE, "STRING");
expressionResultForDouble.getDouble();
}
@@ -198,7 +199,7 @@ public class ExpressionResultTest {
}
@Test public void testGetLongForString() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForString = new ExpressionResult(DataType.STRING, "5");
+ ExpressionResult expressionResultForString = new ExpressionResult(DataTypes.STRING, "5");
long actualValue = expressionResultForString.getLong();
long expectedValue = 5;
assertEquals(expectedValue, actualValue);
@@ -206,19 +207,19 @@ public class ExpressionResultTest {
@Test(expected = FilterIllegalMemberException.class)
public void testGetLongForNumberFormatException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForString = new ExpressionResult(DataType.STRING, "FOOBAR");
+ ExpressionResult expressionResultForString = new ExpressionResult(DataTypes.STRING, "FOOBAR");
expressionResultForString.getLong();
}
@Test(expected = FilterIllegalMemberException.class)
public void testGetLongForIllegalMemberException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForLong = new ExpressionResult(DataType.FLOAT, 25.36);
+ ExpressionResult expressionResultForLong = new ExpressionResult(DataTypes.FLOAT, 25.36);
expressionResultForLong.getLong();
}
@Test(expected = FilterIllegalMemberException.class)
public void testGetLongForClassCastException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForLong = new ExpressionResult(DataType.LONG, "STRING");
+ ExpressionResult expressionResultForLong = new ExpressionResult(DataTypes.LONG, "STRING");
expressionResultForLong.getLong();
}
@@ -227,7 +228,7 @@ public class ExpressionResultTest {
}
@Test public void testGetDecimalForString() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForString = new ExpressionResult(DataType.STRING, "5");
+ ExpressionResult expressionResultForString = new ExpressionResult(DataTypes.STRING, "5");
BigDecimal actualValue = expressionResultForString.getDecimal();
BigDecimal expectedValue = new BigDecimal(5.00);
assertEquals(expectedValue, actualValue);
@@ -235,26 +236,26 @@ public class ExpressionResultTest {
@Test(expected = FilterIllegalMemberException.class)
public void testGetDecimalForNumberFormatException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForString = new ExpressionResult(DataType.STRING, "FOOBAR");
+ ExpressionResult expressionResultForString = new ExpressionResult(DataTypes.STRING, "FOOBAR");
expressionResultForString.getDecimal();
}
@Test public void testGetDecimalForInt() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForInt = new ExpressionResult(DataType.INT, 5);
+ ExpressionResult expressionResultForInt = new ExpressionResult(DataTypes.INT, 5);
BigDecimal actualValue = expressionResultForInt.getDecimal();
BigDecimal expectedValue = new BigDecimal(5);
assertEquals(expectedValue, actualValue);
}
@Test public void testGetDecimalForDouble() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForDouble = new ExpressionResult(DataType.DOUBLE, 5);
+ ExpressionResult expressionResultForDouble = new ExpressionResult(DataTypes.DOUBLE, 5);
BigDecimal actualValue = expressionResultForDouble.getDecimal();
BigDecimal expectedValue = new BigDecimal(5);
assertEquals(expectedValue, actualValue);
}
@Test public void testGetDecimalForDecimal() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForDecimal = new ExpressionResult(DataType.DECIMAL, 5);
+ ExpressionResult expressionResultForDecimal = new ExpressionResult(DataTypes.DECIMAL, 5);
BigDecimal actualValue = expressionResultForDecimal.getDecimal();
BigDecimal expectedValue = new BigDecimal(5);
assertEquals(expectedValue, actualValue);
@@ -262,13 +263,13 @@ public class ExpressionResultTest {
@Test(expected = FilterIllegalMemberException.class)
public void testGetDecimalForIllegalMemberException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForFloat = new ExpressionResult(DataType.FLOAT, 25.36);
+ ExpressionResult expressionResultForFloat = new ExpressionResult(DataTypes.FLOAT, 25.36);
expressionResultForFloat.getDecimal();
}
@Test(expected = FilterIllegalMemberException.class)
public void testGetDecimalForClassCastException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForException = new ExpressionResult(DataType.LONG, "STRING");
+ ExpressionResult expressionResultForException = new ExpressionResult(DataTypes.LONG, "STRING");
expressionResultForException.getDecimal();
}
@@ -278,7 +279,7 @@ public class ExpressionResultTest {
@Test public void testGetTimeForString() throws FilterIllegalMemberException {
ExpressionResult expressionResultForString =
- new ExpressionResult(DataType.STRING, "2016-11-07 10:15:09");
+ new ExpressionResult(DataTypes.STRING, "2016-11-07 10:15:09");
long actualValue = expressionResultForString.getTime();
long expectedValue = getTime("2016-11-07 10:15:09");
assertEquals(expectedValue, actualValue);
@@ -302,19 +303,19 @@ public class ExpressionResultTest {
@Test(expected = FilterIllegalMemberException.class) public void testGetTimeForParseException()
throws FilterIllegalMemberException {
ExpressionResult expressionResultForParseException =
- new ExpressionResult(DataType.STRING, "FOOBAR");
+ new ExpressionResult(DataTypes.STRING, "FOOBAR");
expressionResultForParseException.getTime();
}
@Test(expected = FilterIllegalMemberException.class)
public void testGetTimeForIllegalMemberException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForFloat = new ExpressionResult(DataType.FLOAT, 25.36);
+ ExpressionResult expressionResultForFloat = new ExpressionResult(DataTypes.FLOAT, 25.36);
expressionResultForFloat.getTime();
}
@Test(expected = FilterIllegalMemberException.class)
public void testGetTimeForClassCastException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForException = new ExpressionResult(DataType.LONG, "STRING");
+ ExpressionResult expressionResultForException = new ExpressionResult(DataTypes.LONG, "STRING");
expressionResultForException.getTime();
}
@@ -323,14 +324,14 @@ public class ExpressionResultTest {
}
@Test public void testGetBooleanForString() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForString = new ExpressionResult(DataType.STRING, "true");
+ ExpressionResult expressionResultForString = new ExpressionResult(DataTypes.STRING, "true");
boolean actualValue = expressionResultForString.getBoolean();
boolean expectedValue = true;
assertEquals(expectedValue, actualValue);
}
@Test public void testGetBooleanForBoolean() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForString = new ExpressionResult(DataType.BOOLEAN, "true");
+ ExpressionResult expressionResultForString = new ExpressionResult(DataTypes.BOOLEAN, "true");
boolean actualValue = expressionResultForString.getBoolean();
boolean expectedValue = true;
assertEquals(expectedValue, actualValue);
@@ -338,12 +339,12 @@ public class ExpressionResultTest {
@Test(expected = FilterIllegalMemberException.class)
public void testGetBooleanForIllegalMemberException() throws FilterIllegalMemberException {
- ExpressionResult expressionResultForFloat = new ExpressionResult(DataType.FLOAT, 25.36);
+ ExpressionResult expressionResultForFloat = new ExpressionResult(DataTypes.FLOAT, 25.36);
expressionResultForFloat.getBoolean();
}
@Test public void testGetList() {
- ExpressionResult obj = new ExpressionResult(DataType.STRING, "test");
+ ExpressionResult obj = new ExpressionResult(DataTypes.STRING, "test");
List<ExpressionResult> actualValue = obj.getList();
List<ExpressionResult> expected = new ArrayList<>();
expected.add(0, obj);
@@ -351,7 +352,7 @@ public class ExpressionResultTest {
}
@Test public void testHashCode() {
- ExpressionResult obj = new ExpressionResult(DataType.INT, 1);
+ ExpressionResult obj = new ExpressionResult(DataTypes.INT, 1);
int actualValue = obj.hashCode();
int expectedValue = 80;
assertEquals(expectedValue, actualValue);
@@ -365,14 +366,14 @@ public class ExpressionResultTest {
}
@Test public void testHashCodeForNul() {
- ExpressionResult obj = new ExpressionResult(DataType.DOUBLE, null);
+ ExpressionResult obj = new ExpressionResult(DataTypes.DOUBLE, null);
int actualValue = obj.hashCode();
int expectedValue = 31;
assertEquals(expectedValue, actualValue);
}
@Test public void testEqualsForObjNOtInstanceOfExpressionResult() {
- ExpressionResult expressionResult = new ExpressionResult(DataType.INT, 5);
+ ExpressionResult expressionResult = new ExpressionResult(DataTypes.INT, 5);
List obj = new ArrayList();
obj.add(0, 0);
obj.add(1, 1);
@@ -381,60 +382,60 @@ public class ExpressionResultTest {
}
@Test public void testEqualsForString() {
- ExpressionResult expressionResult = new ExpressionResult(DataType.STRING, "5");
- ExpressionResult objToCompare = new ExpressionResult(DataType.STRING, "6");
+ ExpressionResult expressionResult = new ExpressionResult(DataTypes.STRING, "5");
+ ExpressionResult objToCompare = new ExpressionResult(DataTypes.STRING, "6");
boolean result = expressionResult.equals(objToCompare);
assertFalse(result);
}
@Test public void testEqualsForShort() {
- ExpressionResult expressionResult = new ExpressionResult(DataType.SHORT, 5);
- ExpressionResult objToCompare = new ExpressionResult(DataType.SHORT, 6);
+ ExpressionResult expressionResult = new ExpressionResult(DataTypes.SHORT, 5);
+ ExpressionResult objToCompare = new ExpressionResult(DataTypes.SHORT, 6);
boolean result = expressionResult.equals(objToCompare);
assertFalse(result);
}
@Test public void testEqualsForInt() {
- ExpressionResult expressionResult = new ExpressionResult(DataType.INT, 5);
- ExpressionResult objToCompare = new ExpressionResult(DataType.INT, 6);
+ ExpressionResult expressionResult = new ExpressionResult(DataTypes.INT, 5);
+ ExpressionResult objToCompare = new ExpressionResult(DataTypes.INT, 6);
boolean result = expressionResult.equals(objToCompare);
assertFalse(result);
}
@Test public void testEqualsForDecimal() {
- ExpressionResult expressionResult = new ExpressionResult(DataType.DECIMAL, 5);
- ExpressionResult objToCompare = new ExpressionResult(DataType.DECIMAL, 6);
+ ExpressionResult expressionResult = new ExpressionResult(DataTypes.DECIMAL, 5);
+ ExpressionResult objToCompare = new ExpressionResult(DataTypes.DECIMAL, 6);
boolean result = expressionResult.equals(objToCompare);
assertFalse(result);
}
@Test public void testEqualsForDouble() {
- ExpressionResult expressionResult = new ExpressionResult(DataType.DOUBLE, 5.89);
- ExpressionResult objToCompare = new ExpressionResult(DataType.DOUBLE, 6.90);
+ ExpressionResult expressionResult = new ExpressionResult(DataTypes.DOUBLE, 5.89);
+ ExpressionResult objToCompare = new ExpressionResult(DataTypes.DOUBLE, 6.90);
boolean result = expressionResult.equals(objToCompare);
assertFalse(result);
}
@Test public void testEqualsForException() {
ExpressionResult expressionResult =
- new ExpressionResult(DataType.TIMESTAMP, "2016-11-07 10:15:09");
- ExpressionResult objToCompare = new ExpressionResult(DataType.DOUBLE, "2016-11-06 10:15:09");
+ new ExpressionResult(DataTypes.TIMESTAMP, "2016-11-07 10:15:09");
+ ExpressionResult objToCompare = new ExpressionResult(DataTypes.DOUBLE, "2016-11-06 10:15:09");
boolean result = expressionResult.equals(objToCompare);
assertFalse(result);
}
@Test public void testEqualsForLongAndTimeStamp() {
ExpressionResult expressionResult =
- new ExpressionResult(DataType.TIMESTAMP, new Long(11111111111111111L));
+ new ExpressionResult(DataTypes.TIMESTAMP, new Long(11111111111111111L));
ExpressionResult objToCompare =
- new ExpressionResult(DataType.LONG, new Long(11111111111111111L));
+ new ExpressionResult(DataTypes.LONG, new Long(11111111111111111L));
boolean result = expressionResult.equals(objToCompare);
assertTrue(result);
}
@Test public void compareToForInt() {
- ExpressionResult obj = new ExpressionResult(DataType.INT, 5);
- ExpressionResult expressionResult = new ExpressionResult(DataType.INT, 6);
+ ExpressionResult obj = new ExpressionResult(DataTypes.INT, 5);
+ ExpressionResult expressionResult = new ExpressionResult(DataTypes.INT, 6);
int actualValue = expressionResult.compareTo(obj);
int expectedValue = 1;
assertEquals(expectedValue, actualValue);
@@ -442,32 +443,32 @@ public class ExpressionResultTest {
}
@Test public void compareToForDecimal() {
- ExpressionResult obj = new ExpressionResult(DataType.DECIMAL, 5);
- ExpressionResult expressionResult = new ExpressionResult(DataType.DECIMAL, 6);
+ ExpressionResult obj = new ExpressionResult(DataTypes.DECIMAL, 5);
+ ExpressionResult expressionResult = new ExpressionResult(DataTypes.DECIMAL, 6);
int actualValue = expressionResult.compareTo(obj);
int expectedValue = 1;
assertEquals(expectedValue, actualValue);
}
@Test public void compareToForException() {
- ExpressionResult obj = new ExpressionResult(DataType.INT, 5);
- ExpressionResult expressionResult = new ExpressionResult(DataType.DECIMAL, 6);
+ ExpressionResult obj = new ExpressionResult(DataTypes.INT, 5);
+ ExpressionResult expressionResult = new ExpressionResult(DataTypes.DECIMAL, 6);
int actualValue = expressionResult.compareTo(obj);
int expectedValue = -1;
assertEquals(expectedValue, actualValue);
}
@Test public void compareToForTimestamp() {
- ExpressionResult obj = new ExpressionResult(DataType.TIMESTAMP, "2016-11-07 10:15:09");
+ ExpressionResult obj = new ExpressionResult(DataTypes.TIMESTAMP, "2016-11-07 10:15:09");
ExpressionResult expressionResult =
- new ExpressionResult(DataType.TIMESTAMP, "2016-11-07 10:15:09");
+ new ExpressionResult(DataTypes.TIMESTAMP, "2016-11-07 10:15:09");
int actualValue = expressionResult.compareTo(obj);
int expectedValue = 0;
assertEquals(expectedValue, actualValue);
}
@Test public void testGetListAsString() throws FilterIllegalMemberException {
- ExpressionResult obj = new ExpressionResult(DataType.INT, 6);
+ ExpressionResult obj = new ExpressionResult(DataTypes.INT, 6);
List<String> actualValue = obj.getListAsString();
List<String> expectedValue = new ArrayList<>();
expectedValue.add("6");
@@ -475,21 +476,21 @@ public class ExpressionResultTest {
}
@Test public void compareToForString() {
- ExpressionResult obj = new ExpressionResult(DataType.STRING, "2016");
- ExpressionResult expressionResult = new ExpressionResult(DataType.STRING, "2016");
+ ExpressionResult obj = new ExpressionResult(DataTypes.STRING, "2016");
+ ExpressionResult expressionResult = new ExpressionResult(DataTypes.STRING, "2016");
int actualValue = expressionResult.compareTo(obj);
int expectedValue = 0;
assertEquals(expectedValue, actualValue);
}
@Test public void testIsNullForNull() {
- ExpressionResult obj = new ExpressionResult(DataType.STRING, null);
+ ExpressionResult obj = new ExpressionResult(DataTypes.STRING, null);
boolean actualValue = obj.isNull();
assertTrue(actualValue);
}
@Test public void testIsNullForNotNull() {
- ExpressionResult obj = new ExpressionResult(DataType.STRING, "test");
+ ExpressionResult obj = new ExpressionResult(DataTypes.STRING, "test");
boolean actualValue = obj.isNull();
assertFalse(actualValue);
}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/956833e5/core/src/test/java/org/apache/carbondata/core/scan/expression/LiteralExpressionTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/scan/expression/LiteralExpressionTest.java b/core/src/test/java/org/apache/carbondata/core/scan/expression/LiteralExpressionTest.java
index b99c7f9..d913968 100644
--- a/core/src/test/java/org/apache/carbondata/core/scan/expression/LiteralExpressionTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/scan/expression/LiteralExpressionTest.java
@@ -17,7 +17,7 @@
package org.apache.carbondata.core.scan.expression;
-import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.metadata.datatype.DataTypes;
import org.apache.carbondata.core.scan.filter.intf.RowImpl;
import org.junit.Before;
@@ -31,13 +31,13 @@ public class LiteralExpressionTest {
@Before public void setUp() {
String value = "testing";
- literalExpression = new LiteralExpression(value, DataType.STRING);
+ literalExpression = new LiteralExpression(value, DataTypes.STRING);
}
@Test public void testEvaluate() {
RowImpl rowImpl = new RowImpl();
rowImpl.setValues(new String[] { "testing" });
- ExpressionResult expectedResult = new ExpressionResult(DataType.STRING, "testing");
+ ExpressionResult expectedResult = new ExpressionResult(DataTypes.STRING, "testing");
assertEquals(expectedResult, literalExpression.evaluate(rowImpl));
}
@@ -45,7 +45,7 @@ public class LiteralExpressionTest {
RowImpl rowImpl = new RowImpl();
rowImpl.setValues(new String[] { "testing" });
literalExpression.evaluate(rowImpl);
- ExpressionResult expectedResult = new ExpressionResult(DataType.STRING, "testing");
+ ExpressionResult expectedResult = new ExpressionResult(DataTypes.STRING, "testing");
assertEquals(expectedResult, literalExpression.evaluate(rowImpl));
}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/956833e5/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/EqualToExpressionUnitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/EqualToExpressionUnitTest.java b/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/EqualToExpressionUnitTest.java
index 7bc4287..0abfb18 100644
--- a/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/EqualToExpressionUnitTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/EqualToExpressionUnitTest.java
@@ -24,6 +24,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.metadata.datatype.DataTypes;
import org.apache.carbondata.core.scan.expression.ColumnExpression;
import org.apache.carbondata.core.scan.expression.ExpressionResult;
import org.apache.carbondata.core.scan.expression.exception.FilterIllegalMemberException;
@@ -44,7 +45,7 @@ public class EqualToExpressionUnitTest {
static EqualToExpression equalToExpression;
@Test public void testForEqualToExpressionWithGetString() throws Exception {
- ColumnExpression right = new ColumnExpression("name", DataType.STRING);
+ ColumnExpression right = new ColumnExpression("name", DataTypes.STRING);
right.setColIndex(0);
equalToExpression = new EqualToExpression(right, right);
String expected_result = "EqualTo(ColumnExpression(name),ColumnExpression(name))";
@@ -54,7 +55,7 @@ public class EqualToExpressionUnitTest {
@Test public void testEvaluateForEqualToExpressionWithShortDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("id", DataType.SHORT);
+ ColumnExpression right = new ColumnExpression("id", DataTypes.SHORT);
right.setColIndex(0);
equalToExpression = new EqualToExpression(right, right);
RowImpl value = new RowImpl();
@@ -75,7 +76,7 @@ public class EqualToExpressionUnitTest {
@Test public void testEvaluateForEqualToExpressionWithStringDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("name", DataType.STRING);
+ ColumnExpression right = new ColumnExpression("name", DataTypes.STRING);
right.setColIndex(0);
equalToExpression = new EqualToExpression(right, right);
RowImpl value = new RowImpl();
@@ -96,7 +97,7 @@ public class EqualToExpressionUnitTest {
@Test public void testEvaluateForEqualToExpressionWithIntDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("number", DataType.INT);
+ ColumnExpression right = new ColumnExpression("number", DataTypes.INT);
right.setColIndex(0);
equalToExpression = new EqualToExpression(right, right);
RowImpl value = new RowImpl();
@@ -116,7 +117,7 @@ public class EqualToExpressionUnitTest {
@Test public void testEvaluateForEqualToExpressionWithDoubleDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("contact", DataType.DOUBLE);
+ ColumnExpression right = new ColumnExpression("contact", DataTypes.DOUBLE);
right.setColIndex(0);
equalToExpression = new EqualToExpression(right, right);
RowImpl value = new RowImpl();
@@ -136,7 +137,7 @@ public class EqualToExpressionUnitTest {
@Test public void testEvaluateForEqualToExpressionWithLongDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("contact", DataType.LONG);
+ ColumnExpression right = new ColumnExpression("contact", DataTypes.LONG);
right.setColIndex(0);
equalToExpression = new EqualToExpression(right, right);
RowImpl value = new RowImpl();
@@ -157,7 +158,7 @@ public class EqualToExpressionUnitTest {
@Test public void testEvaluateForEqualToExpressionWithTimestampDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
try {
- ColumnExpression right = new ColumnExpression("timestamp", DataType.TIMESTAMP);
+ ColumnExpression right = new ColumnExpression("timestamp", DataTypes.TIMESTAMP);
right.setColIndex(0);
equalToExpression = new EqualToExpression(right, right);
RowImpl value = new RowImpl();
@@ -183,7 +184,7 @@ public class EqualToExpressionUnitTest {
@Test(expected = FilterUnsupportedException.class) public void testForEqualToExpressionForDefaultCase()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("contact", DataType.BOOLEAN);
+ ColumnExpression right = new ColumnExpression("contact", DataTypes.BOOLEAN);
right.setColIndex(0);
equalToExpression = new EqualToExpression(right, right);
RowImpl value = new RowImpl();
@@ -195,7 +196,7 @@ public class EqualToExpressionUnitTest {
@Test public void testEvaluateForEqualToExpressionWithBooleanParameter()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("id", DataType.SHORT);
+ ColumnExpression right = new ColumnExpression("id", DataTypes.SHORT);
right.setColIndex(0);
equalToExpression = new EqualToExpression(right, right, true);
RowImpl value = new RowImpl();
@@ -216,9 +217,9 @@ public class EqualToExpressionUnitTest {
@Test public void testEvaluateForEqualToExpressionWithLeftAndRightDifferentDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("name", DataType.STRING);
+ ColumnExpression left = new ColumnExpression("name", DataTypes.STRING);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("number", DataType.INT);
+ ColumnExpression right = new ColumnExpression("number", DataTypes.INT);
right.setColIndex(0);
equalToExpression = new EqualToExpression(left, right);
RowImpl value = new RowImpl();
@@ -239,7 +240,7 @@ public class EqualToExpressionUnitTest {
@Test public void testEvaluateForEqualToExpressionWithIsNullReturnFalse()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("id", DataType.SHORT);
+ ColumnExpression right = new ColumnExpression("id", DataTypes.SHORT);
right.setColIndex(0);
equalToExpression = new EqualToExpression(right, right);
RowImpl value = new RowImpl();
@@ -266,7 +267,7 @@ public class EqualToExpressionUnitTest {
@Test public void testEvaluateForEqualToExpressionWithNullWhileCreatingObject()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("id", DataType.SHORT);
+ ColumnExpression right = new ColumnExpression("id", DataTypes.SHORT);
right.setColIndex(0);
equalToExpression = new EqualToExpression(right, right, true);
RowImpl value = new RowImpl();
@@ -287,13 +288,13 @@ public class EqualToExpressionUnitTest {
};
ExpressionResult result = equalToExpression.evaluate(value);
- assertEquals(DataType.BOOLEAN, result.getDataType());
+ assertEquals(DataTypes.BOOLEAN, result.getDataType());
}
@Test public void testEvaluateForEqualToExpressionWithDecimalDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("contact", DataType.DECIMAL);
+ ColumnExpression right = new ColumnExpression("contact", DataTypes.DECIMAL);
right.setColIndex(0);
equalToExpression = new EqualToExpression(right, right);
RowImpl value = new RowImpl();
http://git-wip-us.apache.org/repos/asf/carbondata/blob/956833e5/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/GreaterThanEqualToExpressionUnitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/GreaterThanEqualToExpressionUnitTest.java b/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/GreaterThanEqualToExpressionUnitTest.java
index 6481dd5..35d8886 100644
--- a/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/GreaterThanEqualToExpressionUnitTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/GreaterThanEqualToExpressionUnitTest.java
@@ -24,6 +24,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.metadata.datatype.DataTypes;
import org.apache.carbondata.core.scan.expression.ColumnExpression;
import org.apache.carbondata.core.scan.expression.ExpressionResult;
import org.apache.carbondata.core.scan.expression.exception.FilterIllegalMemberException;
@@ -45,9 +46,9 @@ public class GreaterThanEqualToExpressionUnitTest {
@Test public void testEvaluateForGreaterThanEqualToExpressionWithBothStringISSame()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("left_name", DataType.STRING);
+ ColumnExpression left = new ColumnExpression("left_name", DataTypes.STRING);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("right_name", DataType.STRING);
+ ColumnExpression right = new ColumnExpression("right_name", DataTypes.STRING);
right.setColIndex(1);
greaterThanEqualToExpression = new GreaterThanEqualToExpression(left, right);
RowImpl value = new RowImpl();
@@ -67,9 +68,9 @@ public class GreaterThanEqualToExpressionUnitTest {
@Test public void testEvaluateForGreaterThanEqualToExpressionWithShortDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("id", DataType.SHORT);
+ ColumnExpression right = new ColumnExpression("id", DataTypes.SHORT);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("id", DataType.SHORT);
+ ColumnExpression left = new ColumnExpression("id", DataTypes.SHORT);
left.setColIndex(1);
greaterThanEqualToExpression = new GreaterThanEqualToExpression(left, right);
RowImpl value = new RowImpl();
@@ -91,9 +92,9 @@ public class GreaterThanEqualToExpressionUnitTest {
@Test public void testEvaluateForGreaterThanEqualToExpressionWithIntDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("right_number", DataType.INT);
+ ColumnExpression right = new ColumnExpression("right_number", DataTypes.INT);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("left_number", DataType.INT);
+ ColumnExpression left = new ColumnExpression("left_number", DataTypes.INT);
left.setColIndex(1);
greaterThanEqualToExpression = new GreaterThanEqualToExpression(left, right);
RowImpl value = new RowImpl();
@@ -114,9 +115,9 @@ public class GreaterThanEqualToExpressionUnitTest {
@Test public void testEvaluateForGreaterThanEqualToExpressionWithDoubleDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("right_contact", DataType.DOUBLE);
+ ColumnExpression right = new ColumnExpression("right_contact", DataTypes.DOUBLE);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("left_contact", DataType.DOUBLE);
+ ColumnExpression left = new ColumnExpression("left_contact", DataTypes.DOUBLE);
left.setColIndex(1);
greaterThanEqualToExpression = new GreaterThanEqualToExpression(left, right);
RowImpl value = new RowImpl();
@@ -137,9 +138,9 @@ public class GreaterThanEqualToExpressionUnitTest {
@Test public void testEvaluateForGreaterThanEqualToExpressionWithLongDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("contact", DataType.LONG);
+ ColumnExpression right = new ColumnExpression("contact", DataTypes.LONG);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("contact", DataType.LONG);
+ ColumnExpression left = new ColumnExpression("contact", DataTypes.LONG);
left.setColIndex(1);
greaterThanEqualToExpression = new GreaterThanEqualToExpression(left, right);
RowImpl value = new RowImpl();
@@ -161,9 +162,9 @@ public class GreaterThanEqualToExpressionUnitTest {
@Test public void testEvaluateForGreaterThanEqualToExpressionWithTimestampDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
try {
- ColumnExpression left = new ColumnExpression("timestamp", DataType.TIMESTAMP);
+ ColumnExpression left = new ColumnExpression("timestamp", DataTypes.TIMESTAMP);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("timestamp", DataType.TIMESTAMP);
+ ColumnExpression right = new ColumnExpression("timestamp", DataTypes.TIMESTAMP);
right.setColIndex(1);
greaterThanEqualToExpression = new GreaterThanEqualToExpression(left, right);
RowImpl value = new RowImpl();
@@ -190,9 +191,9 @@ public class GreaterThanEqualToExpressionUnitTest {
@Test(expected = FilterUnsupportedException.class) public void testForGreaterThanEqualToExpressionWithDefaultCase()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("contact", DataType.BOOLEAN);
+ ColumnExpression right = new ColumnExpression("contact", DataTypes.BOOLEAN);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("contact", DataType.BOOLEAN);
+ ColumnExpression left = new ColumnExpression("contact", DataTypes.BOOLEAN);
left.setColIndex(1);
greaterThanEqualToExpression = new GreaterThanEqualToExpression(left, right);
RowImpl value = new RowImpl();
@@ -204,9 +205,9 @@ public class GreaterThanEqualToExpressionUnitTest {
@Test public void testEvaluateForGreaterThanEqualToExpressionWithDecimalDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("contact", DataType.DECIMAL);
+ ColumnExpression right = new ColumnExpression("contact", DataTypes.DECIMAL);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("contact", DataType.DECIMAL);
+ ColumnExpression left = new ColumnExpression("contact", DataTypes.DECIMAL);
left.setColIndex(1);
greaterThanEqualToExpression = new GreaterThanEqualToExpression(left, right);
RowImpl value = new RowImpl();
@@ -226,9 +227,9 @@ public class GreaterThanEqualToExpressionUnitTest {
@Test public void testEvaluateForGreaterThanEqualToExpressionWithIsNullReturnTrue()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("id", DataType.SHORT);
+ ColumnExpression left = new ColumnExpression("id", DataTypes.SHORT);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("id", DataType.SHORT);
+ ColumnExpression right = new ColumnExpression("id", DataTypes.SHORT);
right.setColIndex(1);
greaterThanEqualToExpression = new GreaterThanEqualToExpression(left, right);
RowImpl value = new RowImpl();
@@ -255,9 +256,9 @@ public class GreaterThanEqualToExpressionUnitTest {
@Test public void testEvaluateForGreaterThanEqualToExpressionWithLeftAndRightDifferentDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("name", DataType.STRING);
+ ColumnExpression left = new ColumnExpression("name", DataTypes.STRING);
left.setColIndex(1);
- ColumnExpression right = new ColumnExpression("number", DataType.INT);
+ ColumnExpression right = new ColumnExpression("number", DataTypes.INT);
right.setColIndex(0);
greaterThanEqualToExpression = new GreaterThanEqualToExpression(left, right);
RowImpl value = new RowImpl();
@@ -277,9 +278,9 @@ public class GreaterThanEqualToExpressionUnitTest {
}
@Test public void testForGreaterThanEqualToExpressionWithGetString() throws Exception {
- ColumnExpression left = new ColumnExpression("left_name", DataType.STRING);
+ ColumnExpression left = new ColumnExpression("left_name", DataTypes.STRING);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("right_name", DataType.STRING);
+ ColumnExpression right = new ColumnExpression("right_name", DataTypes.STRING);
right.setColIndex(1);
greaterThanEqualToExpression = new GreaterThanEqualToExpression(left, right);
String expected_result = "GreaterThanEqualTo(ColumnExpression(left_name),ColumnExpression(right_name))";
http://git-wip-us.apache.org/repos/asf/carbondata/blob/956833e5/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/GreaterThanExpressionUnitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/GreaterThanExpressionUnitTest.java b/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/GreaterThanExpressionUnitTest.java
index 42cd791..7d6a168 100644
--- a/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/GreaterThanExpressionUnitTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/GreaterThanExpressionUnitTest.java
@@ -24,6 +24,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.metadata.datatype.DataTypes;
import org.apache.carbondata.core.scan.expression.ColumnExpression;
import org.apache.carbondata.core.scan.expression.ExpressionResult;
import org.apache.carbondata.core.scan.expression.exception.FilterIllegalMemberException;
@@ -44,9 +45,9 @@ public class GreaterThanExpressionUnitTest {
@Test public void testEvaluateForGreaterThanExpressionWithStringDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("left_name", DataType.STRING);
+ ColumnExpression left = new ColumnExpression("left_name", DataTypes.STRING);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("right_name", DataType.STRING);
+ ColumnExpression right = new ColumnExpression("right_name", DataTypes.STRING);
right.setColIndex(1);
greaterThanExpression = new GreaterThanExpression(left, right);
RowImpl value = new RowImpl();
@@ -75,9 +76,9 @@ public class GreaterThanExpressionUnitTest {
@Test public void testEvaluateForGreaterThanExpressionWithShortDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("id", DataType.SHORT);
+ ColumnExpression right = new ColumnExpression("id", DataTypes.SHORT);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("id", DataType.SHORT);
+ ColumnExpression left = new ColumnExpression("id", DataTypes.SHORT);
left.setColIndex(1);
greaterThanExpression = new GreaterThanExpression(left, right);
RowImpl value = new RowImpl();
@@ -109,9 +110,9 @@ public class GreaterThanExpressionUnitTest {
@Test public void testEvaluateForGreaterThanExpressionWithDoubleDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("right_contact", DataType.DOUBLE);
+ ColumnExpression right = new ColumnExpression("right_contact", DataTypes.DOUBLE);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("left_contact", DataType.DOUBLE);
+ ColumnExpression left = new ColumnExpression("left_contact", DataTypes.DOUBLE);
left.setColIndex(1);
greaterThanExpression = new GreaterThanExpression(left, right);
RowImpl value = new RowImpl();
@@ -142,9 +143,9 @@ public class GreaterThanExpressionUnitTest {
@Test public void testEvaluateForGreaterThanExpressionWithIntDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("right_number", DataType.INT);
+ ColumnExpression right = new ColumnExpression("right_number", DataTypes.INT);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("left_number", DataType.INT);
+ ColumnExpression left = new ColumnExpression("left_number", DataTypes.INT);
left.setColIndex(1);
greaterThanExpression = new GreaterThanExpression(left, right);
RowImpl value = new RowImpl();
@@ -176,9 +177,9 @@ public class GreaterThanExpressionUnitTest {
@Test public void testEvaluateForGreaterThanExpressionWithTimestampDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
try {
- ColumnExpression left = new ColumnExpression("timestamp", DataType.TIMESTAMP);
+ ColumnExpression left = new ColumnExpression("timestamp", DataTypes.TIMESTAMP);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("timestamp", DataType.TIMESTAMP);
+ ColumnExpression right = new ColumnExpression("timestamp", DataTypes.TIMESTAMP);
right.setColIndex(1);
greaterThanExpression = new GreaterThanExpression(left, right);
@@ -220,9 +221,9 @@ public class GreaterThanExpressionUnitTest {
@Test public void testEvaluateForGreaterThanExpressionWithLongDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("contact", DataType.LONG);
+ ColumnExpression right = new ColumnExpression("contact", DataTypes.LONG);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("contact", DataType.LONG);
+ ColumnExpression left = new ColumnExpression("contact", DataTypes.LONG);
left.setColIndex(1);
greaterThanExpression = new GreaterThanExpression(left, right);
RowImpl value = new RowImpl();
@@ -250,9 +251,9 @@ public class GreaterThanExpressionUnitTest {
@Test public void testEvaluateForGreaterThanExpressionWithDecimalDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("contact", DataType.DECIMAL);
+ ColumnExpression right = new ColumnExpression("contact", DataTypes.DECIMAL);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("contact", DataType.DECIMAL);
+ ColumnExpression left = new ColumnExpression("contact", DataTypes.DECIMAL);
left.setColIndex(1);
greaterThanExpression = new GreaterThanExpression(left, right);
RowImpl value = new RowImpl();
@@ -280,7 +281,7 @@ public class GreaterThanExpressionUnitTest {
@Test(expected = FilterUnsupportedException.class) public void testForGreaterThanExpressionWithDefaultCase()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("contact", DataType.BOOLEAN);
+ ColumnExpression right = new ColumnExpression("contact", DataTypes.BOOLEAN);
right.setColIndex(0);
greaterThanExpression = new GreaterThanExpression(right, right);
RowImpl value = new RowImpl();
@@ -292,7 +293,7 @@ public class GreaterThanExpressionUnitTest {
@Test public void testEvaluateForGreaterThanExpressionWithIsNullReturnTrue()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("id", DataType.SHORT);
+ ColumnExpression right = new ColumnExpression("id", DataTypes.SHORT);
right.setColIndex(0);
greaterThanExpression = new GreaterThanExpression(right, right);
RowImpl value = new RowImpl();
@@ -319,9 +320,9 @@ public class GreaterThanExpressionUnitTest {
@Test public void testEvaluateForGreaterThanExpressionWithLeftAndRightDifferentDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("name", DataType.STRING);
+ ColumnExpression left = new ColumnExpression("name", DataTypes.STRING);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("number", DataType.INT);
+ ColumnExpression right = new ColumnExpression("number", DataTypes.INT);
right.setColIndex(1);
greaterThanExpression = new GreaterThanExpression(left, right);
RowImpl value = new RowImpl();
@@ -350,9 +351,9 @@ public class GreaterThanExpressionUnitTest {
}
@Test public void testForGreaterThanExpressionWithGetString() throws Exception {
- ColumnExpression right = new ColumnExpression("right_name", DataType.STRING);
+ ColumnExpression right = new ColumnExpression("right_name", DataTypes.STRING);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("left_name", DataType.STRING);
+ ColumnExpression left = new ColumnExpression("left_name", DataTypes.STRING);
left.setColIndex(0);
greaterThanExpression = new GreaterThanExpression(left, right);
String expected_result = "GreaterThan(ColumnExpression(left_name),ColumnExpression(right_name))";
http://git-wip-us.apache.org/repos/asf/carbondata/blob/956833e5/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/InExpressionUnitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/InExpressionUnitTest.java b/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/InExpressionUnitTest.java
index 904f03b..2fd6585 100644
--- a/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/InExpressionUnitTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/InExpressionUnitTest.java
@@ -24,6 +24,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.metadata.datatype.DataTypes;
import org.apache.carbondata.core.scan.expression.ColumnExpression;
import org.apache.carbondata.core.scan.expression.ExpressionResult;
import org.apache.carbondata.core.scan.expression.exception.FilterIllegalMemberException;
@@ -45,9 +46,9 @@ public class InExpressionUnitTest {
@Test public void testEvaluateForInExpressionWithString()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("left_name", DataType.STRING);
+ ColumnExpression left = new ColumnExpression("left_name", DataTypes.STRING);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("right_name", DataType.STRING);
+ ColumnExpression right = new ColumnExpression("right_name", DataTypes.STRING);
right.setColIndex(1);
inExpression = new InExpression(left, right);
RowImpl value = new RowImpl();
@@ -58,7 +59,7 @@ public class InExpressionUnitTest {
new MockUp<ExpressionResult>() {
@Mock public DataType getDataType() {
- return DataType.STRING;
+ return DataTypes.STRING;
}
@Mock public String getString() {
@@ -74,9 +75,9 @@ public class InExpressionUnitTest {
@Test public void testEvaluateForInExpressionWithShortDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("left_id", DataType.SHORT);
+ ColumnExpression left = new ColumnExpression("left_id", DataTypes.SHORT);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("right_id", DataType.SHORT);
+ ColumnExpression right = new ColumnExpression("right_id", DataTypes.SHORT);
right.setColIndex(1);
inExpression = new InExpression(left, right);
RowImpl value = new RowImpl();
@@ -92,16 +93,16 @@ public class InExpressionUnitTest {
};
ExpressionResult result = inExpression.evaluate(value);
- assertEquals(result.getDataType(), DataType.BOOLEAN);
+ assertEquals(result.getDataType(), DataTypes.BOOLEAN);
}
@Test public void testEvaluateForInExpressionWithIntDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("left_id", DataType.INT);
+ ColumnExpression left = new ColumnExpression("left_id", DataTypes.INT);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("right_id", DataType.INT);
+ ColumnExpression right = new ColumnExpression("right_id", DataTypes.INT);
right.setColIndex(1);
inExpression = new InExpression(left, right);
RowImpl value = new RowImpl();
@@ -117,15 +118,15 @@ public class InExpressionUnitTest {
};
ExpressionResult result = inExpression.evaluate(value);
- assertEquals(result.getDataType(), DataType.BOOLEAN);
+ assertEquals(result.getDataType(), DataTypes.BOOLEAN);
}
@Test public void testEvaluateForInExpressionWithDoubleDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("left_contact", DataType.DOUBLE);
+ ColumnExpression left = new ColumnExpression("left_contact", DataTypes.DOUBLE);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("right_contact", DataType.DOUBLE);
+ ColumnExpression right = new ColumnExpression("right_contact", DataTypes.DOUBLE);
right.setColIndex(1);
inExpression = new InExpression(left, right);
RowImpl value = new RowImpl();
@@ -146,9 +147,9 @@ public class InExpressionUnitTest {
@Test public void testEvaluateForInExpressionWithLongDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("left_contact", DataType.LONG);
+ ColumnExpression left = new ColumnExpression("left_contact", DataTypes.LONG);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("right_contact", DataType.LONG);
+ ColumnExpression right = new ColumnExpression("right_contact", DataTypes.LONG);
right.setColIndex(1);
inExpression = new InExpression(left, right);
RowImpl value = new RowImpl();
@@ -170,9 +171,9 @@ public class InExpressionUnitTest {
@Test public void testEvaluateForInExpressionWithTimestampDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
try {
- ColumnExpression left = new ColumnExpression("left_timestamp", DataType.TIMESTAMP);
+ ColumnExpression left = new ColumnExpression("left_timestamp", DataTypes.TIMESTAMP);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("right_timestamp", DataType.TIMESTAMP);
+ ColumnExpression right = new ColumnExpression("right_timestamp", DataTypes.TIMESTAMP);
right.setColIndex(1);
inExpression = new InExpression(left, right);
@@ -202,9 +203,9 @@ public class InExpressionUnitTest {
@Test public void testEvaluateForInExpressionWithDecimalDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("left_contact", DataType.DECIMAL);
+ ColumnExpression left = new ColumnExpression("left_contact", DataTypes.DECIMAL);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("right_contact", DataType.DECIMAL);
+ ColumnExpression right = new ColumnExpression("right_contact", DataTypes.DECIMAL);
right.setColIndex(1);
inExpression = new InExpression(left, right);
RowImpl value = new RowImpl();
@@ -225,9 +226,9 @@ public class InExpressionUnitTest {
@Test(expected = FilterUnsupportedException.class) public void testForInExpressionWithDefaultCase()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("contact", DataType.BOOLEAN);
+ ColumnExpression left = new ColumnExpression("contact", DataTypes.BOOLEAN);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("contact", DataType.BOOLEAN);
+ ColumnExpression right = new ColumnExpression("contact", DataTypes.BOOLEAN);
right.setColIndex(1);
inExpression = new InExpression(left, right);
RowImpl value = new RowImpl();
@@ -239,9 +240,9 @@ public class InExpressionUnitTest {
}
@Test public void testForInExpressionWithGetString() throws Exception {
- ColumnExpression left = new ColumnExpression("left_name", DataType.STRING);
+ ColumnExpression left = new ColumnExpression("left_name", DataTypes.STRING);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("right_name", DataType.STRING);
+ ColumnExpression right = new ColumnExpression("right_name", DataTypes.STRING);
right.setColIndex(1);
inExpression = new InExpression(left, right);
String expected_result = "IN(ColumnExpression(left_name),ColumnExpression(right_name))";
@@ -251,9 +252,9 @@ public class InExpressionUnitTest {
@Test public void testEvaluateForInExpressionWithLeftAndRightDifferentDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("name", DataType.STRING);
+ ColumnExpression right = new ColumnExpression("name", DataTypes.STRING);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("number", DataType.INT);
+ ColumnExpression left = new ColumnExpression("number", DataTypes.INT);
left.setColIndex(1);
inExpression = new InExpression(left, right);
RowImpl value = new RowImpl();
http://git-wip-us.apache.org/repos/asf/carbondata/blob/956833e5/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/LessThanEqualToExpressionUnitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/LessThanEqualToExpressionUnitTest.java b/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/LessThanEqualToExpressionUnitTest.java
index 32cc836..7000ceb 100644
--- a/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/LessThanEqualToExpressionUnitTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/LessThanEqualToExpressionUnitTest.java
@@ -24,6 +24,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.metadata.datatype.DataTypes;
import org.apache.carbondata.core.scan.expression.ColumnExpression;
import org.apache.carbondata.core.scan.expression.ExpressionResult;
import org.apache.carbondata.core.scan.expression.exception.FilterIllegalMemberException;
@@ -45,9 +46,9 @@ public class LessThanEqualToExpressionUnitTest {
@Test public void testEvaluateForLessThanEqualToExpressionWithBothStringISSame()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("left_name", DataType.STRING);
+ ColumnExpression left = new ColumnExpression("left_name", DataTypes.STRING);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("right_name", DataType.STRING);
+ ColumnExpression right = new ColumnExpression("right_name", DataTypes.STRING);
left.setColIndex(1);
lessThanEqualToExpression = new LessThanEqualToExpression(left, left);
RowImpl value = new RowImpl();
@@ -78,9 +79,9 @@ public class LessThanEqualToExpressionUnitTest {
@Test public void testEvaluateForLessThanEqualToExpressionWithShortDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("id", DataType.SHORT);
+ ColumnExpression right = new ColumnExpression("id", DataTypes.SHORT);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("id", DataType.SHORT);
+ ColumnExpression left = new ColumnExpression("id", DataTypes.SHORT);
left.setColIndex(1);
lessThanEqualToExpression = new LessThanEqualToExpression(left, right);
RowImpl value = new RowImpl();
@@ -112,9 +113,9 @@ public class LessThanEqualToExpressionUnitTest {
@Test public void testEvaluateForLessThanEqualToExpressionWithDoubleDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("right_contact", DataType.DOUBLE);
+ ColumnExpression right = new ColumnExpression("right_contact", DataTypes.DOUBLE);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("left_contact", DataType.DOUBLE);
+ ColumnExpression left = new ColumnExpression("left_contact", DataTypes.DOUBLE);
left.setColIndex(1);
lessThanEqualToExpression = new LessThanEqualToExpression(left, right);
RowImpl value = new RowImpl();
@@ -145,9 +146,9 @@ public class LessThanEqualToExpressionUnitTest {
@Test public void testEvaluateForLessThanEqualToExpressionWithIntDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("right_number", DataType.INT);
+ ColumnExpression right = new ColumnExpression("right_number", DataTypes.INT);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("left_number", DataType.INT);
+ ColumnExpression left = new ColumnExpression("left_number", DataTypes.INT);
left.setColIndex(1);
lessThanEqualToExpression = new LessThanEqualToExpression(left, right);
RowImpl value = new RowImpl();
@@ -179,9 +180,9 @@ public class LessThanEqualToExpressionUnitTest {
@Test public void testEvaluateForLessThanEqualToExpressionWithTimestampDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
try {
- ColumnExpression left = new ColumnExpression("timestamp", DataType.TIMESTAMP);
+ ColumnExpression left = new ColumnExpression("timestamp", DataTypes.TIMESTAMP);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("timestamp", DataType.TIMESTAMP);
+ ColumnExpression right = new ColumnExpression("timestamp", DataTypes.TIMESTAMP);
right.setColIndex(1);
lessThanEqualToExpression = new LessThanEqualToExpression(left, right);
@@ -223,9 +224,9 @@ public class LessThanEqualToExpressionUnitTest {
@Test public void testEvaluateForLessThanEqualToExpressionWithLongDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("right_contact", DataType.LONG);
+ ColumnExpression right = new ColumnExpression("right_contact", DataTypes.LONG);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("left_contact", DataType.LONG);
+ ColumnExpression left = new ColumnExpression("left_contact", DataTypes.LONG);
left.setColIndex(1);
lessThanEqualToExpression = new LessThanEqualToExpression(left, right);
RowImpl value = new RowImpl();
@@ -253,9 +254,9 @@ public class LessThanEqualToExpressionUnitTest {
@Test public void testEvaluateForLessThanEqualToExpressionWithDecimalDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("right_contact", DataType.DECIMAL);
+ ColumnExpression right = new ColumnExpression("right_contact", DataTypes.DECIMAL);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("left_contact", DataType.DECIMAL);
+ ColumnExpression left = new ColumnExpression("left_contact", DataTypes.DECIMAL);
left.setColIndex(1);
lessThanEqualToExpression = new LessThanEqualToExpression(left, right);
RowImpl value = new RowImpl();
@@ -283,7 +284,7 @@ public class LessThanEqualToExpressionUnitTest {
@Test(expected = FilterUnsupportedException.class) public void testForLessThanEqualToExpressionWithDefaultCase()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("contact", DataType.BOOLEAN);
+ ColumnExpression right = new ColumnExpression("contact", DataTypes.BOOLEAN);
right.setColIndex(0);
lessThanEqualToExpression = new LessThanEqualToExpression(right, right);
RowImpl value = new RowImpl();
@@ -295,7 +296,7 @@ public class LessThanEqualToExpressionUnitTest {
@Test public void testEvaluateForLessThanEqualToExpressionWithIsNullReturnTrue()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("id", DataType.SHORT);
+ ColumnExpression right = new ColumnExpression("id", DataTypes.SHORT);
right.setColIndex(0);
lessThanEqualToExpression = new LessThanEqualToExpression(right, right);
RowImpl value = new RowImpl();
@@ -322,9 +323,9 @@ public class LessThanEqualToExpressionUnitTest {
@Test public void testEvaluateForLessThanEqualToExpressionWithLeftAndRightDifferentDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("name", DataType.STRING);
+ ColumnExpression left = new ColumnExpression("name", DataTypes.STRING);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("number", DataType.INT);
+ ColumnExpression right = new ColumnExpression("number", DataTypes.INT);
right.setColIndex(1);
lessThanEqualToExpression = new LessThanEqualToExpression(left, right);
RowImpl value = new RowImpl();
@@ -353,9 +354,9 @@ public class LessThanEqualToExpressionUnitTest {
}
@Test public void testForLessThanEqualToExpressionWithGetString() throws Exception {
- ColumnExpression right = new ColumnExpression("right_name", DataType.STRING);
+ ColumnExpression right = new ColumnExpression("right_name", DataTypes.STRING);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("left_name", DataType.STRING);
+ ColumnExpression left = new ColumnExpression("left_name", DataTypes.STRING);
left.setColIndex(0);
lessThanEqualToExpression = new LessThanEqualToExpression(left, right);
String expected_result =
http://git-wip-us.apache.org/repos/asf/carbondata/blob/956833e5/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/LessThanExpressionUnitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/LessThanExpressionUnitTest.java b/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/LessThanExpressionUnitTest.java
index 90684ac..889ebbd 100644
--- a/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/LessThanExpressionUnitTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/LessThanExpressionUnitTest.java
@@ -24,6 +24,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.metadata.datatype.DataTypes;
import org.apache.carbondata.core.scan.expression.ColumnExpression;
import org.apache.carbondata.core.scan.expression.ExpressionResult;
import org.apache.carbondata.core.scan.expression.exception.FilterIllegalMemberException;
@@ -44,9 +45,9 @@ public class LessThanExpressionUnitTest {
@Test public void testEvaluateForLessThanExpressionWithStringDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("left_name", DataType.STRING);
+ ColumnExpression left = new ColumnExpression("left_name", DataTypes.STRING);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("right_name", DataType.STRING);
+ ColumnExpression right = new ColumnExpression("right_name", DataTypes.STRING);
right.setColIndex(1);
lessThanExpression = new LessThanExpression(left, right);
RowImpl value = new RowImpl();
@@ -75,9 +76,9 @@ public class LessThanExpressionUnitTest {
@Test public void testEvaluateForLessThanExpressionWithShortDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("id", DataType.SHORT);
+ ColumnExpression right = new ColumnExpression("id", DataTypes.SHORT);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("id", DataType.SHORT);
+ ColumnExpression left = new ColumnExpression("id", DataTypes.SHORT);
left.setColIndex(1);
lessThanExpression = new LessThanExpression(left, right);
RowImpl value = new RowImpl();
@@ -109,9 +110,9 @@ public class LessThanExpressionUnitTest {
@Test public void testEvaluateForLessThanExpressionWithDoubleDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("right_contact", DataType.DOUBLE);
+ ColumnExpression right = new ColumnExpression("right_contact", DataTypes.DOUBLE);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("left_contact", DataType.DOUBLE);
+ ColumnExpression left = new ColumnExpression("left_contact", DataTypes.DOUBLE);
left.setColIndex(1);
lessThanExpression = new LessThanExpression(left, right);
RowImpl value = new RowImpl();
@@ -142,9 +143,9 @@ public class LessThanExpressionUnitTest {
@Test public void testEvaluateForLessThanExpressionWithIntDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("right_number", DataType.INT);
+ ColumnExpression right = new ColumnExpression("right_number", DataTypes.INT);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("left_number", DataType.INT);
+ ColumnExpression left = new ColumnExpression("left_number", DataTypes.INT);
left.setColIndex(1);
lessThanExpression = new LessThanExpression(left, right);
RowImpl value = new RowImpl();
@@ -176,9 +177,9 @@ public class LessThanExpressionUnitTest {
@Test public void testEvaluateForLessThanExpressionWithTimestampDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
try {
- ColumnExpression left = new ColumnExpression("timestamp", DataType.TIMESTAMP);
+ ColumnExpression left = new ColumnExpression("timestamp", DataTypes.TIMESTAMP);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("timestamp", DataType.TIMESTAMP);
+ ColumnExpression right = new ColumnExpression("timestamp", DataTypes.TIMESTAMP);
right.setColIndex(1);
lessThanExpression = new LessThanExpression(left, right);
@@ -220,9 +221,9 @@ public class LessThanExpressionUnitTest {
@Test public void testEvaluateForLessThanExpressionWithLongDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("contact", DataType.LONG);
+ ColumnExpression right = new ColumnExpression("contact", DataTypes.LONG);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("contact", DataType.LONG);
+ ColumnExpression left = new ColumnExpression("contact", DataTypes.LONG);
left.setColIndex(1);
lessThanExpression = new LessThanExpression(left, right);
RowImpl value = new RowImpl();
@@ -250,9 +251,9 @@ public class LessThanExpressionUnitTest {
@Test public void testEvaluateForLessThanExpressionWithDecimalDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("contact", DataType.DECIMAL);
+ ColumnExpression right = new ColumnExpression("contact", DataTypes.DECIMAL);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("contact", DataType.DECIMAL);
+ ColumnExpression left = new ColumnExpression("contact", DataTypes.DECIMAL);
left.setColIndex(1);
lessThanExpression = new LessThanExpression(left, right);
RowImpl value = new RowImpl();
@@ -280,7 +281,7 @@ public class LessThanExpressionUnitTest {
@Test(expected = FilterUnsupportedException.class) public void testForLessThanExpressionWithDefaultCase()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("contact", DataType.BOOLEAN);
+ ColumnExpression right = new ColumnExpression("contact", DataTypes.BOOLEAN);
right.setColIndex(0);
lessThanExpression = new LessThanExpression(right, right);
RowImpl value = new RowImpl();
@@ -292,7 +293,7 @@ public class LessThanExpressionUnitTest {
@Test public void testEvaluateForLessThanExpressionWithIsNullReturnTrue()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression right = new ColumnExpression("id", DataType.SHORT);
+ ColumnExpression right = new ColumnExpression("id", DataTypes.SHORT);
right.setColIndex(0);
lessThanExpression = new LessThanExpression(right, right);
RowImpl value = new RowImpl();
@@ -319,9 +320,9 @@ public class LessThanExpressionUnitTest {
@Test public void testEvaluateForLessThanExpressionWithLeftAndRightDifferentDataType()
throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("name", DataType.STRING);
+ ColumnExpression left = new ColumnExpression("name", DataTypes.STRING);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("number", DataType.INT);
+ ColumnExpression right = new ColumnExpression("number", DataTypes.INT);
right.setColIndex(1);
lessThanExpression = new LessThanExpression(left, right);
RowImpl value = new RowImpl();
@@ -350,9 +351,9 @@ public class LessThanExpressionUnitTest {
}
@Test public void testForLessThanExpressionWithGetString() throws Exception {
- ColumnExpression right = new ColumnExpression("right_name", DataType.STRING);
+ ColumnExpression right = new ColumnExpression("right_name", DataTypes.STRING);
right.setColIndex(0);
- ColumnExpression left = new ColumnExpression("left_name", DataType.STRING);
+ ColumnExpression left = new ColumnExpression("left_name", DataTypes.STRING);
left.setColIndex(0);
lessThanExpression = new LessThanExpression(left, right);
String expected_result = "LessThan(ColumnExpression(left_name),ColumnExpression(right_name))";
http://git-wip-us.apache.org/repos/asf/carbondata/blob/956833e5/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/ListExpressionUnitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/ListExpressionUnitTest.java b/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/ListExpressionUnitTest.java
index 6f8a375..22fdfd2 100644
--- a/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/ListExpressionUnitTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/scan/expression/conditional/ListExpressionUnitTest.java
@@ -19,6 +19,7 @@ package org.apache.carbondata.core.scan.expression.conditional;
import java.util.List;
import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.metadata.datatype.DataTypes;
import org.apache.carbondata.core.scan.expression.ColumnExpression;
import org.apache.carbondata.core.scan.expression.Expression;
import org.apache.carbondata.core.scan.expression.ExpressionResult;
@@ -40,9 +41,9 @@ public class ListExpressionUnitTest {
static ListExpression listExpression;
@Test public void test() throws FilterUnsupportedException, FilterIllegalMemberException {
- ColumnExpression left = new ColumnExpression("left_name", DataType.STRING);
+ ColumnExpression left = new ColumnExpression("left_name", DataTypes.STRING);
left.setColIndex(0);
- ColumnExpression right = new ColumnExpression("right_name", DataType.STRING);
+ ColumnExpression right = new ColumnExpression("right_name", DataTypes.STRING);
right.setColIndex(1);
List<Expression> children = new ArrayList<>();