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 2012/11/08 10:44:29 UTC
svn commit: r1406984 [25/29] - in /hive/trunk:
contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/
contrib/src/java/org/apache/hadoop/hive/contrib/serde2/
contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/
contrib/src/test...
Modified: hive/trunk/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/constants.py
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/constants.py?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/constants.py (original)
+++ hive/trunk/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/constants.py Thu Nov 8 09:44:19 2012
@@ -1,10 +1,12 @@
#
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.9.0)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
+# options string: py
+#
-from thrift.Thrift import *
+from thrift.Thrift import TType, TMessageType, TException, TApplicationException
from ttypes import *
SERIALIZATION_LIB = "serialization.lib"
Modified: hive/trunk/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/ttypes.py
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/ttypes.py?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/ttypes.py (original)
+++ hive/trunk/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/ttypes.py Thu Nov 8 09:44:19 2012
@@ -1,10 +1,12 @@
#
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.9.0)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
+# options string: py
+#
-from thrift.Thrift import *
+from thrift.Thrift import TType, TMessageType, TException, TApplicationException
from thrift.transport import TTransport
from thrift.protocol import TBinaryProtocol, TProtocol
Modified: hive/trunk/serde/src/gen/thrift/gen-rb/serde_constants.rb
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-rb/serde_constants.rb?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/gen/thrift/gen-rb/serde_constants.rb (original)
+++ hive/trunk/serde/src/gen/thrift/gen-rb/serde_constants.rb Thu Nov 8 09:44:19 2012
@@ -1,9 +1,10 @@
#
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.9.0)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
+require 'thrift'
require 'serde_types'
SERIALIZATION_LIB = %q"serialization.lib"
Modified: hive/trunk/serde/src/gen/thrift/gen-rb/serde_types.rb
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-rb/serde_types.rb?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/gen/thrift/gen-rb/serde_types.rb (original)
+++ hive/trunk/serde/src/gen/thrift/gen-rb/serde_types.rb Thu Nov 8 09:44:19 2012
@@ -1,7 +1,8 @@
#
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.9.0)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
+require 'thrift'
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/DelimitedJSONSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/DelimitedJSONSerDe.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/DelimitedJSONSerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/DelimitedJSONSerDe.java Thu Nov 8 09:44:19 2012
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
@@ -54,7 +54,7 @@ public class DelimitedJSONSerDe extends
@Override
protected void serializeField(ByteStream.Output out, Object obj, ObjectInspector objInspector,
SerDeParameters serdeParams) throws SerDeException {
- if (!objInspector.getCategory().equals(Category.PRIMITIVE) || (objInspector.getTypeName().equalsIgnoreCase(Constants.BINARY_TYPE_NAME))) {
+ if (!objInspector.getCategory().equals(Category.PRIMITIVE) || (objInspector.getTypeName().equalsIgnoreCase(serdeConstants.BINARY_TYPE_NAME))) {
try {
serialize(out, SerDeUtils.getJSONString(obj, objInspector),
PrimitiveObjectInspectorFactory.javaStringObjectInspector, serdeParams.getSeparators(),
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/MetadataTypedColumnsetSerDe.java Thu Nov 8 09:44:19 2012
@@ -27,7 +27,7 @@ import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.objectinspector.MetadataListStructObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory;
@@ -96,14 +96,14 @@ public class MetadataTypedColumnsetSerDe
}
public void initialize(Configuration job, Properties tbl) throws SerDeException {
- String altSep = tbl.getProperty(Constants.SERIALIZATION_FORMAT);
+ String altSep = tbl.getProperty(serdeConstants.SERIALIZATION_FORMAT);
separator = getByteValue(altSep, DefaultSeparator);
- String altNull = tbl.getProperty(Constants.SERIALIZATION_NULL_FORMAT);
+ String altNull = tbl.getProperty(serdeConstants.SERIALIZATION_NULL_FORMAT);
nullString = getByteValue(altNull, defaultNullString);
String columnProperty = tbl.getProperty("columns");
- String serdeName = tbl.getProperty(Constants.SERIALIZATION_LIB);
+ String serdeName = tbl.getProperty(serdeConstants.SERIALIZATION_LIB);
// tables that were serialized with columnsetSerDe doesn't have metadata
// so this hack applies to all such tables
boolean columnsetSerDe = false;
@@ -125,7 +125,7 @@ public class MetadataTypedColumnsetSerDe
}
String lastColumnTakesRestString = tbl
- .getProperty(Constants.SERIALIZATION_LAST_COLUMN_TAKES_REST);
+ .getProperty(serdeConstants.SERIALIZATION_LAST_COLUMN_TAKES_REST);
lastColumnTakesRest = (lastColumnTakesRestString != null && lastColumnTakesRestString
.equalsIgnoreCase("true"));
splitLimit = (lastColumnTakesRest && columnNames != null) ? columnNames
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java Thu Nov 8 09:44:19 2012
@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory;
import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
@@ -82,8 +82,8 @@ public class RegexSerDe implements SerDe
// Read the configuration parameters
inputRegex = tbl.getProperty("input.regex");
- String columnNameProperty = tbl.getProperty(Constants.LIST_COLUMNS);
- String columnTypeProperty = tbl.getProperty(Constants.LIST_COLUMN_TYPES);
+ String columnNameProperty = tbl.getProperty(serdeConstants.LIST_COLUMNS);
+ String columnTypeProperty = tbl.getProperty(serdeConstants.LIST_COLUMN_TYPES);
boolean inputRegexIgnoreCase = "true".equalsIgnoreCase(tbl
.getProperty("input.regex.case.insensitive"));
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java Thu Nov 8 09:44:19 2012
@@ -29,7 +29,7 @@ import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.SerDe;
import org.apache.hadoop.hive.serde2.SerDeException;
import org.apache.hadoop.hive.serde2.SerDeStats;
@@ -112,8 +112,8 @@ public class BinarySortableSerDe impleme
throws SerDeException {
// Get column names and sort order
- String columnNameProperty = tbl.getProperty(Constants.LIST_COLUMNS);
- String columnTypeProperty = tbl.getProperty(Constants.LIST_COLUMN_TYPES);
+ String columnNameProperty = tbl.getProperty(serdeConstants.LIST_COLUMNS);
+ String columnTypeProperty = tbl.getProperty(serdeConstants.LIST_COLUMN_TYPES);
if (columnNameProperty.length() == 0) {
columnNames = new ArrayList<String>();
} else {
@@ -138,7 +138,7 @@ public class BinarySortableSerDe impleme
// Get the sort order
String columnSortOrder = tbl
- .getProperty(Constants.SERIALIZATION_SORT_ORDER);
+ .getProperty(serdeConstants.SERIALIZATION_SORT_ORDER);
columnSortOrderIsDesc = new boolean[columnNames.size()];
for (int i = 0; i < columnSortOrderIsDesc.length; i++) {
columnSortOrderIsDesc[i] = (columnSortOrder != null && columnSortOrder
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java Thu Nov 8 09:44:19 2012
@@ -27,7 +27,7 @@ import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.ByteStream;
import org.apache.hadoop.hive.serde2.SerDe;
import org.apache.hadoop.hive.serde2.SerDeException;
@@ -76,7 +76,7 @@ public class DynamicSerDe implements Ser
public void initialize(Configuration job, Properties tbl) throws SerDeException {
try {
- String ddl = tbl.getProperty(Constants.SERIALIZATION_DDL);
+ String ddl = tbl.getProperty(serdeConstants.SERIALIZATION_DDL);
// type_name used to be tbl.getProperty(META_TABLE_NAME).
// However, now the value is DBName.TableName. To make it backward compatible,
// we take the TableName part as type_name.
@@ -88,7 +88,7 @@ public class DynamicSerDe implements Ser
} else {
type_name = tableName;
}
- String protoName = tbl.getProperty(Constants.SERIALIZATION_FORMAT);
+ String protoName = tbl.getProperty(serdeConstants.SERIALIZATION_FORMAT);
if (protoName == null) {
protoName = "org.apache.thrift.protocol.TBinaryProtocol";
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeList.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeList.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeList.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeTypeList.java Thu Nov 8 09:44:19 2012
@@ -21,7 +21,7 @@ package org.apache.hadoop.hive.serde2.dy
import java.util.ArrayList;
import java.util.List;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.SerDeException;
import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
@@ -70,7 +70,7 @@ public class DynamicSerDeTypeList extend
@Override
public String toString() {
- return Constants.LIST_TYPE_NAME + "<" + getElementType().toString() + ">";
+ return serdeConstants.LIST_TYPE_NAME + "<" + getElementType().toString() + ">";
}
@Override
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java Thu Nov 8 09:44:19 2012
@@ -27,7 +27,7 @@ import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.ByteStream;
import org.apache.hadoop.hive.serde2.SerDe;
import org.apache.hadoop.hive.serde2.SerDeException;
@@ -212,22 +212,22 @@ public class LazySimpleSerDe implements
// should change this when we allow users to specify more than 10 levels
// of separators through DDL.
serdeParams.separators = new byte[8];
- serdeParams.separators[0] = getByte(tbl.getProperty(Constants.FIELD_DELIM,
- tbl.getProperty(Constants.SERIALIZATION_FORMAT)), DefaultSeparators[0]);
+ serdeParams.separators[0] = getByte(tbl.getProperty(serdeConstants.FIELD_DELIM,
+ tbl.getProperty(serdeConstants.SERIALIZATION_FORMAT)), DefaultSeparators[0]);
serdeParams.separators[1] = getByte(tbl
- .getProperty(Constants.COLLECTION_DELIM), DefaultSeparators[1]);
+ .getProperty(serdeConstants.COLLECTION_DELIM), DefaultSeparators[1]);
serdeParams.separators[2] = getByte(
- tbl.getProperty(Constants.MAPKEY_DELIM), DefaultSeparators[2]);
+ tbl.getProperty(serdeConstants.MAPKEY_DELIM), DefaultSeparators[2]);
for (int i = 3; i < serdeParams.separators.length; i++) {
serdeParams.separators[i] = (byte) (i + 1);
}
serdeParams.nullString = tbl.getProperty(
- Constants.SERIALIZATION_NULL_FORMAT, "\\N");
+ serdeConstants.SERIALIZATION_NULL_FORMAT, "\\N");
serdeParams.nullSequence = new Text(serdeParams.nullString);
String lastColumnTakesRestString = tbl
- .getProperty(Constants.SERIALIZATION_LAST_COLUMN_TAKES_REST);
+ .getProperty(serdeConstants.SERIALIZATION_LAST_COLUMN_TAKES_REST);
serdeParams.lastColumnTakesRest = (lastColumnTakesRestString != null && lastColumnTakesRestString
.equalsIgnoreCase("true"));
@@ -238,7 +238,7 @@ public class LazySimpleSerDe implements
serdeParams.columnNames, serdeParams.columnTypes);
// Get the escape information
- String escapeProperty = tbl.getProperty(Constants.ESCAPE_CHAR);
+ String escapeProperty = tbl.getProperty(serdeConstants.ESCAPE_CHAR);
serdeParams.escaped = (escapeProperty != null);
if (serdeParams.escaped) {
serdeParams.escapeChar = getByte(escapeProperty, (byte) '\\');
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java Thu Nov 8 09:44:19 2012
@@ -28,7 +28,7 @@ import java.util.Arrays;
import java.util.Properties;
import org.apache.commons.codec.binary.Base64;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.SerDeException;
import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters;
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
@@ -315,9 +315,9 @@ public final class LazyUtils {
public static void extractColumnInfo(Properties tbl, SerDeParameters serdeParams,
String serdeName) throws SerDeException {
// Read the configuration parameters
- String columnNameProperty = tbl.getProperty(Constants.LIST_COLUMNS);
+ String columnNameProperty = tbl.getProperty(serdeConstants.LIST_COLUMNS);
// NOTE: if "columns.types" is missing, all columns will be of String type
- String columnTypeProperty = tbl.getProperty(Constants.LIST_COLUMN_TYPES);
+ String columnTypeProperty = tbl.getProperty(serdeConstants.LIST_COLUMN_TYPES);
// Parse the configuration parameters
@@ -333,7 +333,7 @@ public final class LazyUtils {
if (i > 0) {
sb.append(":");
}
- sb.append(Constants.STRING_TYPE_NAME);
+ sb.append(serdeConstants.STRING_TYPE_NAME);
}
columnTypeProperty = sb.toString();
}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyListObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyListObjectInspector.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyListObjectInspector.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyListObjectInspector.java Thu Nov 8 09:44:19 2012
@@ -98,7 +98,7 @@ public class LazyListObjectInspector imp
@Override
public String getTypeName() {
- return org.apache.hadoop.hive.serde.Constants.LIST_TYPE_NAME + "<"
+ return org.apache.hadoop.hive.serde.serdeConstants.LIST_TYPE_NAME + "<"
+ listElementObjectInspector.getTypeName() + ">";
}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyMapObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyMapObjectInspector.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyMapObjectInspector.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyMapObjectInspector.java Thu Nov 8 09:44:19 2012
@@ -71,7 +71,7 @@ public class LazyMapObjectInspector impl
@Override
public String getTypeName() {
- return org.apache.hadoop.hive.serde.Constants.MAP_TYPE_NAME + "<"
+ return org.apache.hadoop.hive.serde.serdeConstants.MAP_TYPE_NAME + "<"
+ mapKeyObjectInspector.getTypeName() + ","
+ mapValueObjectInspector.getTypeName() + ">";
}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java Thu Nov 8 09:44:19 2012
@@ -27,7 +27,7 @@ import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.ByteStream;
import org.apache.hadoop.hive.serde2.ByteStream.Output;
import org.apache.hadoop.hive.serde2.SerDe;
@@ -94,8 +94,8 @@ public class LazyBinarySerDe implements
public void initialize(Configuration conf, Properties tbl)
throws SerDeException {
// Get column names and types
- String columnNameProperty = tbl.getProperty(Constants.LIST_COLUMNS);
- String columnTypeProperty = tbl.getProperty(Constants.LIST_COLUMN_TYPES);
+ String columnNameProperty = tbl.getProperty(serdeConstants.LIST_COLUMNS);
+ String columnTypeProperty = tbl.getProperty(serdeConstants.LIST_COLUMN_TYPES);
if (columnNameProperty.length() == 0) {
columnNames = new ArrayList<String>();
} else {
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java Thu Nov 8 09:44:19 2012
@@ -29,7 +29,7 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.io.TimestampWritable;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory.ObjectInspectorOptions;
@@ -312,7 +312,7 @@ public final class ObjectInspectorUtils
public static String getStandardUnionTypeName(UnionObjectInspector uoi) {
StringBuilder sb = new StringBuilder();
- sb.append(Constants.UNION_TYPE_NAME + "<");
+ sb.append(serdeConstants.UNION_TYPE_NAME + "<");
List<ObjectInspector> ois = uoi.getObjectInspectors();
for(int i = 0; i < ois.size(); i++) {
if (i > 0) {
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StandardListObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StandardListObjectInspector.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StandardListObjectInspector.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StandardListObjectInspector.java Thu Nov 8 09:44:19 2012
@@ -102,7 +102,7 @@ public class StandardListObjectInspector
}
public String getTypeName() {
- return org.apache.hadoop.hive.serde.Constants.LIST_TYPE_NAME + "<"
+ return org.apache.hadoop.hive.serde.serdeConstants.LIST_TYPE_NAME + "<"
+ listElementObjectInspector.getTypeName() + ">";
}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StandardMapObjectInspector.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StandardMapObjectInspector.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StandardMapObjectInspector.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StandardMapObjectInspector.java Thu Nov 8 09:44:19 2012
@@ -88,7 +88,7 @@ public class StandardMapObjectInspector
}
public String getTypeName() {
- return org.apache.hadoop.hive.serde.Constants.MAP_TYPE_NAME + "<"
+ return org.apache.hadoop.hive.serde.serdeConstants.MAP_TYPE_NAME + "<"
+ mapKeyObjectInspector.getTypeName() + ","
+ mapValueObjectInspector.getTypeName() + ">";
}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java Thu Nov 8 09:44:19 2012
@@ -25,7 +25,7 @@ import java.sql.Timestamp;
import java.util.HashMap;
import java.util.Map;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.io.ByteWritable;
import org.apache.hadoop.hive.serde2.io.DoubleWritable;
import org.apache.hadoop.hive.serde2.io.ShortWritable;
@@ -144,39 +144,39 @@ public final class PrimitiveObjectInspec
}
public static final PrimitiveTypeEntry binaryTypeEntry = new PrimitiveTypeEntry(
- PrimitiveCategory.BINARY, Constants.BINARY_TYPE_NAME, byte[].class,
+ PrimitiveCategory.BINARY, serdeConstants.BINARY_TYPE_NAME, byte[].class,
byte[].class, BytesWritable.class);
public static final PrimitiveTypeEntry stringTypeEntry = new PrimitiveTypeEntry(
- PrimitiveCategory.STRING, Constants.STRING_TYPE_NAME, null, String.class,
+ PrimitiveCategory.STRING, serdeConstants.STRING_TYPE_NAME, null, String.class,
Text.class);
public static final PrimitiveTypeEntry booleanTypeEntry = new PrimitiveTypeEntry(
- PrimitiveCategory.BOOLEAN, Constants.BOOLEAN_TYPE_NAME, Boolean.TYPE,
+ PrimitiveCategory.BOOLEAN, serdeConstants.BOOLEAN_TYPE_NAME, Boolean.TYPE,
Boolean.class, BooleanWritable.class);
public static final PrimitiveTypeEntry intTypeEntry = new PrimitiveTypeEntry(
- PrimitiveCategory.INT, Constants.INT_TYPE_NAME, Integer.TYPE,
+ PrimitiveCategory.INT, serdeConstants.INT_TYPE_NAME, Integer.TYPE,
Integer.class, IntWritable.class);
public static final PrimitiveTypeEntry longTypeEntry = new PrimitiveTypeEntry(
- PrimitiveCategory.LONG, Constants.BIGINT_TYPE_NAME, Long.TYPE,
+ PrimitiveCategory.LONG, serdeConstants.BIGINT_TYPE_NAME, Long.TYPE,
Long.class, LongWritable.class);
public static final PrimitiveTypeEntry floatTypeEntry = new PrimitiveTypeEntry(
- PrimitiveCategory.FLOAT, Constants.FLOAT_TYPE_NAME, Float.TYPE,
+ PrimitiveCategory.FLOAT, serdeConstants.FLOAT_TYPE_NAME, Float.TYPE,
Float.class, FloatWritable.class);
public static final PrimitiveTypeEntry voidTypeEntry = new PrimitiveTypeEntry(
- PrimitiveCategory.VOID, Constants.VOID_TYPE_NAME, Void.TYPE, Void.class,
+ PrimitiveCategory.VOID, serdeConstants.VOID_TYPE_NAME, Void.TYPE, Void.class,
NullWritable.class);
// No corresponding Writable classes for the following 3 in hadoop 0.17.0
public static final PrimitiveTypeEntry doubleTypeEntry = new PrimitiveTypeEntry(
- PrimitiveCategory.DOUBLE, Constants.DOUBLE_TYPE_NAME, Double.TYPE,
+ PrimitiveCategory.DOUBLE, serdeConstants.DOUBLE_TYPE_NAME, Double.TYPE,
Double.class, DoubleWritable.class);
public static final PrimitiveTypeEntry byteTypeEntry = new PrimitiveTypeEntry(
- PrimitiveCategory.BYTE, Constants.TINYINT_TYPE_NAME, Byte.TYPE,
+ PrimitiveCategory.BYTE, serdeConstants.TINYINT_TYPE_NAME, Byte.TYPE,
Byte.class, ByteWritable.class);
public static final PrimitiveTypeEntry shortTypeEntry = new PrimitiveTypeEntry(
- PrimitiveCategory.SHORT, Constants.SMALLINT_TYPE_NAME, Short.TYPE,
+ PrimitiveCategory.SHORT, serdeConstants.SMALLINT_TYPE_NAME, Short.TYPE,
Short.class, ShortWritable.class);
public static final PrimitiveTypeEntry timestampTypeEntry = new PrimitiveTypeEntry(
- PrimitiveCategory.TIMESTAMP, Constants.TIMESTAMP_TYPE_NAME, null,
+ PrimitiveCategory.TIMESTAMP, serdeConstants.TIMESTAMP_TYPE_NAME, null,
Object.class, TimestampWritable.class);
// The following is a complex type for special handling
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TBinarySortableProtocol.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TBinarySortableProtocol.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TBinarySortableProtocol.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TBinarySortableProtocol.java Thu Nov 8 09:44:19 2012
@@ -26,7 +26,7 @@ import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.io.Text;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TField;
@@ -116,14 +116,14 @@ public class TBinarySortableProtocol ext
boolean ascending;
public void initialize(Configuration conf, Properties tbl) throws TException {
- sortOrder = tbl.getProperty(Constants.SERIALIZATION_SORT_ORDER);
+ sortOrder = tbl.getProperty(serdeConstants.SERIALIZATION_SORT_ORDER);
if (sortOrder == null) {
sortOrder = "";
}
for (int i = 0; i < sortOrder.length(); i++) {
char c = sortOrder.charAt(i);
if (c != '+' && c != '-') {
- throw new TException(Constants.SERIALIZATION_SORT_ORDER
+ throw new TException(serdeConstants.SERIALIZATION_SORT_ORDER
+ " should be a string consists of only '+' and '-'!");
}
}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TCTLSeparatedProtocol.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TCTLSeparatedProtocol.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TCTLSeparatedProtocol.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TCTLSeparatedProtocol.java Thu Nov 8 09:44:19 2012
@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.io.Text;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TField;
@@ -443,21 +443,21 @@ public class TCTLSeparatedProtocol exten
*/
public void initialize(Configuration conf, Properties tbl) throws TException {
- primarySeparator = getByteValue(tbl.getProperty(Constants.FIELD_DELIM),
+ primarySeparator = getByteValue(tbl.getProperty(serdeConstants.FIELD_DELIM),
primarySeparator);
secondarySeparator = getByteValue(tbl
- .getProperty(Constants.COLLECTION_DELIM), secondarySeparator);
- rowSeparator = getByteValue(tbl.getProperty(Constants.LINE_DELIM),
+ .getProperty(serdeConstants.COLLECTION_DELIM), secondarySeparator);
+ rowSeparator = getByteValue(tbl.getProperty(serdeConstants.LINE_DELIM),
rowSeparator);
- mapSeparator = getByteValue(tbl.getProperty(Constants.MAPKEY_DELIM),
+ mapSeparator = getByteValue(tbl.getProperty(serdeConstants.MAPKEY_DELIM),
mapSeparator);
returnNulls = Boolean.valueOf(
tbl.getProperty(ReturnNullsKey, String.valueOf(returnNulls)))
.booleanValue();
bufferSize = Integer.valueOf(
tbl.getProperty(BufferSizeKey, String.valueOf(bufferSize))).intValue();
- nullString = tbl.getProperty(Constants.SERIALIZATION_NULL_FORMAT, "\\N");
- quote = tbl.getProperty(Constants.QUOTE_CHAR, null);
+ nullString = tbl.getProperty(serdeConstants.SERIALIZATION_NULL_FORMAT, "\\N");
+ quote = tbl.getProperty(serdeConstants.QUOTE_CHAR, null);
internalInitialize();
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/ThriftDeserializer.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/ThriftDeserializer.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/ThriftDeserializer.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/ThriftDeserializer.java Thu Nov 8 09:44:19 2012
@@ -47,11 +47,11 @@ public class ThriftDeserializer implemen
// per Table basis
String className = tbl
- .getProperty(org.apache.hadoop.hive.serde.Constants.SERIALIZATION_CLASS);
+ .getProperty(org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_CLASS);
Class<?> recordClass = job.getClassByName(className);
String protoName = tbl
- .getProperty(org.apache.hadoop.hive.serde.Constants.SERIALIZATION_FORMAT);
+ .getProperty(org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_FORMAT);
if (protoName == null) {
protoName = "TBinaryProtocol";
}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/ListTypeInfo.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/ListTypeInfo.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/ListTypeInfo.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/ListTypeInfo.java Thu Nov 8 09:44:19 2012
@@ -42,7 +42,7 @@ public final class ListTypeInfo extends
@Override
public String getTypeName() {
- return org.apache.hadoop.hive.serde.Constants.LIST_TYPE_NAME + "<"
+ return org.apache.hadoop.hive.serde.serdeConstants.LIST_TYPE_NAME + "<"
+ listElementTypeInfo.getTypeName() + ">";
}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/MapTypeInfo.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/MapTypeInfo.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/MapTypeInfo.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/MapTypeInfo.java Thu Nov 8 09:44:19 2012
@@ -46,7 +46,7 @@ public final class MapTypeInfo extends T
@Override
public String getTypeName() {
- return org.apache.hadoop.hive.serde.Constants.MAP_TYPE_NAME + "<"
+ return org.apache.hadoop.hive.serde.serdeConstants.MAP_TYPE_NAME + "<"
+ mapKeyTypeInfo.getTypeName() + "," + mapValueTypeInfo.getTypeName()
+ ">";
}
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/StructTypeInfo.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/StructTypeInfo.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/StructTypeInfo.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/StructTypeInfo.java Thu Nov 8 09:44:19 2012
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
/**
@@ -50,7 +50,7 @@ public final class StructTypeInfo extend
@Override
public String getTypeName() {
StringBuilder sb = new StringBuilder();
- sb.append(Constants.STRUCT_TYPE_NAME + "<");
+ sb.append(serdeConstants.STRUCT_TYPE_NAME + "<");
for (int i = 0; i < allStructFieldNames.size(); i++) {
if (i > 0) {
sb.append(",");
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoFactory.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoFactory.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoFactory.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoFactory.java Thu Nov 8 09:44:19 2012
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorUtils;
/**
@@ -53,17 +53,17 @@ public final class TypeInfoFactory {
return result;
}
- public static final TypeInfo voidTypeInfo = getPrimitiveTypeInfo(Constants.VOID_TYPE_NAME);
- public static final TypeInfo booleanTypeInfo = getPrimitiveTypeInfo(Constants.BOOLEAN_TYPE_NAME);
- public static final TypeInfo intTypeInfo = getPrimitiveTypeInfo(Constants.INT_TYPE_NAME);
- public static final TypeInfo longTypeInfo = getPrimitiveTypeInfo(Constants.BIGINT_TYPE_NAME);
- public static final TypeInfo stringTypeInfo = getPrimitiveTypeInfo(Constants.STRING_TYPE_NAME);
- public static final TypeInfo floatTypeInfo = getPrimitiveTypeInfo(Constants.FLOAT_TYPE_NAME);
- public static final TypeInfo doubleTypeInfo = getPrimitiveTypeInfo(Constants.DOUBLE_TYPE_NAME);
- public static final TypeInfo byteTypeInfo = getPrimitiveTypeInfo(Constants.TINYINT_TYPE_NAME);
- public static final TypeInfo shortTypeInfo = getPrimitiveTypeInfo(Constants.SMALLINT_TYPE_NAME);
- public static final TypeInfo timestampTypeInfo = getPrimitiveTypeInfo(Constants.TIMESTAMP_TYPE_NAME);
- public static final TypeInfo binaryTypeInfo = getPrimitiveTypeInfo(Constants.BINARY_TYPE_NAME);
+ public static final TypeInfo voidTypeInfo = getPrimitiveTypeInfo(serdeConstants.VOID_TYPE_NAME);
+ public static final TypeInfo booleanTypeInfo = getPrimitiveTypeInfo(serdeConstants.BOOLEAN_TYPE_NAME);
+ public static final TypeInfo intTypeInfo = getPrimitiveTypeInfo(serdeConstants.INT_TYPE_NAME);
+ public static final TypeInfo longTypeInfo = getPrimitiveTypeInfo(serdeConstants.BIGINT_TYPE_NAME);
+ public static final TypeInfo stringTypeInfo = getPrimitiveTypeInfo(serdeConstants.STRING_TYPE_NAME);
+ public static final TypeInfo floatTypeInfo = getPrimitiveTypeInfo(serdeConstants.FLOAT_TYPE_NAME);
+ public static final TypeInfo doubleTypeInfo = getPrimitiveTypeInfo(serdeConstants.DOUBLE_TYPE_NAME);
+ public static final TypeInfo byteTypeInfo = getPrimitiveTypeInfo(serdeConstants.TINYINT_TYPE_NAME);
+ public static final TypeInfo shortTypeInfo = getPrimitiveTypeInfo(serdeConstants.SMALLINT_TYPE_NAME);
+ public static final TypeInfo timestampTypeInfo = getPrimitiveTypeInfo(serdeConstants.TIMESTAMP_TYPE_NAME);
+ public static final TypeInfo binaryTypeInfo = getPrimitiveTypeInfo(serdeConstants.BINARY_TYPE_NAME);
public static final TypeInfo unknownTypeInfo = getPrimitiveTypeInfo("unknown");
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoUtils.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoUtils.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoUtils.java Thu Nov 8 09:44:19 2012
@@ -27,7 +27,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
@@ -291,10 +291,10 @@ public final class TypeInfoUtils {
}
Token t = typeInfoTokens.get(iToken);
if (item.equals("type")) {
- if (!Constants.LIST_TYPE_NAME.equals(t.text)
- && !Constants.MAP_TYPE_NAME.equals(t.text)
- && !Constants.STRUCT_TYPE_NAME.equals(t.text)
- && !Constants.UNION_TYPE_NAME.equals(t.text)
+ if (!serdeConstants.LIST_TYPE_NAME.equals(t.text)
+ && !serdeConstants.MAP_TYPE_NAME.equals(t.text)
+ && !serdeConstants.STRUCT_TYPE_NAME.equals(t.text)
+ && !serdeConstants.UNION_TYPE_NAME.equals(t.text)
&& null == PrimitiveObjectInspectorUtils
.getTypeEntryFromTypeName(t.text)
&& !t.text.equals(alternative)) {
@@ -332,7 +332,7 @@ public final class TypeInfoUtils {
}
// Is this a list type?
- if (Constants.LIST_TYPE_NAME.equals(t.text)) {
+ if (serdeConstants.LIST_TYPE_NAME.equals(t.text)) {
expect("<");
TypeInfo listElementType = parseType();
expect(">");
@@ -340,7 +340,7 @@ public final class TypeInfoUtils {
}
// Is this a map type?
- if (Constants.MAP_TYPE_NAME.equals(t.text)) {
+ if (serdeConstants.MAP_TYPE_NAME.equals(t.text)) {
expect("<");
TypeInfo mapKeyType = parseType();
expect(",");
@@ -350,7 +350,7 @@ public final class TypeInfoUtils {
}
// Is this a struct type?
- if (Constants.STRUCT_TYPE_NAME.equals(t.text)) {
+ if (serdeConstants.STRUCT_TYPE_NAME.equals(t.text)) {
ArrayList<String> fieldNames = new ArrayList<String>();
ArrayList<TypeInfo> fieldTypeInfos = new ArrayList<TypeInfo>();
boolean first = true;
@@ -374,7 +374,7 @@ public final class TypeInfoUtils {
return TypeInfoFactory.getStructTypeInfo(fieldNames, fieldTypeInfos);
}
// Is this a union type?
- if (Constants.UNION_TYPE_NAME.equals(t.text)) {
+ if (serdeConstants.UNION_TYPE_NAME.equals(t.text)) {
List<TypeInfo> objectTypeInfos = new ArrayList<TypeInfo>();
boolean first = true;
do {
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/UnionTypeInfo.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/UnionTypeInfo.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/UnionTypeInfo.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/UnionTypeInfo.java Thu Nov 8 09:44:19 2012
@@ -21,7 +21,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
/**
@@ -47,7 +47,7 @@ public class UnionTypeInfo extends TypeI
@Override
public String getTypeName() {
StringBuilder sb = new StringBuilder();
- sb.append(Constants.UNION_TYPE_NAME + "<");
+ sb.append(serdeConstants.UNION_TYPE_NAME + "<");
for (int i = 0; i < allUnionObjectTypeInfos.size(); i++) {
if (i > 0) {
sb.append(",");
Modified: hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/TestStatsSerde.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/TestStatsSerde.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/TestStatsSerde.java (original)
+++ hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/TestStatsSerde.java Thu Nov 8 09:44:19 2012
@@ -25,7 +25,7 @@ import java.util.Random;
import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.binarysortable.MyTestClass;
import org.apache.hadoop.hive.serde2.binarysortable.MyTestInnerStruct;
import org.apache.hadoop.hive.serde2.binarysortable.TestBinarySortableSerDe;
@@ -129,8 +129,8 @@ public class TestStatsSerde extends Test
String fieldTypes = ObjectInspectorUtils.getFieldTypes(rowOI);
Properties schema = new Properties();
- schema.setProperty(Constants.LIST_COLUMNS, fieldNames);
- schema.setProperty(Constants.LIST_COLUMN_TYPES, fieldTypes);
+ schema.setProperty(serdeConstants.LIST_COLUMNS, fieldNames);
+ schema.setProperty(serdeConstants.LIST_COLUMN_TYPES, fieldTypes);
LazyBinarySerDe serDe = new LazyBinarySerDe();
serDe.initialize(new Configuration(), schema);
@@ -233,12 +233,12 @@ public class TestStatsSerde extends Test
Properties tbl = new Properties();
// Set the configuration parameters
- tbl.setProperty(Constants.SERIALIZATION_FORMAT, "9");
+ tbl.setProperty(serdeConstants.SERIALIZATION_FORMAT, "9");
tbl.setProperty("columns",
"abyte,ashort,aint,along,adouble,astring,anullint,anullstring");
tbl.setProperty("columns.types",
"tinyint:smallint:int:bigint:double:string:int:string");
- tbl.setProperty(Constants.SERIALIZATION_NULL_FORMAT, "NULL");
+ tbl.setProperty(serdeConstants.SERIALIZATION_NULL_FORMAT, "NULL");
return tbl;
}
Modified: hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/TestTCTLSeparatedProtocol.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/TestTCTLSeparatedProtocol.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/TestTCTLSeparatedProtocol.java (original)
+++ hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/TestTCTLSeparatedProtocol.java Thu Nov 8 09:44:19 2012
@@ -23,7 +23,7 @@ import java.util.Properties;
import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol;
import org.apache.thrift.protocol.TField;
import org.apache.thrift.protocol.TList;
@@ -240,8 +240,8 @@ public class TestTCTLSeparatedProtocol e
TMemoryBuffer trans = new TMemoryBuffer(4096);
TCTLSeparatedProtocol prot = new TCTLSeparatedProtocol(trans, 4096);
Properties schema = new Properties();
- schema.setProperty(Constants.QUOTE_CHAR, "\"");
- schema.setProperty(Constants.FIELD_DELIM, ",");
+ schema.setProperty(serdeConstants.QUOTE_CHAR, "\"");
+ schema.setProperty(serdeConstants.FIELD_DELIM, ",");
prot.initialize(new Configuration(), schema);
String testStr = "\"hello, world!\"";
@@ -322,10 +322,10 @@ public class TestTCTLSeparatedProtocol e
// this is a hacky way of doing the quotes since it will match any 2 of
// these, so
// "[ hello this is something to split [" would be considered to be quoted.
- schema.setProperty(Constants.QUOTE_CHAR, "(\"|\\[|\\])");
+ schema.setProperty(serdeConstants.QUOTE_CHAR, "(\"|\\[|\\])");
- schema.setProperty(Constants.FIELD_DELIM, " ");
- schema.setProperty(Constants.SERIALIZATION_NULL_FORMAT, "-");
+ schema.setProperty(serdeConstants.FIELD_DELIM, " ");
+ schema.setProperty(serdeConstants.SERIALIZATION_NULL_FORMAT, "-");
prot.initialize(new Configuration(), schema);
prot.readStructBegin();
Modified: hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/binarysortable/TestBinarySortableSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/binarysortable/TestBinarySortableSerDe.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/binarysortable/TestBinarySortableSerDe.java (original)
+++ hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/binarysortable/TestBinarySortableSerDe.java Thu Nov 8 09:44:19 2012
@@ -26,7 +26,7 @@ import java.util.Random;
import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.SerDe;
import org.apache.hadoop.hive.serde2.SerDeUtils;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
@@ -63,9 +63,9 @@ public class TestBinarySortableSerDe ext
private SerDe getSerDe(String fieldNames, String fieldTypes, String order)
throws Throwable {
Properties schema = new Properties();
- schema.setProperty(Constants.LIST_COLUMNS, fieldNames);
- schema.setProperty(Constants.LIST_COLUMN_TYPES, fieldTypes);
- schema.setProperty(Constants.SERIALIZATION_SORT_ORDER, order);
+ schema.setProperty(serdeConstants.LIST_COLUMNS, fieldNames);
+ schema.setProperty(serdeConstants.LIST_COLUMN_TYPES, fieldTypes);
+ schema.setProperty(serdeConstants.SERIALIZATION_SORT_ORDER, order);
BinarySortableSerDe serde = new BinarySortableSerDe();
serde.initialize(new Configuration(), schema);
Modified: hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/columnar/TestLazyBinaryColumnarSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/columnar/TestLazyBinaryColumnarSerDe.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/columnar/TestLazyBinaryColumnarSerDe.java (original)
+++ hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/columnar/TestLazyBinaryColumnarSerDe.java Thu Nov 8 09:44:19 2012
@@ -28,7 +28,7 @@ import java.util.TreeMap;
import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.SerDeException;
import org.apache.hadoop.hive.serde2.SerDeUtils;
import org.apache.hadoop.hive.serde2.objectinspector.CrossMapEqualComparer;
@@ -69,8 +69,8 @@ public class TestLazyBinaryColumnarSerDe
.getReflectionObjectInspector(OuterStruct.class, ObjectInspectorOptions.JAVA);
String cols = ObjectInspectorUtils.getFieldNames(oi);
Properties props = new Properties();
- props.setProperty(Constants.LIST_COLUMNS, cols);
- props.setProperty(Constants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi));
+ props.setProperty(serdeConstants.LIST_COLUMNS, cols);
+ props.setProperty(serdeConstants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi));
LazyBinaryColumnarSerDe serde = new LazyBinaryColumnarSerDe();
serde.initialize(new Configuration(), props);
@@ -110,8 +110,8 @@ public class TestLazyBinaryColumnarSerDe
.getReflectionObjectInspector(OuterStruct.class, ObjectInspectorOptions.JAVA);
String cols = ObjectInspectorUtils.getFieldNames(oi);
Properties props = new Properties();
- props.setProperty(Constants.LIST_COLUMNS, cols);
- props.setProperty(Constants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi));
+ props.setProperty(serdeConstants.LIST_COLUMNS, cols);
+ props.setProperty(serdeConstants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi));
LazyBinaryColumnarSerDe serde = new LazyBinaryColumnarSerDe();
serde.initialize(new Configuration(), props);
@@ -145,8 +145,8 @@ public class TestLazyBinaryColumnarSerDe
.getReflectionObjectInspector(OuterStruct.class, ObjectInspectorOptions.JAVA);
String cols = ObjectInspectorUtils.getFieldNames(oi);
Properties props = new Properties();
- props.setProperty(Constants.LIST_COLUMNS, cols);
- props.setProperty(Constants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi));
+ props.setProperty(serdeConstants.LIST_COLUMNS, cols);
+ props.setProperty(serdeConstants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi));
LazyBinaryColumnarSerDe serde = new LazyBinaryColumnarSerDe();
serde.initialize(new Configuration(), props);
@@ -178,8 +178,8 @@ public class TestLazyBinaryColumnarSerDe
.getReflectionObjectInspector(OuterStruct.class, ObjectInspectorOptions.JAVA);
String cols = ObjectInspectorUtils.getFieldNames(oi);
Properties props = new Properties();
- props.setProperty(Constants.LIST_COLUMNS, cols);
- props.setProperty(Constants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi));
+ props.setProperty(serdeConstants.LIST_COLUMNS, cols);
+ props.setProperty(serdeConstants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi));
LazyBinaryColumnarSerDe serde = new LazyBinaryColumnarSerDe();
serde.initialize(new Configuration(), props);
@@ -202,8 +202,8 @@ public class TestLazyBinaryColumnarSerDe
.getReflectionObjectInspector(OuterStruct.class, ObjectInspectorOptions.JAVA);
String cols = ObjectInspectorUtils.getFieldNames(oi);
Properties props = new Properties();
- props.setProperty(Constants.LIST_COLUMNS, cols);
- props.setProperty(Constants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi));
+ props.setProperty(serdeConstants.LIST_COLUMNS, cols);
+ props.setProperty(serdeConstants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi));
LazyBinaryColumnarSerDe serde = new LazyBinaryColumnarSerDe();
serde.initialize(new Configuration(), props);
Modified: hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/dynamic_type/TestDynamicSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/dynamic_type/TestDynamicSerDe.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/dynamic_type/TestDynamicSerDe.java (original)
+++ hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/dynamic_type/TestDynamicSerDe.java Thu Nov 8 09:44:19 2012
@@ -28,7 +28,7 @@ import java.util.Map.Entry;
import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol;
import org.apache.hadoop.io.BytesWritable;
@@ -110,15 +110,15 @@ public class TestDynamicSerDe extends Te
System.out.println("Testing protocol: " + protocol);
Properties schema = new Properties();
- schema.setProperty(Constants.SERIALIZATION_FORMAT, protocol);
+ schema.setProperty(serdeConstants.SERIALIZATION_FORMAT, protocol);
schema.setProperty(
- org.apache.hadoop.hive.metastore.api.Constants.META_TABLE_NAME,
+ org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_NAME,
"test");
schema
.setProperty(
- Constants.SERIALIZATION_DDL,
+ serdeConstants.SERIALIZATION_DDL,
"struct test { i32 _hello, list<string> 2bye, map<string,i32> another, i32 nhello, double d, double nd}");
- schema.setProperty(Constants.SERIALIZATION_LIB, new DynamicSerDe()
+ schema.setProperty(serdeConstants.SERIALIZATION_LIB, new DynamicSerDe()
.getClass().toString());
HashMap<String, String> p = additionalParams.get(pp);
if (p != null) {
@@ -182,15 +182,15 @@ public class TestDynamicSerDe extends Te
}
Properties schema = new Properties();
- schema.setProperty(Constants.SERIALIZATION_FORMAT,
+ schema.setProperty(serdeConstants.SERIALIZATION_FORMAT,
org.apache.hadoop.hive.serde2.thrift.TBinarySortableProtocol.class
.getName());
schema.setProperty(
- org.apache.hadoop.hive.metastore.api.Constants.META_TABLE_NAME, "test");
- schema.setProperty(Constants.SERIALIZATION_DDL, ddl);
- schema.setProperty(Constants.SERIALIZATION_LIB, DynamicSerDe.class
+ org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_NAME, "test");
+ schema.setProperty(serdeConstants.SERIALIZATION_DDL, ddl);
+ schema.setProperty(serdeConstants.SERIALIZATION_LIB, DynamicSerDe.class
.getName());
- schema.setProperty(Constants.SERIALIZATION_SORT_ORDER, order);
+ schema.setProperty(serdeConstants.SERIALIZATION_SORT_ORDER, order);
DynamicSerDe serde = new DynamicSerDe();
serde.initialize(new Configuration(), schema);
@@ -417,22 +417,22 @@ public class TestDynamicSerDe extends Te
struct.add(another);
Properties schema = new Properties();
- schema.setProperty(Constants.SERIALIZATION_FORMAT,
+ schema.setProperty(serdeConstants.SERIALIZATION_FORMAT,
org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol.class
.getName());
schema.setProperty(
- org.apache.hadoop.hive.metastore.api.Constants.META_TABLE_NAME,
+ org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_NAME,
"test");
schema
- .setProperty(Constants.SERIALIZATION_DDL,
+ .setProperty(serdeConstants.SERIALIZATION_DDL,
"struct test { i32 hello, list<string> bye, map<string,i32> another}");
- schema.setProperty(Constants.SERIALIZATION_LIB, new DynamicSerDe()
+ schema.setProperty(serdeConstants.SERIALIZATION_LIB, new DynamicSerDe()
.getClass().toString());
- schema.setProperty(Constants.FIELD_DELIM, "9");
- schema.setProperty(Constants.COLLECTION_DELIM, "1");
- schema.setProperty(Constants.LINE_DELIM, "2");
- schema.setProperty(Constants.MAPKEY_DELIM, "4");
+ schema.setProperty(serdeConstants.FIELD_DELIM, "9");
+ schema.setProperty(serdeConstants.COLLECTION_DELIM, "1");
+ schema.setProperty(serdeConstants.LINE_DELIM, "2");
+ schema.setProperty(serdeConstants.MAPKEY_DELIM, "4");
DynamicSerDe serde = new DynamicSerDe();
serde.initialize(new Configuration(), schema);
@@ -494,16 +494,16 @@ public class TestDynamicSerDe extends Te
struct.add(another);
Properties schema = new Properties();
- schema.setProperty(Constants.SERIALIZATION_FORMAT,
+ schema.setProperty(serdeConstants.SERIALIZATION_FORMAT,
org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol.class
.getName());
schema.setProperty(
- org.apache.hadoop.hive.metastore.api.Constants.META_TABLE_NAME,
+ org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_NAME,
"test");
schema
- .setProperty(Constants.SERIALIZATION_DDL,
+ .setProperty(serdeConstants.SERIALIZATION_DDL,
"struct test { i32 hello, list<string> bye, map<string,i32> another}");
- schema.setProperty(Constants.SERIALIZATION_LIB, new DynamicSerDe()
+ schema.setProperty(serdeConstants.SERIALIZATION_LIB, new DynamicSerDe()
.getClass().toString());
schema.setProperty(TCTLSeparatedProtocol.ReturnNullsKey, "true");
@@ -544,16 +544,16 @@ public class TestDynamicSerDe extends Te
struct.add(another);
Properties schema = new Properties();
- schema.setProperty(Constants.SERIALIZATION_FORMAT,
+ schema.setProperty(serdeConstants.SERIALIZATION_FORMAT,
org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol.class
.getName());
schema.setProperty(
- org.apache.hadoop.hive.metastore.api.Constants.META_TABLE_NAME,
+ org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_NAME,
"test");
schema
- .setProperty(Constants.SERIALIZATION_DDL,
+ .setProperty(serdeConstants.SERIALIZATION_DDL,
"struct test { i32 hello, list<string> bye, map<string,i32> another}");
- schema.setProperty(Constants.SERIALIZATION_LIB, new DynamicSerDe()
+ schema.setProperty(serdeConstants.SERIALIZATION_LIB, new DynamicSerDe()
.getClass().toString());
schema.setProperty(TCTLSeparatedProtocol.ReturnNullsKey, "true");
@@ -602,16 +602,16 @@ public class TestDynamicSerDe extends Te
struct.add(another);
Properties schema = new Properties();
- schema.setProperty(Constants.SERIALIZATION_FORMAT,
+ schema.setProperty(serdeConstants.SERIALIZATION_FORMAT,
org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol.class
.getName());
schema.setProperty(
- org.apache.hadoop.hive.metastore.api.Constants.META_TABLE_NAME,
+ org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_NAME,
"test");
schema
- .setProperty(Constants.SERIALIZATION_DDL,
+ .setProperty(serdeConstants.SERIALIZATION_DDL,
"struct test { i32 hello, list<string> bye, map<string,i32> another}");
- schema.setProperty(Constants.SERIALIZATION_LIB, new DynamicSerDe()
+ schema.setProperty(serdeConstants.SERIALIZATION_LIB, new DynamicSerDe()
.getClass().toString());
schema.setProperty(TCTLSeparatedProtocol.ReturnNullsKey, "true");
@@ -660,16 +660,16 @@ public class TestDynamicSerDe extends Te
struct.add(another);
Properties schema = new Properties();
- schema.setProperty(Constants.SERIALIZATION_FORMAT,
+ schema.setProperty(serdeConstants.SERIALIZATION_FORMAT,
org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol.class
.getName());
schema.setProperty(
- org.apache.hadoop.hive.metastore.api.Constants.META_TABLE_NAME,
+ org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_NAME,
"test");
schema
- .setProperty(Constants.SERIALIZATION_DDL,
+ .setProperty(serdeConstants.SERIALIZATION_DDL,
"struct test { i32 hello, list<string> bye, map<string,i32> another}");
- schema.setProperty(Constants.SERIALIZATION_LIB, new DynamicSerDe()
+ schema.setProperty(serdeConstants.SERIALIZATION_LIB, new DynamicSerDe()
.getClass().toString());
schema.setProperty(TCTLSeparatedProtocol.ReturnNullsKey, "false");
@@ -712,17 +712,17 @@ public class TestDynamicSerDe extends Te
try {
Properties schema = new Properties();
- // schema.setProperty(Constants.SERIALIZATION_FORMAT,
+ // schema.setProperty(serdeConstants.SERIALIZATION_FORMAT,
// org.apache.thrift.protocol.TJSONProtocol.class.getName());
- schema.setProperty(Constants.SERIALIZATION_FORMAT,
+ schema.setProperty(serdeConstants.SERIALIZATION_FORMAT,
org.apache.thrift.protocol.TBinaryProtocol.class.getName());
schema.setProperty(
- org.apache.hadoop.hive.metastore.api.Constants.META_TABLE_NAME,
+ org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_NAME,
"test");
schema.setProperty(
- Constants.SERIALIZATION_DDL,
+ serdeConstants.SERIALIZATION_DDL,
"struct inner { i32 field1, string field2 },struct test {inner foo, i32 hello, list<string> bye, map<string,i32> another}");
- schema.setProperty(Constants.SERIALIZATION_LIB, new DynamicSerDe()
+ schema.setProperty(serdeConstants.SERIALIZATION_LIB, new DynamicSerDe()
.getClass().toString());
//
@@ -790,22 +790,22 @@ public class TestDynamicSerDe extends Te
struct.add(another);
Properties schema = new Properties();
- schema.setProperty(Constants.SERIALIZATION_FORMAT,
+ schema.setProperty(serdeConstants.SERIALIZATION_FORMAT,
org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol.class
.getName());
schema.setProperty(
- org.apache.hadoop.hive.metastore.api.Constants.META_TABLE_NAME,
+ org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_NAME,
"test");
schema
- .setProperty(Constants.SERIALIZATION_DDL,
+ .setProperty(serdeConstants.SERIALIZATION_DDL,
"struct test { i32 hello, list<string> bye, map<string,i32> another}");
- schema.setProperty(Constants.SERIALIZATION_LIB, new DynamicSerDe()
+ schema.setProperty(serdeConstants.SERIALIZATION_LIB, new DynamicSerDe()
.getClass().toString());
- schema.setProperty(Constants.FIELD_DELIM, "9");
- schema.setProperty(Constants.COLLECTION_DELIM, "1");
- schema.setProperty(Constants.LINE_DELIM, "2");
- schema.setProperty(Constants.MAPKEY_DELIM, "4");
+ schema.setProperty(serdeConstants.FIELD_DELIM, "9");
+ schema.setProperty(serdeConstants.COLLECTION_DELIM, "1");
+ schema.setProperty(serdeConstants.LINE_DELIM, "2");
+ schema.setProperty(serdeConstants.MAPKEY_DELIM, "4");
DynamicSerDe serde = new DynamicSerDe();
serde.initialize(new Configuration(), schema);
@@ -831,7 +831,7 @@ public class TestDynamicSerDe extends Te
assertTrue(compare.equals(new String(bytes.get(), 0, bytes.getSize())));
schema
- .setProperty(Constants.SERIALIZATION_DDL,
+ .setProperty(serdeConstants.SERIALIZATION_DDL,
"struct test { i32 hello, skip list<string> bye, map<string,i32> another}");
serde.initialize(new Configuration(), schema);
Modified: hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazySimpleSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazySimpleSerDe.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazySimpleSerDe.java (original)
+++ hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazySimpleSerDe.java Thu Nov 8 09:44:19 2012
@@ -24,7 +24,7 @@ import junit.framework.TestCase;
import org.apache.commons.codec.binary.Base64;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.SerDeException;
import org.apache.hadoop.hive.serde2.io.ByteWritable;
import org.apache.hadoop.hive.serde2.io.DoubleWritable;
@@ -51,12 +51,12 @@ public class TestLazySimpleSerDe extends
LazySimpleSerDe serDe = new LazySimpleSerDe();
Configuration conf = new Configuration();
Properties tbl = new Properties();
- tbl.setProperty(Constants.SERIALIZATION_FORMAT, "9");
+ tbl.setProperty(serdeConstants.SERIALIZATION_FORMAT, "9");
tbl.setProperty("columns",
"abyte,ashort,aint,along,adouble,astring,anullint,anullstring,aba");
tbl.setProperty("columns.types",
"tinyint:smallint:int:bigint:double:string:int:string:binary");
- tbl.setProperty(Constants.SERIALIZATION_NULL_FORMAT, "NULL");
+ tbl.setProperty(serdeConstants.SERIALIZATION_NULL_FORMAT, "NULL");
serDe.initialize(conf, tbl);
// Data
@@ -105,12 +105,12 @@ public class TestLazySimpleSerDe extends
Properties tbl = new Properties();
// Set the configuration parameters
- tbl.setProperty(Constants.SERIALIZATION_FORMAT, "9");
+ tbl.setProperty(serdeConstants.SERIALIZATION_FORMAT, "9");
tbl.setProperty("columns",
"abyte,ashort,aint,along,adouble,astring,anullint,anullstring");
tbl.setProperty("columns.types",
"tinyint:smallint:int:bigint:double:string:int:string");
- tbl.setProperty(Constants.SERIALIZATION_NULL_FORMAT, "NULL");
+ tbl.setProperty(serdeConstants.SERIALIZATION_NULL_FORMAT, "NULL");
return tbl;
}
@@ -123,7 +123,7 @@ public class TestLazySimpleSerDe extends
LazySimpleSerDe serDe = new LazySimpleSerDe();
Configuration conf = new Configuration();
Properties tbl = createProperties();
- tbl.setProperty(Constants.SERIALIZATION_LAST_COLUMN_TAKES_REST, "true");
+ tbl.setProperty(serdeConstants.SERIALIZATION_LAST_COLUMN_TAKES_REST, "true");
serDe.initialize(conf, tbl);
// Data
Modified: hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazybinary/TestLazyBinarySerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazybinary/TestLazyBinarySerDe.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazybinary/TestLazyBinarySerDe.java (original)
+++ hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazybinary/TestLazyBinarySerDe.java Thu Nov 8 09:44:19 2012
@@ -29,7 +29,7 @@ import java.util.Random;
import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.SerDe;
import org.apache.hadoop.hive.serde2.SerDeUtils;
import org.apache.hadoop.hive.serde2.binarysortable.MyTestClass;
@@ -90,8 +90,8 @@ public class TestLazyBinarySerDe extends
*/
private SerDe getSerDe(String fieldNames, String fieldTypes) throws Throwable {
Properties schema = new Properties();
- schema.setProperty(Constants.LIST_COLUMNS, fieldNames);
- schema.setProperty(Constants.LIST_COLUMN_TYPES, fieldTypes);
+ schema.setProperty(serdeConstants.LIST_COLUMNS, fieldNames);
+ schema.setProperty(serdeConstants.LIST_COLUMN_TYPES, fieldTypes);
LazyBinarySerDe serde = new LazyBinarySerDe();
serde.initialize(new Configuration(), schema);
Modified: hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestCrossMapEqualComparer.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestCrossMapEqualComparer.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestCrossMapEqualComparer.java (original)
+++ hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestCrossMapEqualComparer.java Thu Nov 8 09:44:19 2012
@@ -23,7 +23,7 @@ import java.util.Properties;
import java.util.TreeMap;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.ByteStream;
import org.apache.hadoop.hive.serde2.SerDeException;
import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
@@ -96,8 +96,8 @@ public class TestCrossMapEqualComparer e
LazySimpleSerDe serde = new LazySimpleSerDe();
Configuration conf = new Configuration();
Properties tbl = new Properties();
- tbl.setProperty(Constants.LIST_COLUMNS, ObjectInspectorUtils.getFieldNames(oi1));
- tbl.setProperty(Constants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi1));
+ tbl.setProperty(serdeConstants.LIST_COLUMNS, ObjectInspectorUtils.getFieldNames(oi1));
+ tbl.setProperty(serdeConstants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi1));
SerDeParameters serdeParams = LazySimpleSerDe.initSerdeParams(conf, tbl,
LazySimpleSerDe.class.getName());
serde.initialize(conf, tbl);
@@ -150,8 +150,8 @@ public class TestCrossMapEqualComparer e
LazySimpleSerDe serde = new LazySimpleSerDe();
Configuration conf = new Configuration();
Properties tbl = new Properties();
- tbl.setProperty(Constants.LIST_COLUMNS, ObjectInspectorUtils.getFieldNames(oi1));
- tbl.setProperty(Constants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi1));
+ tbl.setProperty(serdeConstants.LIST_COLUMNS, ObjectInspectorUtils.getFieldNames(oi1));
+ tbl.setProperty(serdeConstants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi1));
SerDeParameters serdeParams = LazySimpleSerDe.initSerdeParams(conf, tbl,
LazySimpleSerDe.class.getName());
serde.initialize(conf, tbl);
Modified: hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestSimpleMapEqualComparer.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestSimpleMapEqualComparer.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestSimpleMapEqualComparer.java (original)
+++ hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestSimpleMapEqualComparer.java Thu Nov 8 09:44:19 2012
@@ -23,7 +23,7 @@ import java.util.Properties;
import java.util.TreeMap;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.serde.Constants;
+import org.apache.hadoop.hive.serde.serdeConstants;
import org.apache.hadoop.hive.serde2.ByteStream;
import org.apache.hadoop.hive.serde2.SerDeException;
import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
@@ -96,8 +96,8 @@ public class TestSimpleMapEqualComparer
LazySimpleSerDe serde = new LazySimpleSerDe();
Configuration conf = new Configuration();
Properties tbl = new Properties();
- tbl.setProperty(Constants.LIST_COLUMNS, ObjectInspectorUtils.getFieldNames(oi1));
- tbl.setProperty(Constants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi1));
+ tbl.setProperty(serdeConstants.LIST_COLUMNS, ObjectInspectorUtils.getFieldNames(oi1));
+ tbl.setProperty(serdeConstants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi1));
SerDeParameters serdeParams = LazySimpleSerDe.initSerdeParams(conf, tbl,
LazySimpleSerDe.class.getName());
serde.initialize(conf, tbl);
@@ -150,8 +150,8 @@ public class TestSimpleMapEqualComparer
LazySimpleSerDe serde = new LazySimpleSerDe();
Configuration conf = new Configuration();
Properties tbl = new Properties();
- tbl.setProperty(Constants.LIST_COLUMNS, ObjectInspectorUtils.getFieldNames(oi1));
- tbl.setProperty(Constants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi1));
+ tbl.setProperty(serdeConstants.LIST_COLUMNS, ObjectInspectorUtils.getFieldNames(oi1));
+ tbl.setProperty(serdeConstants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi1));
SerDeParameters serdeParams = LazySimpleSerDe.initSerdeParams(conf, tbl,
LazySimpleSerDe.class.getName());
serde.initialize(conf, tbl);