commit 9a4d1a4fb6c62c237a0d1b4c98381475369f108a Author: Janos Gub Date: Tue May 9 17:30:51 2017 +0200 fix for hive-serde diff --git serde/src/java/org/apache/hadoop/hive/serde2/AbstractSerDe.java serde/src/java/org/apache/hadoop/hive/serde2/AbstractSerDe.java index 049b35d..a2a85b3 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/AbstractSerDe.java +++ serde/src/java/org/apache/hadoop/hive/serde2/AbstractSerDe.java @@ -118,7 +118,7 @@ public String getConfigurationErrors() { } /** - * @rturn Whether the SerDe that can store schema both inside and outside of metastore + * @return Whether the SerDe that can store schema both inside and outside of metastore * does, in fact, store it inside metastore, based on table parameters. */ public boolean shouldStoreFieldsInMetastore(Map tableParams) { diff --git serde/src/java/org/apache/hadoop/hive/serde2/ColumnProjectionUtils.java serde/src/java/org/apache/hadoop/hive/serde2/ColumnProjectionUtils.java index 9844166..2009645 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/ColumnProjectionUtils.java +++ serde/src/java/org/apache/hadoop/hive/serde2/ColumnProjectionUtils.java @@ -44,7 +44,7 @@ /** * the nested column path is the string from the root to the leaf * e.g. - * c:struct + * c:struct<a:string,b:string> * the column a's path is c.a and b's path is c.b */ public static final String READ_NESTED_COLUMN_PATH_CONF_STR = @@ -57,7 +57,7 @@ private static final Joiner CSV_JOINER = Joiner.on(",").skipNulls(); /** - * @deprecated for backwards compatibility with <= 0.12, use setReadAllColumns + * @deprecated for backwards compatibility with <= 0.12, use setReadAllColumns */ @Deprecated public static void setFullyReadColumns(Configuration conf) { @@ -65,7 +65,7 @@ public static void setFullyReadColumns(Configuration conf) { } /** - * @deprecated for backwards compatibility with <= 0.12, use setReadAllColumns + * @deprecated for backwards compatibility with <= 0.12, use setReadAllColumns * and appendReadColumns */ @Deprecated @@ -76,7 +76,7 @@ public static void setReadColumnIDs(Configuration conf, List ids) { } /** - * @deprecated for backwards compatibility with <= 0.12, use appendReadColumns + * @deprecated for backwards compatibility with <= 0.12, use appendReadColumns */ @Deprecated public static void appendReadColumnIDs(Configuration conf, List ids) { diff --git serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java index 5ecfbca..4edc4ba 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java +++ serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java @@ -162,7 +162,7 @@ public static String lightEscapeString(String str) { * Convert a Object to a standard Java object in compliance with JDBC 3.0 (see JDBC 3.0 * Specification, Table B-3: Mapping from JDBC Types to Java Object Types). * - * This method is kept consistent with {@link HiveResultSetMetaData#hiveTypeToSqlType}. + * This method is kept consistent with HiveResultSetMetaData#hiveTypeToSqlType . */ public static Object toThriftPayload(Object val, ObjectInspector valOI, int version) { if (valOI.getCategory() == ObjectInspector.Category.PRIMITIVE) { diff --git serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroLazyObjectInspector.java serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroLazyObjectInspector.java index de9f4a8..ff8ac36 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroLazyObjectInspector.java +++ serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroLazyObjectInspector.java @@ -110,7 +110,7 @@ public void setReaderSchema(Schema readerSchema) { /** * Set the {@link AvroSchemaRetriever} for the {@link AvroLazyObjectInspector} to the given class * - * @param scheamRetrieverClass the schema retriever class to be set + * @param schemaRetriever the schema retriever class to be set * */ public void setSchemaRetriever(AvroSchemaRetriever schemaRetriever) { this.schemaRetriever = schemaRetriever; diff --git serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSchemaRetriever.java serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSchemaRetriever.java index fcd2621..bed4de7 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSchemaRetriever.java +++ serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSchemaRetriever.java @@ -22,7 +22,7 @@ /** * Retrieves the avro schema from the given source. "Source" is a little loose term here in the * sense it can range from being an HDFS url location pointing to the schema or it can be even as - * simple as a {@link Properties properties} file with a simple key-value mapping to the schema. For + * simple as a {@link java.util.Properties properties} file with a simple key-value mapping to the schema. For * cases where the {@link Schema schema} is a part of the serialized data itself, "Source" would * refer to the data bytes from which the {@link Schema schema} has to retrieved. * diff --git serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java index 36beaee..d353fab 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java +++ serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java @@ -88,7 +88,7 @@ public ColumnarSerDe() throws SerDeException { /** * Initialize the SerDe given the parameters. * - * @see AbstractSerDe#initialize(Configuration, Properties) + * @see org.apache.hadoop.hive.serde2.AbstractSerDe#initialize(Configuration, Properties) */ @Override public void initialize(Configuration conf, Properties tbl) throws SerDeException { @@ -123,7 +123,7 @@ public void initialize(Configuration conf, Properties tbl) throws SerDeException * @param objInspector * The ObjectInspector for the row object * @return The serialized Writable object - * @see AbstractSerDe#serialize(Object, ObjectInspector) + * @see org.apache.hadoop.hive.serde2.AbstractSerDe#serialize(Object, ObjectInspector) */ @Override public Writable serialize(Object obj, ObjectInspector objInspector) throws SerDeException { diff --git serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarStructBase.java serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarStructBase.java index fd06f58..33726d9 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarStructBase.java +++ serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarStructBase.java @@ -183,7 +183,7 @@ public Object getField(int fieldID) { * @param length * the length * - * @return -1 for null, >=0 for length + * @return -1 for null, >=0 for length */ protected abstract int getLength(ObjectInspector objectInspector, ByteArrayRef cachedByteArrayRef, int start, int length); diff --git serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeStructBase.java serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeStructBase.java index a15c9e1..fa1f305 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeStructBase.java +++ serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDeStructBase.java @@ -86,7 +86,7 @@ public Object deserialize(Object reuse, TProtocol iprot) * @param o * - this list should be in the order of the function's params for * now. If we wanted to remove this requirement, we'd need to make it - * a List> with the String being the field name. + * a List<Pair<String, Object>> with the String being the field name. * */ @Override diff --git serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/ParseException.java serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/ParseException.java index d7fde21..00424d3 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/ParseException.java +++ serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/ParseException.java @@ -19,7 +19,7 @@ * to indicate that this constructor was used to create this object. This * constructor calls its super class with the empty string to force the * "toString" method of parent class "Throwable" to print the error message in - * the form: ParseException: + * the form: ParseException: <result of getMessage> */ public ParseException(Token currentTokenVal, int[][] expectedTokenSequencesVal, String[] tokenImageVal) { diff --git serde/src/java/org/apache/hadoop/hive/serde2/fast/DeserializeRead.java serde/src/java/org/apache/hadoop/hive/serde2/fast/DeserializeRead.java index ac931d6..cb775f7 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/fast/DeserializeRead.java +++ serde/src/java/org/apache/hadoop/hive/serde2/fast/DeserializeRead.java @@ -60,11 +60,11 @@ * * if (deserializeRead.readNextField()) { * if (deserializeRead.currentExternalBufferNeeded) { - * + * <Ensure external buffer is as least deserializeRead.currentExternalBufferNeededLen bytes> * deserializeRead.copyToExternalBuffer(externalBuffer, externalBufferStart); * } else { - * + * <Otherwise, field data is available in the currentBytes, currentBytesStart, and + * currentBytesLength of deserializeRead> * } * * @param typeInfos diff --git serde/src/java/org/apache/hadoop/hive/serde2/io/TimestampWritable.java serde/src/java/org/apache/hadoop/hive/serde2/io/TimestampWritable.java index bbccc7f..af00a30 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/io/TimestampWritable.java +++ serde/src/java/org/apache/hadoop/hive/serde2/io/TimestampWritable.java @@ -47,9 +47,9 @@ * The fractional portion is reversed, and encoded as a VInt * so timestamps with less precision use fewer bytes. * - * 0.1 -> 1 - * 0.01 -> 10 - * 0.001 -> 100 + * 0.1 -> 1 + * 0.01 -> 10 + * 0.001 -> 100 * */ public class TimestampWritable implements WritableComparable { diff --git serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyDate.java serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyDate.java index c00faac..ab20aaf 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyDate.java +++ serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyDate.java @@ -77,7 +77,7 @@ public void init(ByteArrayRef bytes, int start, int length) { * Writes a Date in SQL date format to the output stream. * @param out * The output stream - * @param i + * @param d * The Date to write * @throws IOException */ diff --git serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java index 23dbe6a..7d39066 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java +++ serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java @@ -84,7 +84,7 @@ * @param poi PrimitiveObjectInspector * @param typeBinary a switch to return either a LazyPrimtive class or it's binary * companion - * @return LazyPrimitive + * @return LazyPrimitive<? extends ObjectInspector, ? extends Writable> */ public static LazyPrimitive createLazyPrimitiveClass(PrimitiveObjectInspector poi, boolean typeBinary) { @@ -198,7 +198,7 @@ * @param oi ObjectInspector * @param typeBinary Boolean value used as switch to return variants of LazyPrimitive * objects which are initialized from a binary format for the data. - * @return LazyObject + * @return LazyObject<? extends ObjectInspector> */ public static LazyObject createLazyObject(ObjectInspector oi, boolean typeBinary) { @@ -216,7 +216,7 @@ * * @param typeInfo * The type information for the LazyObject - * @param separator + * @param separators * The array of separators for delimiting each level * @param separatorIndex * The current level (for separators). List(array), struct uses 1 @@ -241,7 +241,7 @@ public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo, * * @param typeInfo * The type information for the LazyObject - * @param separator + * @param separators * The array of separators for delimiting each level * @param separatorIndex * The current level (for separators). List(array), struct uses 1 @@ -264,13 +264,12 @@ public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo, * Create a hierarchical ObjectInspector for LazyObject with the given typeInfo. * * @param typeInfo The type information for the LazyObject - * @param separator The array of separators for delimiting each level + * @param separators The array of separators for delimiting each level * @param separatorIndex The current level (for separators). List(array), struct uses 1 level of * separator, and map uses 2 levels: the first one for delimiting entries, the second one * for delimiting key and values. * @param nullSequence The sequence of bytes representing NULL. * @param extendedBooleanLiteral whether extended boolean literal set is legal - * @param option the {@link ObjectInspectorOption} * @return The ObjectInspector * @throws SerDeException */ @@ -286,13 +285,13 @@ public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo, * Create a hierarchical ObjectInspector for LazyObject with the given typeInfo. * * @param typeInfo The type information for the LazyObject - * @param separator The array of separators for delimiting each level + * @param separators The array of separators for delimiting each level * @param separatorIndex The current level (for separators). List(array), struct uses 1 level of * separator, and map uses 2 levels: the first one for delimiting entries, the second one * for delimiting key and values. * @param nullSequence The sequence of bytes representing NULL. * @param extendedBooleanLiteral whether extended boolean literal set is legal - * @param option the {@link ObjectInspectorOption} + * @param option the {@link ObjectInspectorOptions} * @return The ObjectInspector * @throws SerDeException */ @@ -309,12 +308,11 @@ public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo, * Create a hierarchical ObjectInspector for LazyObject with the given typeInfo. * * @param typeInfo The type information for the LazyObject - * @param separator The array of separators for delimiting each level * @param separatorIndex The current level (for separators). List(array), struct uses 1 level of * separator, and map uses 2 levels: the first one for delimiting entries, the second one * for delimiting key and values. * @param lazyParams Params for lazy types - * @param option the {@link ObjectInspectorOption} + * @param option the {@link ObjectInspectorOptions} * @return The ObjectInspector * @throws SerDeException */ @@ -417,9 +415,6 @@ public static ObjectInspector createLazyStructInspector( * Create a hierarchical ObjectInspector for LazyStruct with the given * columnNames and columnTypeInfos. * - * @param lastColumnTakesRest - * whether the last column of the struct should take the rest of the - * row if there are extra fields. * @param lazyParams parameters for the lazy types * @throws SerDeException * @see LazyFactory#createLazyObjectInspector(TypeInfo, byte[], int, Text, diff --git serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveDecimal.java serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveDecimal.java index 4d2ff22..9378cd1 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveDecimal.java +++ serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveDecimal.java @@ -126,7 +126,7 @@ public static void writeUTF8( /** * Writes HiveDecimalWritable object to output stream as string * @param outputStream - * @param hiveDecimal + * @param hiveDecimalWritable * @throws IOException */ public static void writeUTF8( diff --git serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java index 17ecff1..c692c39 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java +++ serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java @@ -105,7 +105,7 @@ public LazySimpleSerDe() throws SerDeException { * ","-separated column names columns.types: ",", ":", or ";"-separated column * types * - * @see AbstractSerDe#initialize(Configuration, Properties) + * @see org.apache.hadoop.hive.serde2.AbstractSerDe#initialize(Configuration, Properties) */ @Override public void initialize(Configuration job, Properties tbl) @@ -141,7 +141,7 @@ public void initialize(Configuration job, Properties tbl) * @param field * the Writable that contains the data * @return The deserialized row Object. - * @see AbstractSerDe#deserialize(Writable) + * @see org.apache.hadoop.hive.serde2.AbstractSerDe#deserialize(Writable) */ @Override public Object doDeserialize(Writable field) throws SerDeException { @@ -167,7 +167,7 @@ public ObjectInspector getObjectInspector() throws SerDeException { /** * Returns the Writable Class after serialization. * - * @see AbstractSerDe#getSerializedClass() + * @see org.apache.hadoop.hive.serde2.AbstractSerDe#getSerializedClass() */ @Override public Class getSerializedClass() { @@ -185,8 +185,8 @@ public ObjectInspector getObjectInspector() throws SerDeException { * @param objInspector * The ObjectInspector for the row object * @return The serialized Writable object - * @throws IOException - * @see AbstractSerDe#serialize(Object, ObjectInspector) + * @throws SerDeException + * @see org.apache.hadoop.hive.serde2.AbstractSerDe#serialize(Object, ObjectInspector) */ @Override public Writable doSerialize(Object obj, ObjectInspector objInspector) @@ -422,7 +422,7 @@ public static SerDeParameters initSerdeParams(Configuration job, /** * This class is deprecated and is only used for backward compatibility. Replace by - * @see org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters. + * @see org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters . */ @Deprecated public static class SerDeParameters extends org.apache.hadoop.hive.serde2.lazy.LazySerDeParameters { diff --git serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryArray.java serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryArray.java index fee1472..6b1288c 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryArray.java +++ serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryArray.java @@ -30,7 +30,7 @@ import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; /** - * LazyBinaryArray is serialized as follows: start A b b b b b b end bytes[] -> + * LazyBinaryArray is serialized as follows: start A b b b b b b end bytes[] -> * |--------|---|---|---|---| ... |---|---| * * Section A is the null-bytes. Suppose the list has N elements, then there are diff --git serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryMap.java serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryMap.java index 1aa72ce..80e1e46 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryMap.java +++ serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryMap.java @@ -31,7 +31,7 @@ import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; /** - * LazyBinaryMap is serialized as follows: start A b c b c b c end bytes[] -> + * LazyBinaryMap is serialized as follows: start A b c b c b c end bytes[] -> * |--------|---|---|---|---| ... |---|---| * * Section A is the null-bytes. Suppose the map has N key-value pairs, then diff --git serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java index 56b4ca3..fd8aac0 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java +++ serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java @@ -351,7 +351,7 @@ public static void writeToByteStream(RandomAccessOutput byteStream, * @param byteStream * @param dec * @param scratchLongs - * @param buffer + * @param scratchBytes */ public static void writeToByteStream( RandomAccessOutput byteStream, @@ -377,9 +377,9 @@ public static void writeToByteStream( * And, allocate scratch buffer with HiveDecimal.SCRATCH_BUFFER_LEN_BIG_INTEGER_BYTES bytes. * * @param byteStream - * @param dec + * @param decWritable * @param scratchLongs - * @param buffer + * @param scratchBytes */ public static void writeToByteStream( RandomAccessOutput byteStream, diff --git serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryString.java serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryString.java index 9f691d7..4f1ae56 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryString.java +++ serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryString.java @@ -22,7 +22,7 @@ import org.apache.hadoop.io.Text; /** - * The serialization of LazyBinaryString is very simple: start A end bytes[] -> + * The serialization of LazyBinaryString is very simple: start A end bytes[] -> * |---------------------------------| * * Section A is just an array of bytes which are exactly the Text contained in diff --git serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryStruct.java serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryStruct.java index b4eb7bb..f594484 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryStruct.java +++ serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryStruct.java @@ -35,7 +35,7 @@ import org.apache.hadoop.io.BinaryComparable; /** - * LazyBinaryStruct is serialized as follows: start A B A B A B end bytes[] -> + * LazyBinaryStruct is serialized as follows: start A B A B A B end bytes[] -> * |-----|---------|--- ... ---|-----|---------| * * Section A is one null-byte, corresponding to eight struct fields in Section diff --git serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUnion.java serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUnion.java index fbf05b6..819fbab 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUnion.java +++ serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUnion.java @@ -29,7 +29,7 @@ import org.apache.hadoop.hive.serde2.objectinspector.*; /** - * LazyBinaryUnion is serialized as follows: start TAG FIELD end bytes[] -> + * LazyBinaryUnion is serialized as follows: start TAG FIELD end bytes[] -> * |-----|---------|--- ... ---|-----|---------| * * Section TAG is one byte, corresponding to tag of set union field diff --git serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java index 8237b64..e1a6276 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java +++ serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java @@ -99,7 +99,7 @@ public static short byteArrayToShort(byte[] b, int offset) { /** * Record is the unit that data is serialized in. A record includes two parts. * The first part stores the size of the element and the second part stores - * the real element. size element record -> |----|-------------------------| + * the real element. size element record -> |----|-------------------------| * * A RecordInfo stores two information of a record, the size of the "size" * part which is the element offset and the size of the element part which is diff --git serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspector.java serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspector.java index d90560b..7238fbc 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspector.java +++ serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspector.java @@ -50,7 +50,7 @@ * ObjectInspector. This is used to display the type information to the user. * * For primitive types, the type name is standardized. For other types, the - * type name can be something like "list", "map", java class + * type name can be something like "list<int>", "map<int,string>", java class * names, or user-defined type names similar to typedef. */ String getTypeName(); diff --git serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java index ba44bae..63e5e76 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java +++ serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java @@ -1366,8 +1366,8 @@ public static Boolean hasAllFieldsSettable(ObjectInspector oi) { * * @param oi - Input object inspector * @param oiSettableProperties - Lookup map to cache the result.(If no caching, pass null) - * @return - true if : (1) oi is an instance of settableOI. - * (2) All the embedded object inspectors are instances of settableOI. + * @return - true if : (1) oi is an instance of settable<DataType>OI. + * (2) All the embedded object inspectors are instances of settable<DataType>OI. * If (1) or (2) is false, return false. */ public static boolean hasAllFieldsSettable(ObjectInspector oi, diff --git serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorFactory.java serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorFactory.java index 2ed0843..03194af 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorFactory.java +++ serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorFactory.java @@ -268,7 +268,7 @@ public static AbstractPrimitiveWritableObjectInspector getPrimitiveWritableObjec /** * Returns the PrimitiveWritableObjectInspector for the given type info - * @param PrimitiveTypeInfo PrimitiveTypeInfo instance + * @param typeInfo PrimitiveTypeInfo instance * @return AbstractPrimitiveWritableObjectInspector instance */ public static AbstractPrimitiveWritableObjectInspector getPrimitiveWritableObjectInspector( @@ -304,7 +304,7 @@ public static AbstractPrimitiveWritableObjectInspector getPrimitiveWritableObjec * Returns a PrimitiveWritableObjectInspector which implements ConstantObjectInspector * for the PrimitiveCategory. * - * @param primitiveCategory + * @param typeInfo * @param value */ public static ConstantObjectInspector getPrimitiveWritableConstantObjectInspector( @@ -371,7 +371,7 @@ public static AbstractPrimitiveJavaObjectInspector getPrimitiveJavaObjectInspect /** * Returns the PrimitiveJavaObjectInspector for the given PrimitiveTypeInfo instance, - * @param PrimitiveTypeInfo PrimitiveTypeInfo instance + * @param typeInfo PrimitiveTypeInfo instance * @return AbstractPrimitiveJavaObjectInspector instance */ public static AbstractPrimitiveJavaObjectInspector getPrimitiveJavaObjectInspector( diff --git serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoUtils.java serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoUtils.java index 54964e4..9f083ec 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoUtils.java +++ serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoUtils.java @@ -158,7 +158,7 @@ private static TypeInfo getExtendedTypeInfoFromJavaType(Type t, Method m) { /** * Returns the array element type, if the Type is an array (Object[]), or - * GenericArrayType (Map[]). Otherwise return null. + * GenericArrayType (Map<String,String>[]). Otherwise return null. */ public static Type getArrayElementType(Type t) { if (t instanceof Class && ((Class) t).isArray()) { @@ -176,7 +176,7 @@ public static Type getArrayElementType(Type t) { * * @param size * In case the last parameter of Method is an array, we will try to - * return a List with the specified size by repeating the + * return a List<TypeInfo> with the specified size by repeating the * element of the array at the end. In case the size is smaller than * the minimum possible number of arguments for the method, null will * be returned.