Reflecting the user interface refactoring in the rest of the code base.

Alluxio · Sep 24, 2015 · 0a3056a · 0a3056a
1 parent f1c31fb
commit 0a3056a
Show file tree

Hide file tree

Showing 35 changed files with 641 additions and 519 deletions.
diff --git a/clients/unshaded/src/main/java/tachyon/client/TachyonFSTestUtils.java b/clients/unshaded/src/main/java/tachyon/client/TachyonFSTestUtils.java
@@ -19,12 +19,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.thrift.TException;
-
 import tachyon.TachyonURI;
 import tachyon.client.file.FileOutStream;
 import tachyon.client.file.TachyonFile;
 import tachyon.client.file.TachyonFileSystem;
+import tachyon.client.options.OutStreamOptions;
+import tachyon.exception.TachyonException;
 import tachyon.thrift.FileInfo;
 
 public final class TachyonFSTestUtils {
@@ -39,7 +39,7 @@ public final class TachyonFSTestUtils {
    * @throws IOException if <code>path</code> is invalid (e.g., illegal URI)
    */
   public static TachyonFile createByteFile(TachyonFileSystem tfs, String fileName,
-      ClientOptions options, int len) throws IOException {
+      OutStreamOptions options, int len) throws IOException {
     return createByteFile(tfs, fileName, options.getTachyonStorageType(),
         options.getUnderStorageType(), len, options.getBlockSize());
   }
@@ -76,8 +76,8 @@ public static TachyonFile createByteFile(TachyonFileSystem tfs, TachyonURI fileU
       TachyonStorageType tachyonStorageType, UnderStorageType underStorageType, int len)
       throws IOException {
     try {
-      ClientOptions options =
+      OutStreamOptions options =
-          new ClientOptions.Builder(ClientContext.getConf())
+          new OutStreamOptions.Builder(ClientContext.getConf())
               .setTachyonStorageType(tachyonStorageType).setUnderStorageType(underStorageType)
               .build();
       FileOutStream os = tfs.getOutStream(fileURI, options);
@@ -89,7 +89,7 @@ public static TachyonFile createByteFile(TachyonFileSystem tfs, TachyonURI fileU
       os.write(arr);
       os.close();
       return tfs.open(fileURI);
-    } catch (TException e) {
+    } catch (TachyonException e) {
       throw new IOException(e.getMessage());
     }
   }
@@ -110,8 +110,8 @@ public static TachyonFile createByteFile(TachyonFileSystem tfs, String fileName,
       TachyonStorageType tachyonStorageType, UnderStorageType underStorageType, int len,
       long blockCapacityByte) throws IOException {
     try {
-      ClientOptions options =
+      OutStreamOptions options =
-          new ClientOptions.Builder(ClientContext.getConf())
+          new OutStreamOptions.Builder(ClientContext.getConf())
               .setTachyonStorageType(tachyonStorageType).setUnderStorageType(underStorageType)
               .setBlockSize(blockCapacityByte).build();
       FileOutStream os = tfs.getOutStream(new TachyonURI(fileName), options);
@@ -121,7 +121,7 @@ public static TachyonFile createByteFile(TachyonFileSystem tfs, String fileName,
       }
       os.close();
       return tfs.open(new TachyonURI(fileName));
-    } catch (TException e) {
+    } catch (TachyonException e) {
       throw new IOException(e.getMessage());
     }
   }
@@ -147,7 +147,7 @@ public static List<String> listFiles(TachyonFileSystem tfs, String path) throws
       }
 
       return res;
-    } catch (TException e) {
+    } catch (TachyonException e) {
       throw new IOException(e.getMessage());
     }
   }

diff --git a/clients/unshaded/src/main/java/tachyon/client/TachyonFile.java b/clients/unshaded/src/main/java/tachyon/client/TachyonFile.java
@@ -28,7 +28,10 @@
 import tachyon.client.file.FileInStream;
 import tachyon.client.file.FileOutStream;
 import tachyon.client.file.TachyonFileSystem;
