load ufs path directly

Alluxio · Oct 18, 2023 · b76343d · b76343d
1 parent 24a32d4
commit b76343d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/dora/shell/src/main/java/alluxio/cli/fs/command/LoadCommand.java b/dora/shell/src/main/java/alluxio/cli/fs/command/LoadCommand.java
@@ -150,8 +150,7 @@ public Options getOptions() {
   @Override
   public int run(CommandLine cl) throws AlluxioException, IOException {
     String[] args = cl.getArgs();
-    AlluxioURI path =
-        new AlluxioURI(Configuration.getString(PropertyKey.DORA_CLIENT_UFS_ROOT)).join(args[0]);
+    AlluxioURI path = new AlluxioURI(args[0]);
     if (path.containsWildcard()) {
       throw new UnsupportedOperationException("Load does not support wildcard path");
     }

diff --git a/...tegration/src/test/java/alluxio/client/cli/fs/command/DoraLoadCommandIntegrationTest.java b/...tegration/src/test/java/alluxio/client/cli/fs/command/DoraLoadCommandIntegrationTest.java
@@ -44,7 +44,7 @@ public void before() throws Exception {
   public void testCommand() throws Exception {
     File testRoot = mTestFolder.newFolder("testRoot");
     mTestFolder.newFolder("testRoot/testDirectory");
-
+    String path = testRoot.getAbsolutePath();
     createByteFileInUfs("/testRoot/testFileA", Constants.MB);
     createByteFileInUfs("/testRoot/testFileB", Constants.MB);
     createByteFileInUfs("/testRoot/testDirectory/testFileC", Constants.MB);
@@ -56,10 +56,10 @@ public void testCommand() throws Exception {
     assertEquals(0, mFileSystem.getStatus(uriA).getInAlluxioPercentage());
     assertEquals(0, mFileSystem.getStatus(uriB).getInAlluxioPercentage());
     assertEquals(0, mFileSystem.getStatus(uriC).getInAlluxioPercentage());
-
     // Testing loading of a directory
-    assertEquals(0, mFsShell.run("load", "/testRoot", "--submit", "--verify"));
-    assertEquals(0, mFsShell.run("load", "/testRoot", "--progress"));
+
+    assertEquals(0, mFsShell.run("load", path, "--submit", "--verify"));
+    assertEquals(0, mFsShell.run("load", path, "--progress"));
 
     FileSystemUtils.waitForAlluxioPercentage(mFileSystem, uriA, 100);
     FileSystemUtils.waitForAlluxioPercentage(mFileSystem, uriB, 100);
@@ -69,18 +69,18 @@ public void testCommand() throws Exception {
     fileInStream.positionedRead(0, buffer, 0, Constants.MB);
     assertTrue(BufferUtils.equalIncreasingByteArray(Constants.MB, buffer));
     while (!mOutput.toString().contains("SUCCEEDED")) {
-      assertEquals(0, mFsShell.run("load", "/testRoot", "--progress"));
+      assertEquals(0, mFsShell.run("load", path, "--progress"));
       Thread.sleep(1000);
     }
     assertTrue(mOutput.toString().contains("Inodes Processed: 4"));
     assertTrue(mOutput.toString().contains("Bytes Loaded: 3072.00KB out of 3072.00KB"));
     assertTrue(mOutput.toString().contains("Files Failed: 0"));
-    assertEquals(0, mFsShell.run("load", "/testRoot", "--stop"));
+    assertEquals(0, mFsShell.run("load", path, "--stop"));
     assertEquals(-2, mFsShell.run("load", "/testRootNotExists", "--progress"));
     assertTrue(mOutput.toString().contains("cannot be found."));
-    mFsShell.run("load", "/testRoot", "--progress", "--format", "JSON");
+    mFsShell.run("load", path, "--progress", "--format", "JSON");
     assertTrue(mOutput.toString().contains("\"mJobState\":\"SUCCEEDED\""));
-    mFsShell.run("load", "/testRoot", "--progress", "--format", "JSON", "--verbose");
+    mFsShell.run("load", path, "--progress", "--format", "JSON", "--verbose");
     assertTrue(mOutput.toString().contains("\"mVerbose\":true"));
   }
 }
diff --git a/...st/java/alluxio/client/cli/fs/command/DoraLoadCommandWithVirtualBlockIntegrationTest.java b/...st/java/alluxio/client/cli/fs/command/DoraLoadCommandWithVirtualBlockIntegrationTest.java
@@ -45,6 +45,7 @@ public void before() throws Exception {
   @Test
   public void testCommand() throws Exception {
     File testRoot = mTestFolder.newFolder("testRoot");
+    String path = testRoot.getAbsolutePath();
     mTestFolder.newFolder("testRoot/testDirectory");
 
     int lengthA = 16 * Constants.MB;
@@ -63,8 +64,8 @@ public void testCommand() throws Exception {
     assertEquals(0, mFileSystem.getStatus(uriC).getInAlluxioPercentage());
 
     // Testing loading of a directory
-    assertEquals(0, mFsShell.run("load", "/testRoot", "--submit", "--verify"));
-    assertEquals(0, mFsShell.run("load", "/testRoot", "--progress"));
+    assertEquals(0, mFsShell.run("load", path, "--submit", "--verify"));
+    assertEquals(0, mFsShell.run("load", path, "--progress"));
 
     FileSystemUtils.waitForAlluxioPercentage(mFileSystem, uriA, 100);
     FileSystemUtils.waitForAlluxioPercentage(mFileSystem, uriB, 100);
@@ -82,20 +83,20 @@ public void testCommand() throws Exception {
     fileInStream.positionedRead(0, buffer, 0, lengthC);
     assertTrue(BufferUtils.equalIncreasingByteArray(lengthC, buffer));
     while (!mOutput.toString().contains("SUCCEEDED")) {
-      assertEquals(0, mFsShell.run("load", "/testRoot", "--progress"));
+      assertEquals(0, mFsShell.run("load", path, "--progress"));
       Thread.sleep(1000);
     }
     assertTrue(mOutput.toString().contains("Inodes Processed: 4"));
     int bytes = (lengthA + lengthB + lengthC) / Constants.MB;
     assertTrue(mOutput.toString().contains(
         String.format("Bytes Loaded: %s.00MB out of %s.00MB", bytes, bytes)));
     assertTrue(mOutput.toString().contains("Files Failed: 0"));
-    assertEquals(0, mFsShell.run("load", "/testRoot", "--stop"));
+    assertEquals(0, mFsShell.run("load", path, "--stop"));
     assertEquals(-2, mFsShell.run("load", "/testRootNotExists", "--progress"));
     assertTrue(mOutput.toString().contains("cannot be found."));
-    mFsShell.run("load", "/testRoot", "--progress", "--format", "JSON");
+    mFsShell.run("load", path, "--progress", "--format", "JSON");
     assertTrue(mOutput.toString().contains("\"mJobState\":\"SUCCEEDED\""));
-    mFsShell.run("load", "/testRoot", "--progress", "--format", "JSON", "--verbose");
+    mFsShell.run("load", path, "--progress", "--format", "JSON", "--verbose");
     assertTrue(mOutput.toString().contains("\"mVerbose\":true"));
   }
 }