diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java index 5391171..99d6680 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java @@ -59,20 +59,24 @@ private static final Log LOG = LogFactory.getLog(HiveAlterHandler.class .getName()); + @Override public Configuration getConf() { return hiveConf; } + @Override @SuppressWarnings("nls") public void setConf(Configuration conf) { hiveConf = conf; } + @Override public void alterTable(RawStore msdb, Warehouse wh, String dbname, String name, Table newt) throws InvalidOperationException, MetaException { alterTable(msdb, wh, dbname, name, newt, false); } + @Override public void alterTable(RawStore msdb, Warehouse wh, String dbname, String name, Table newt, boolean cascade) throws InvalidOperationException, MetaException { if (newt == null) { @@ -200,8 +204,6 @@ public void alterTable(RawStore msdb, Warehouse wh, String dbname, + " already exists : " + destPath); } } catch (IOException e) { - Warehouse.closeFs(srcFs); - Warehouse.closeFs(destFs); throw new InvalidOperationException("Unable to access new location " + destPath + " for table " + newt.getDbName() + "." + newt.getTableName()); @@ -316,6 +318,7 @@ String getSimpleMessage(IOException ex) { } return ex.getMessage(); } + @Override public Partition alterPartition(final RawStore msdb, Warehouse wh, final String dbname, final String name, final List part_vals, final Partition new_part) throws InvalidOperationException, InvalidObjectException, AlreadyExistsException, @@ -430,8 +433,6 @@ public Partition alterPartition(final RawStore msdb, Warehouse wh, final String + " already exists : " + destPath); } } catch (IOException e) { - Warehouse.closeFs(srcFs); - Warehouse.closeFs(destFs); throw new InvalidOperationException("Unable to access new location " + destPath + " for partition " + tbl.getDbName() + "." + tbl.getTableName() + " " + new_part.getValues()); @@ -491,6 +492,7 @@ public Partition alterPartition(final RawStore msdb, Warehouse wh, final String return oldPart; } + @Override public List alterPartitions(final RawStore msdb, Warehouse wh, final String dbname, final String name, final List new_parts) throws InvalidOperationException, InvalidObjectException, AlreadyExistsException, diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java index c3598db..b255090 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java @@ -60,7 +60,6 @@ public boolean deleteDir(FileSystem fs, Path f, boolean recursive, } catch (FileNotFoundException e) { return true; // ok even if there is not data } catch (Exception e) { - Warehouse.closeFs(fs); MetaStoreUtils.logAndThrowMetaException(e); } return false; diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/Warehouse.java b/metastore/src/java/org/apache/hadoop/hive/metastore/Warehouse.java index 011d4d8..bc0f6e3 100755 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/Warehouse.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/Warehouse.java @@ -200,7 +200,6 @@ public boolean mkdirs(Path f, boolean inheritPermCandidate) throws MetaException fs = getFs(f); return FileUtils.mkdir(fs, f, inheritPerms, conf); } catch (IOException e) { - closeFs(fs); MetaStoreUtils.logAndThrowMetaException(e); } return false; @@ -480,7 +479,6 @@ public boolean isDir(Path f) throws MetaException { } catch (FileNotFoundException e) { return false; } catch (IOException e) { - closeFs(fs); MetaStoreUtils.logAndThrowMetaException(e); } return true;