diff --git serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/ListTypeInfo.java serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/ListTypeInfo.java index cb2fa57..9cf3a57 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/ListTypeInfo.java +++ serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/ListTypeInfo.java @@ -29,10 +29,10 @@ import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category; * Always use the TypeInfoFactory to create new TypeInfo objects, instead of * directly creating an instance of this class. */ -public class ListTypeInfo extends TypeInfo implements Serializable { +public final class ListTypeInfo extends TypeInfo implements Serializable { private static final long serialVersionUID = 1L; - TypeInfo listElementTypeInfo; + private TypeInfo listElementTypeInfo; /** * For java serialization use only. @@ -77,9 +77,8 @@ public class ListTypeInfo extends TypeInfo implements Serializable { if (!(other instanceof ListTypeInfo)) { return false; } - ListTypeInfo o = (ListTypeInfo) other; - return o.getCategory().equals(getCategory()) - && o.getListElementTypeInfo().equals(getListElementTypeInfo()); + return getListElementTypeInfo().equals( + ((ListTypeInfo) other).getListElementTypeInfo()); } @Override diff --git serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/MapTypeInfo.java serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/MapTypeInfo.java index a426e74..444f314 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/MapTypeInfo.java +++ serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/MapTypeInfo.java @@ -31,12 +31,12 @@ import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category; * Always use the TypeInfoFactory to create new TypeInfo objects, instead of * directly creating an instance of this class. */ -public class MapTypeInfo extends TypeInfo implements Serializable { +public final class MapTypeInfo extends TypeInfo implements Serializable { private static final long serialVersionUID = 1L; - TypeInfo mapKeyTypeInfo; - TypeInfo mapValueTypeInfo; + private TypeInfo mapKeyTypeInfo; + private TypeInfo mapValueTypeInfo; /** * For java serialization use only. @@ -93,8 +93,7 @@ public class MapTypeInfo extends TypeInfo implements Serializable { return false; } MapTypeInfo o = (MapTypeInfo) other; - return o.getCategory().equals(getCategory()) - && o.getMapKeyTypeInfo().equals(getMapKeyTypeInfo()) + return o.getMapKeyTypeInfo().equals(getMapKeyTypeInfo()) && o.getMapValueTypeInfo().equals(getMapValueTypeInfo()); } diff --git serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/PrimitiveTypeInfo.java serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/PrimitiveTypeInfo.java index 3d1c68e..ea68045 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/PrimitiveTypeInfo.java +++ serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/PrimitiveTypeInfo.java @@ -31,11 +31,11 @@ import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectIn * Always use the TypeInfoFactory to create new TypeInfo objects, instead of * directly creating an instance of this class. */ -public class PrimitiveTypeInfo extends TypeInfo implements Serializable { +public final class PrimitiveTypeInfo extends TypeInfo implements Serializable { private static final long serialVersionUID = 1L; - String typeName; + private String typeName; /** * For java serialization use only. diff --git serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/StructTypeInfo.java serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/StructTypeInfo.java index 87179aa..3b28750 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/StructTypeInfo.java +++ serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/StructTypeInfo.java @@ -20,6 +20,7 @@ package org.apache.hadoop.hive.serde2.typeinfo; import java.io.Serializable; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import org.apache.hadoop.hive.serde.Constants; @@ -33,12 +34,12 @@ import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category; * Always use the TypeInfoFactory to create new TypeInfo objects, instead of * directly creating an instance of this class. */ -public class StructTypeInfo extends TypeInfo implements Serializable { +public final class StructTypeInfo extends TypeInfo implements Serializable { private static final long serialVersionUID = 1L; - ArrayList allStructFieldNames; - ArrayList allStructFieldTypeInfos; + private ArrayList allStructFieldNames; + private ArrayList allStructFieldTypeInfos; /** * For java serialization use only. @@ -121,9 +122,23 @@ public class StructTypeInfo extends TypeInfo implements Serializable { return false; } StructTypeInfo o = (StructTypeInfo) other; - return o.getCategory().equals(getCategory()) - && o.getAllStructFieldNames().equals(getAllStructFieldNames()) - && o.getAllStructFieldTypeInfos().equals(getAllStructFieldTypeInfos()); + Iterator namesIterator = getAllStructFieldNames().iterator(); + Iterator otherNamesIterator = o.getAllStructFieldNames().iterator(); + + // Compare the field names using ignore-case semantics + while (namesIterator.hasNext() && otherNamesIterator.hasNext()) { + if (!namesIterator.next().equalsIgnoreCase(otherNamesIterator.next())) { + return false; + } + } + + // Different number of field names + if (namesIterator.hasNext() || otherNamesIterator.hasNext()) { + return false; + } + + // Compare the field types + return o.getAllStructFieldTypeInfos().equals(getAllStructFieldTypeInfos()); } @Override diff --git serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfo.java serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfo.java index 0344718..096088e 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfo.java +++ serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfo.java @@ -33,6 +33,8 @@ import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category; */ public abstract class TypeInfo implements Serializable { + private static final long serialVersionUID = 1L; + protected TypeInfo() { } @@ -53,17 +55,8 @@ public abstract class TypeInfo implements Serializable { } @Override - public boolean equals(Object o) { - if (!(o instanceof TypeInfo)) { - return false; - } - TypeInfo dest = (TypeInfo) o; - if (getCategory() != dest.getCategory()) { - return false; - } - if (getTypeName() != dest.getTypeName()) { - return false; - } - return true; - } + public abstract boolean equals(Object o); + + @Override + public abstract int hashCode(); } diff --git serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/package-info.java serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/package-info.java new file mode 100644 index 0000000..f9bba74 --- /dev/null +++ serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/package-info.java @@ -0,0 +1,22 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * This package provides the implementation of the SerDe type system. + */ +package org.apache.hadoop.hive.serde2.typeinfo;