fixed the OperatorEncoding for CSVFragmentTupleSource

uwescience · Jun 7, 2017 · 5fdcc02 · 5fdcc02
1 parent 406be71
commit 5fdcc02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/edu/washington/escience/myria/CsvTupleReader.java b/src/edu/washington/escience/myria/CsvTupleReader.java
@@ -187,15 +187,15 @@ public Schema getSchema() {
     return schema;
   }
 
-  public char getDelimiter() {
+  public Character getDelimiter() {
     return delimiter;
   }
 
-  public char getQuote() {
+  public Character getQuote() {
     return quote;
   }
 
-  public char getEscape() {
+  public Character getEscape() {
     return escape;
   }
 

diff --git a/src/edu/washington/escience/myria/api/encoding/OperatorEncoding.java b/src/edu/washington/escience/myria/api/encoding/OperatorEncoding.java
@@ -10,7 +10,6 @@
 
 import edu.washington.escience.myria.api.MyriaApiException;
 import edu.washington.escience.myria.api.encoding.QueryConstruct.ConstructArgs;
-import edu.washington.escience.myria.operator.CSVFragmentTupleSource;
 import edu.washington.escience.myria.operator.Operator;
 
 /**
@@ -30,7 +29,7 @@
   @Type(name = "Consumer", value = ConsumerEncoding.class),
   @Type(name = "Counter", value = CounterEncoding.class),
   @Type(name = "CrossWithSingleton", value = CrossWithSingletonEncoding.class),
-  @Type(name = "CSVFileScanFragment", value = CSVFragmentTupleSource.class),
+  @Type(name = "CSVFragmentTupleSource", value = CSVFragmentTupleSourceEncoding.class),
   @Type(name = "DbInsert", value = DbInsertEncoding.class),
   @Type(name = "DbQueryScan", value = QueryScanEncoding.class),
   @Type(name = "DbCreateIndex", value = CreateIndexEncoding.class),