From 5fdcc02674e5d503b3bcf12fbfdb89db94fa7a12 Mon Sep 17 00:00:00 2001
From: jortiz16 <jortiz16@cs.washington.edu>
Date: Wed, 7 Jun 2017 13:43:33 -0700
Subject: [PATCH] fixed the OperatorEncoding for CSVFragmentTupleSource

---
 src/edu/washington/escience/myria/CsvTupleReader.java       | 6 +++---
 .../escience/myria/api/encoding/OperatorEncoding.java       | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/edu/washington/escience/myria/CsvTupleReader.java b/src/edu/washington/escience/myria/CsvTupleReader.java
index ccca60e49..222b7720c 100644
--- 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
index 7955478c2..4c969a062 100644
--- 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),