strips double-quotes, progress in LOG, refactor

build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'java'
 apply plugin: 'application'
 
-def versionNum = '0.0.7'
+def versionNum = '0.0.8'
 
 task loader(type: Exec) {
     dependsOn << 'uberloader'

src/main/java/com/datastax/loader/CqlDelimLoad.java

@@ -16,7 +16,8 @@
 package com.datastax.loader;
 
 import com.datastax.loader.parser.BooleanParser;
-import com.datastax.loader.parser.CqlDelimParser;
+import com.datastax.loader.futures.FutureManager;
+import com.datastax.loader.futures.PrintingFutureSet;
 
 import java.lang.System;
 import java.lang.String;
@@ -61,7 +62,7 @@
 import com.google.common.util.concurrent.RateLimiter;
 
 public class CqlDelimLoad {
-    private String version = "0.0.7";
+    private String version = "0.0.8";
     private String host = null;
     private int port = 9042;
     private String username = null;
@@ -98,7 +99,7 @@ private String usage() {
 	usage = usage + "Usage: -f <filename> -host <ipaddress> -schema <schema> [OPTIONS]\n";
 	usage = usage + "OPTIONS:\n";
 	usage = usage + "  -delim <delimiter>             Delimiter to use [,]\n";
-	usage = usage + "  -delmInQuotes true             Set to 'true' if delimiter can be inside quoted fields [false]\n";
+	usage = usage + "  -delimInQuotes true            Set to 'true' if delimiter can be inside quoted fields [false]\n";
 	usage = usage + "  -dateFormat <dateFormatString> Date format [default for Locale.ENGLISH]\n";
 	usage = usage + "  -nullString <nullString>       String that signifies NULL [none]\n";
 	usage = usage + "  -skipRows <skipRows>           Number of rows to skip [0]\n";

src/main/java/com/datastax/loader/parser/CqlDelimParser.java → src/main/java/com/datastax/loader/CqlDelimParser.java

@@ -13,7 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.datastax.loader.parser;
+package com.datastax.loader;
+
+import com.datastax.loader.parser.Parser;
+import com.datastax.loader.parser.DelimParser;
+import com.datastax.loader.parser.IntegerParser;
+import com.datastax.loader.parser.LongParser;
+import com.datastax.loader.parser.FloatParser;
+import com.datastax.loader.parser.DoubleParser;
+import com.datastax.loader.parser.StringParser;
+import com.datastax.loader.parser.BooleanParser;
+import com.datastax.loader.parser.UUIDParser;
+import com.datastax.loader.parser.BigDecimalParser;
+import com.datastax.loader.parser.BigIntegerParser;
+import com.datastax.loader.parser.ByteBufferParser;
+import com.datastax.loader.parser.InetAddressParser;
+import com.datastax.loader.parser.DateParser;
 
 import java.util.Map;
 import java.util.List;

src/main/java/com/datastax/loader/CqlDelimUnload.java

@@ -16,7 +16,6 @@
 package com.datastax.loader;
 
 import com.datastax.loader.parser.BooleanParser;
-import com.datastax.loader.parser.CqlDelimParser;
 
 import java.lang.System;
 import java.lang.String;
@@ -58,7 +57,7 @@
 
 
 public class CqlDelimUnload {
-    private String version = "0.0.7";
+    private String version = "0.0.8";
     private String host = null;
     private int port = 9042;
     private String username = null;

src/main/java/com/datastax/loader/AbstractFutureManager.java → src/main/java/com/datastax/loader/futures/AbstractFutureManager.java

@@ -1,4 +1,4 @@
-package com.datastax.loader;
+package com.datastax.loader.futures;
 
 import java.util.concurrent.TimeUnit;
 import com.datastax.driver.core.ResultSetFuture;

src/main/java/com/datastax/loader/ActionFutureList.java → src/main/java/com/datastax/loader/futures/ActionFutureList.java

@@ -1,4 +1,4 @@
-package com.datastax.loader;
+package com.datastax.loader.futures;
 
 import java.lang.String;
 import java.lang.System;

src/main/java/com/datastax/loader/ActionFutureSet.java → src/main/java/com/datastax/loader/futures/ActionFutureSet.java

@@ -1,4 +1,4 @@
-package com.datastax.loader;
+package com.datastax.loader.futures;
 
 import java.lang.String;
 import java.lang.System;

src/main/java/com/datastax/loader/FutureAction.java → src/main/java/com/datastax/loader/futures/FutureAction.java

@@ -1,4 +1,4 @@
-package com.datastax.loader;
+package com.datastax.loader.futures;
 
 import java.lang.String;
 import java.lang.Throwable;

src/main/java/com/datastax/loader/FutureManager.java → src/main/java/com/datastax/loader/futures/FutureManager.java

@@ -1,4 +1,4 @@
-package com.datastax.loader;
+package com.datastax.loader.futures;
 
 import com.datastax.driver.core.ResultSetFuture;
 

src/main/java/com/datastax/loader/NullFutureAction.java → src/main/java/com/datastax/loader/futures/NullFutureAction.java

@@ -1,4 +1,4 @@
-package com.datastax.loader;
+package com.datastax.loader.futures;
 
 import java.lang.String;
 import java.lang.Throwable;

src/main/java/com/datastax/loader/PrintingFutureAction.java → src/main/java/com/datastax/loader/futures/PrintingFutureAction.java

@@ -1,20 +1,30 @@
-package com.datastax.loader;
+package com.datastax.loader.futures;
 
 import java.lang.String;
 import java.lang.Throwable;
 import java.io.PrintStream;
+import java.util.concurrent.atomic.AtomicLong;
 import com.datastax.driver.core.ResultSet;
 
 public class PrintingFutureAction implements FutureAction {
     protected PrintStream logPrinter = null;
     protected PrintStream badInsertPrinter = null;
+    protected AtomicLong numInserted;
+    protected final long period = 100000;
 
     public PrintingFutureAction(PrintStream inLogPrinter, PrintStream inBadInsertPrinter) {
 	logPrinter = inLogPrinter;
 	badInsertPrinter = inBadInsertPrinter;
+	numInserted = new AtomicLong(0);
     }
 
     public void onSuccess(ResultSet rs, String line) {
+	if (logPrinter != null) {
+	    long cur = numInserted.incrementAndGet();
+	    if (0 == (cur % period)) {
+		logPrinter.println("Progress:  " + cur);
+	    }
+	}   
     }
 
     public void onFailure(Throwable t, String line) {

src/main/java/com/datastax/loader/PrintingFutureList.java → src/main/java/com/datastax/loader/futures/PrintingFutureList.java

@@ -1,4 +1,4 @@
-package com.datastax.loader;
+package com.datastax.loader.futures;
 
 import java.lang.System;
 import java.io.PrintStream;

src/main/java/com/datastax/loader/PrintingFutureSet.java → src/main/java/com/datastax/loader/futures/PrintingFutureSet.java

@@ -1,4 +1,4 @@
-package com.datastax.loader;
+package com.datastax.loader.futures;
 
 import java.lang.System;
 import java.io.PrintStream;

src/main/java/com/datastax/loader/parser/DelimParser.java

@@ -60,6 +60,8 @@ public DelimParser(String inDelimiter, String inNullString, boolean delimiterInQ
 	    delimiter = DEFAULT_DELIMITER;
 	else 
 	    delimiter = inDelimiter;
+	if (delimiter.equals("|"))
+	    delimiter = "\\|";
 	if (null == inNullString)
 	    nullString = DEFAULT_NULLSTRING;
 	else
@@ -85,6 +87,8 @@ public void add(Collection<Parser> pl) {
     // This is where we apply rules like quoting, NULL, etc
     private String prepareToParse(String toparse) {
 	String trimmedToParse = toparse.trim();
+	if (trimmedToParse.startsWith("\"") && trimmedToParse.endsWith("\""))
+	    trimmedToParse = trimmedToParse.substring(1, trimmedToParse.length() - 1);
 	if (trimmedToParse.equals(nullString))
 	    return null;
 	return trimmedToParse;