revert on optimization, all naive for now

uwescience · Jul 25, 2016 · cc80dda · cc80dda
1 parent b2f1104
commit cc80dda
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/edu/washington/escience/myria/operator/CSVFileScanFragment.java b/src/edu/washington/escience/myria/operator/CSVFileScanFragment.java
@@ -205,7 +205,9 @@ record = iterator.next();
          * If the previous character is not a new line, we discard the line.
          */
         if (lineNumber - 1 == 0 && partitionStartByteRange != 0) {
-          char currentChar = (char) partitionInputStream.read();
+          char currentChar =
+              (char)
+                  source.getInputStream(adjustedStartByteRange - 1, adjustedStartByteRange).read();
           if (currentChar != '\n' && currentChar != '\r') {
             discardedRecord = true;
             /*
@@ -221,7 +223,11 @@ record = iterator.next();
             /*
              * This handles the case in which the splitting occurs in the middle of \r\n.
              */
-            currentChar = (char) partitionInputStream.read();
+            currentChar =
+                (char)
+                    source
+                        .getInputStream(adjustedStartByteRange, adjustedStartByteRange + 1)
+                        .read();
             if (currentChar == '\n') {
               discardedRecord = true;
             }
@@ -360,11 +366,7 @@ protected Schema generateSchema() {
   protected void init(final ImmutableMap<String, Object> execEnvVars) throws DbException {
     buffer = new TupleBatchBuffer(getSchema());
     try {
-      /* Optimization : if not the first worker, read the previous byte */
       adjustedStartByteRange = partitionStartByteRange;
-      if (partitionStartByteRange != 0) {
-        adjustedStartByteRange -= 1;
-      }
       adjustedEndByteRange = partitionEndByteRange;
       partitionInputStream = source.getInputStream(adjustedStartByteRange, adjustedEndByteRange);
       parser =