+import tachyon.client.options.InStreamOptions;
+import tachyon.client.options.OutStreamOptions;
 import tachyon.conf.TachyonConf;
+import tachyon.exception.TachyonException;
 import tachyon.thrift.BlockLocation;
 import tachyon.thrift.FileBlockInfo;
 import tachyon.thrift.FileDoesNotExistException;
@@ -166,18 +169,15 @@ public FileInStream getInStream(ReadType readType) throws IOException {
 
     FileInfo info = getUnCachedFileStatus();
     TachyonURI uri = new TachyonURI(info.getPath());
-    ClientOptions.Builder optionsBuilder = new ClientOptions.Builder(mTachyonConf);
+    InStreamOptions.Builder optionsBuilder = new InStreamOptions.Builder(mTachyonConf);
-    optionsBuilder.setBlockSize(info.getBlockSizeBytes());
     if (readType.isCache()) {
       optionsBuilder.setTachyonStorageType(TachyonStorageType.STORE);
     } else {
       optionsBuilder.setTachyonStorageType(TachyonStorageType.NO_STORE);
     }
     try {
       return mTFS.getInStream(mTFS.open(uri), optionsBuilder.build());
-    } catch (InvalidPathException e) {
+    } catch (TachyonException e) {
-      throw new IOException(e.getMessage());
-    } catch (FileDoesNotExistException e) {
       throw new IOException(e.getMessage());
     }
   }
@@ -259,7 +259,7 @@ public FileOutStream getOutStream(WriteType writeType) throws IOException {
     }
 
     FileInfo info = getUnCachedFileStatus();
