diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java b/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java index f9da781..359180f 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java @@ -37,6 +37,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -45,13 +46,13 @@ import org.apache.hadoop.hive.common.JavaUtils; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.api.FieldSchema; +import org.apache.hadoop.hive.metastore.api.InvalidOperationException; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.SerDeInfo; import org.apache.hadoop.hive.metastore.api.StorageDescriptor; import org.apache.hadoop.hive.metastore.api.Table; import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants; -import org.apache.hadoop.hive.metastore.api.InvalidOperationException; -import org.apache.hadoop.hive.serde.serdeConstants;; +import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.Deserializer; import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.SerDeUtils; @@ -64,7 +65,7 @@ import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; import org.apache.hadoop.hive.thrift.HadoopThriftAuthBridge; -import org.apache.hadoop.util.StringUtils; + public class MetaStoreUtils { @@ -379,7 +380,7 @@ static void throwExceptionIfIncompatibleColTypeChange( throw new InvalidOperationException( "The following columns have types incompatible with the existing " + "columns in their respective positions :\n" + - StringUtils.join(",", incompatibleCols) + StringUtils.join(incompatibleCols.toArray(), ',') ); } } @@ -954,10 +955,9 @@ public static int findFreePort() throws IOException { * @throws MetaException */ static void logAndThrowMetaException(Exception e) throws MetaException { - LOG - .error("Got exception: " + e.getClass().getName() + " " + LOG.error("Got exception: " + e.getClass().getName() + " " + e.getMessage()); - LOG.error(StringUtils.stringifyException(e)); + LOG.error(org.apache.hadoop.util.StringUtils.stringifyException(e)); throw new MetaException("Got exception: " + e.getClass().getName() + " " + e.getMessage()); }