diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/RowResolver.java ql/src/java/org/apache/hadoop/hive/ql/parse/RowResolver.java index 33b8a21..9ef5cab 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/RowResolver.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/RowResolver.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.Set; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hive.ql.ErrorMsg; @@ -200,8 +201,7 @@ public ColumnInfo get(String tab_alias, String col_alias) throws SemanticExcepti */ public void checkColumn(String tableAlias, String columnAlias) throws SemanticException { ColumnInfo prev = get(null, columnAlias); - if (prev != null && - (tableAlias == null || !tableAlias.equalsIgnoreCase(prev.getTabAlias()))) { + if (prev != null && !StringUtils.equalsIgnoreCase(tableAlias, prev.getTabAlias())) { throw new SemanticException(ErrorMsg.AMBIGUOUS_COLUMN.getMsg(columnAlias)); } }