-    ClientOptions.Builder optionsBuilder = new ClientOptions.Builder(mTachyonConf);
+    OutStreamOptions.Builder optionsBuilder = new OutStreamOptions.Builder(mTachyonConf);
     optionsBuilder.setBlockSize(info.getBlockSizeBytes());
 
     if (writeType.isCache()) {

diff --git a/clients/unshaded/src/main/java/tachyon/client/file/TachyonFileSystem.java b/clients/unshaded/src/main/java/tachyon/client/file/TachyonFileSystem.java
@@ -16,14 +16,11 @@
 package tachyon.client.file;
 
 import java.io.IOException;
-import java.util.Optional;
 
 import com.google.common.base.Preconditions;
 
-import tachyon.Constants;
 import tachyon.TachyonURI;
 import tachyon.annotation.PublicApi;
-import tachyon.client.ClientOptions;
 import tachyon.client.FileSystemMasterClient;
 import tachyon.client.options.CreateOptions;
 import tachyon.client.options.DeleteOptions;
@@ -36,11 +33,12 @@
 import tachyon.conf.TachyonConf;
 import tachyon.exception.TachyonException;
 import tachyon.exception.TachyonExceptionType;
+import tachyon.thrift.BlockInfoException;
 import tachyon.thrift.DependencyDoesNotExistException;
+import tachyon.thrift.FileAlreadyExistException;
 import tachyon.thrift.FileDoesNotExistException;
 import tachyon.thrift.FileInfo;
-import org.slf4j.Logger;
+import tachyon.thrift.InvalidPathException;
-import org.slf4j.LoggerFactory;
 
 /**
  * A TachyonFileSystem implementation including convenience methods as well as a streaming API to
@@ -51,8 +49,6 @@
  */
 @PublicApi
 public class TachyonFileSystem extends AbstractTachyonFileSystem {
-  private static final Logger LOG = LoggerFactory.getLogger(Constants.LOGGER_TYPE);
-
   private static TachyonFileSystem sTachyonFileSystem;
 
   public static final boolean RECURSIVE = true;
@@ -69,14 +65,26 @@ private TachyonFileSystem() {
   }
 
   @Override
-  public long create(TachyonURI path) {
+  public long create(TachyonURI path) throws IOException, TachyonException {
     return create(path, CreateOptions.defaults());
   }
 
   @Override
-  public long create(TachyonURI path, CreateOptions options) {
+  public long create(TachyonURI path, CreateOptions options) throws IOException, TachyonException {
-    throw new UnsupportedOperationException(
+    FileSystemMasterClient masterClient = mContext.acquireMasterClient();
-        "create() is currently not supported, use getOutStream instead.");
+    try {
+      long fileId =
+          masterClient.createFile(path.getPath(), options.getBlockSize(), options.isRecursive());
+      return fileId;
+    } catch (BlockInfoException e) {
+      throw new TachyonException(e.getMessage(), TachyonExceptionType.FILE_ALREADY_EXISTS);
+    } catch (FileAlreadyExistException e) {
+      throw new TachyonException(e.getMessage(), TachyonExceptionType.FILE_ALREADY_EXISTS);
+    } catch (InvalidPathException e) {
+      throw new TachyonException(e.getMessage(), TachyonExceptionType.INVALID_PATH);
+    } finally {
+      mContext.releaseMasterClient(masterClient);
+    }
   }
 
   @Override

diff --git a/clients/unshaded/src/main/java/tachyon/client/options/CreateOptions.java b/clients/unshaded/src/main/java/tachyon/client/options/CreateOptions.java
@@ -55,7 +55,11 @@ private CreateOptions(CreateOptions.Builder builder) {
     mRecursive = builder.mRecursive;
   }
 
-  public long getBlockSize() { return mBlockSize; }
+  public long getBlockSize() {
+    return mBlockSize;
+  }
 
-  public boolean isRecursive() { return mRecursive; }
+  public boolean isRecursive() {
+    return mRecursive;
+  }
 }
diff --git a/clients/unshaded/src/main/java/tachyon/client/options/DeleteOptions.java b/clients/unshaded/src/main/java/tachyon/client/options/DeleteOptions.java
@@ -45,5 +45,7 @@ private DeleteOptions(DeleteOptions.Builder builder) {
     mRecursive = builder.mRecursive;
   }
 
-  public boolean isRecursive() { return mRecursive; }
+  public boolean isRecursive() {
+    return mRecursive;
+  }
 }
diff --git a/clients/unshaded/src/main/java/tachyon/client/options/FreeOptions.java b/clients/unshaded/src/main/java/tachyon/client/options/FreeOptions.java
@@ -45,5 +45,7 @@ private FreeOptions(FreeOptions.Builder builder) {
     mRecursive = builder.mRecursive;
   }
 
-  public boolean isRecursive() { return mRecursive; }
+  public boolean isRecursive() {
+    return mRecursive;
+  }
 }
diff --git a/clients/unshaded/src/main/java/tachyon/client/options/LoadOptions.java b/clients/unshaded/src/main/java/tachyon/client/options/LoadOptions.java
@@ -45,5 +45,7 @@ private LoadOptions(LoadOptions.Builder builder) {
     mRecursive = builder.mRecursive;
   }
 
-  public boolean isRecursive() { return mRecursive; }
+  public boolean isRecursive() {
+    return mRecursive;
+  }
 }
diff --git a/clients/unshaded/src/main/java/tachyon/client/options/MkdirOptions.java b/clients/unshaded/src/main/java/tachyon/client/options/MkdirOptions.java
@@ -45,5 +45,7 @@ private MkdirOptions(MkdirOptions.Builder builder) {
     mRecursive = builder.mRecursive;
   }
 
-  public boolean isRecursive() { return mRecursive; }
+  public boolean isRecursive() {
+    return mRecursive;
+  }
 }
