add s3 option

uwescience · Feb 5, 2016 · ddf5517 · ddf5517 · senderista · Feb 5, 2016
1 parent 0323a6c
commit ddf5517
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/edu/washington/escience/myria/io/UriSink.java b/src/edu/washington/escience/myria/io/UriSink.java
@@ -20,10 +20,13 @@ public class UriSink implements DataSink {
   @JsonProperty
   private final URI uri;
 
-  public UriSink(@JsonProperty(value = "uri", required = true) final String uri) throws CatalogException {
+  public UriSink(@JsonProperty(value = "uri", required = true) String uri) throws CatalogException {
+    if (uri.contains("s3")) {
+      uri = uri.replace("s3", "s3n");
+    }
     this.uri = URI.create(Objects.requireNonNull(uri, "Parameter uri cannot be null"));
-    if (!this.uri.getScheme().equals("hdfs")) {
-      throw new CatalogException("URI must be an HDFS URI");
+    if (!this.uri.getScheme().equals("hdfs") && !this.uri.getScheme().equals("s3n")) {
+      throw new CatalogException("URI must be an HDFS or S3 URI");
     }
   }