You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/03/11 21:38:53 UTC
svn commit: r1455322 - in /accumulo/trunk: ./ assemble/ core/
core/src/main/java/org/apache/accumulo/core/client/admin/ examples/
fate/src/main/java/org/apache/accumulo/fate/
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/
Author: kturner
Date: Mon Mar 11 20:38:52 2013
New Revision: 1455322
URL: http://svn.apache.org/r1455322
Log:
ACCUMULO-1171 converted bulk import paths to fully qualified
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1454534-1455299,1455301-1455320
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1453977-1453997,1453999-1454001,1454003-1454422,1454424-1454510,1454512,1454514-1455299,1455301-1455320
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1454534-1455299,1455301-1455320
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java?rev=1455322&r1=1455321&r2=1455322&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java Mon Mar 11 20:38:52 2013
@@ -1053,8 +1053,9 @@ public class TableOperationsImpl extends
TableNotFoundException, AccumuloException {
ArgumentChecker.notNull(tableName, dir, failureDir);
FileSystem fs = FileUtil.getFileSystem(CachedConfiguration.getInstance(), instance.getConfiguration());
+ Path dirPath = fs.makeQualified(new Path(dir));
Path failPath = fs.makeQualified(new Path(failureDir));
- if (!fs.exists(new Path(dir)))
+ if (!fs.exists(dirPath))
throw new AccumuloException("Bulk import directory " + dir + " does not exist!");
if (!fs.exists(failPath))
throw new AccumuloException("Bulk import failure directory " + failureDir + " does not exist!");
@@ -1064,9 +1065,9 @@ public class TableOperationsImpl extends
throw new AccumuloException("Bulk import directory " + failPath + " is a file");
throw new AccumuloException("Bulk import failure directory " + failPath + " is not empty");
}
-
- List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes()), ByteBuffer.wrap(dir.getBytes()), ByteBuffer.wrap(failureDir.getBytes()),
- ByteBuffer.wrap((setTime + "").getBytes()));
+
+ List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(tableName.getBytes()), ByteBuffer.wrap(dirPath.toString().getBytes()),
+ ByteBuffer.wrap(failPath.toString().getBytes()), ByteBuffer.wrap((setTime + "").getBytes()));
Map<String,String> opts = new HashMap<String,String>();
try {
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1454481-1454510,1454512,1454514-1455299,1455301-1455320
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1453977-1453997,1453999-1454001,1454003-1454422,1454424-1454510,1454512,1454514-1455299,1455301-1455320
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1453977-1453997,1453999-1454001,1454003-1454422,1454424-1454510,1454512,1454514-1455299,1455301-1455320
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1454163-1454422,1454424-1454510,1454512,1454514-1455299,1455301-1455320
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1453977-1453997,1453999-1454001,1454003-1454422,1454424-1454510,1454512,1454514-1455299,1455301-1455320