diff --git a/clients/unshaded/src/main/java/tachyon/client/options/OutStreamOptions.java b/clients/unshaded/src/main/java/tachyon/client/options/OutStreamOptions.java
@@ -40,23 +40,11 @@ public Builder(TachyonConf conf) {
      * @param hostname the hostname to use
      * @return the builder
      */
-    public Builder setLocation(String hostname) {
+    public Builder setHostname(String hostname) {
       mHostname = hostname;
       return this;
     }
 
-    /**
-     * @param tachyonStorageType the Tachyon storage type to use
-     * @param underStorageType the under storage type to use
-     * @return the builder
-     */
-    public Builder setStorageTypes(TachyonStorageType tachyonStorageType, UnderStorageType
-        underStorageType) {
-      mTachyonStorageType = tachyonStorageType;
-      mUnderStorageType = underStorageType;
-      return this;
-    }
-
     /**
      * @param tachyonStorageType the Tachyon storage type to use
      * @return the builder
@@ -140,4 +128,9 @@ public UnderStorageType getUnderStorageType() {
   public String getHostname() {
     return mHostname;
   }
+
+  public InStreamOptions toInStreamOptions() {
+    return new InStreamOptions.Builder(new TachyonConf())
+        .setTachyonStorageType(mTachyonStorageType).build();
+  }
 }
diff --git a/clients/unshaded/src/main/java/tachyon/client/options/SetStateOptions.java b/clients/unshaded/src/main/java/tachyon/client/options/SetStateOptions.java
@@ -15,9 +15,10 @@
 
 package tachyon.client.options;
 
-import tachyon.conf.TachyonConf;
 import java.util.Optional;
 
+import tachyon.conf.TachyonConf;
+
 public class SetStateOptions {
   public static class Builder {
     private Optional<Boolean> mPinned;
@@ -26,8 +27,8 @@ public Builder(TachyonConf conf) {
       mPinned = Optional.of(false);
     }
 
-    public Builder setRecursive(boolean recursive) {
+    public Builder setPinned(boolean pinned) {
-      mPinned = Optional.of(recursive);
+      mPinned = Optional.of(pinned);
       return this;
     }
 
@@ -46,5 +47,7 @@ private SetStateOptions(SetStateOptions.Builder builder) {
     mPinned = Optional.of(builder.mPinned.get());
   }
 
-  public Optional<Boolean> getPinned() { return mPinned; }
+  public Optional<Boolean> getPinned() {
+    return mPinned;
+  }
 }
diff --git a/common/src/main/java/tachyon/exception/TachyonExceptionType.java b/common/src/main/java/tachyon/exception/TachyonExceptionType.java
@@ -16,6 +16,7 @@
 package tachyon.exception;
 
 public enum TachyonExceptionType {
+  BLOCK_INFO,
   DEPENDENCY_DOES_NOT_EXIST,
   FILE_DOES_NOT_EXIST,
   FILE_ALREADY_EXISTS,

diff --git a/examples/src/main/java/tachyon/examples/BasicCheckpoint.java b/examples/src/main/java/tachyon/examples/BasicCheckpoint.java
@@ -36,7 +36,9 @@
 import tachyon.client.ClientOptions;
 import tachyon.client.file.FileInStream;
 import tachyon.client.file.TachyonFileSystem;
+import tachyon.client.options.OutStreamOptions;
 import tachyon.conf.TachyonConf;
+import tachyon.exception.TachyonException;
 import tachyon.master.file.meta.DependencyType;
 import tachyon.util.CommonUtils;
 import tachyon.util.FormatUtils;
@@ -99,7 +101,7 @@ private boolean readFile(TachyonFS tachyonClient) throws IOException {
     return pass;
   }
 
-  private void writeFile(TachyonFS tachyonClient) throws IOException, TException {
+  private void writeFile(TachyonFS tachyonClient) throws IOException, TachyonException {
     for (int i = 0; i < mNumFiles; i ++) {
       ByteBuffer buf = ByteBuffer.allocate(80);
       buf.order(ByteOrder.nativeOrder());
@@ -109,7 +111,7 @@ private void writeFile(TachyonFS tachyonClient) throws IOException, TException {
       buf.flip();
       TachyonURI filePath = new TachyonURI(mFileFolder + "/part-" + i);
       LOG.debug("Writing data to {}", filePath);
-      OutputStream os = TachyonFileSystem.get().getOutStream(filePath, ClientOptions.defaults());
+      OutputStream os = TachyonFileSystem.get().getOutStream(filePath, OutStreamOptions.defaults());
       os.write(buf.array());
       os.close();
     }