Improved BigDec parser

apache · Sep 19, 2016 · 057af26 · 057af26
1 parent b76579b
commit 057af26
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/flink-core/src/main/java/org/apache/flink/types/parser/BigDecParser.java b/flink-core/src/main/java/org/apache/flink/types/parser/BigDecParser.java
@@ -20,6 +20,7 @@
 package org.apache.flink.types.parser;
 
 import java.math.BigDecimal;
+import java.nio.ByteBuffer;
 import org.apache.flink.annotation.PublicEvolving;
 
 /**
@@ -31,6 +32,7 @@ public class BigDecParser extends FieldParser<BigDecimal> {
 	private static final BigDecimal BIG_DECIMAL_INSTANCE = BigDecimal.ZERO;
 
 	private BigDecimal result;
+	private char[] reuse = null;
 
 	@Override
 	public int parseField(byte[] bytes, int startPos, int limit, byte[] delimiter, BigDecimal reusable) {
@@ -55,9 +57,20 @@ public int parseField(byte[] bytes, int startPos, int limit, byte[] delimiter, B
 			return -1;
 		}
 
-		String str = new String(bytes, startPos, i - startPos);
 		try {
-			this.result = new BigDecimal(str);
+			final int length = i - startPos;
+			if (reuse == null || reuse.length != length) {
+				reuse = new char[length];
+			}
+			for (int j = 0; j < length; j++) {
+				final byte b = bytes[startPos + j];
+				if ((b < '0' || b > '9') && b != '-' && b != '+' && b != '.' && b != 'E' && b != 'e') {
+					throw new NumberFormatException();
+				}
+				reuse[j] = (char) bytes[startPos + j];
+			}
+
+			this.result = new BigDecimal(reuse);
 			return (i == limit) ? limit : i + delimiter.length;
 		} catch (NumberFormatException e) {
 			setErrorState(ParseErrorState.NUMERIC_VALUE_FORMAT_ERROR);

diff --git a/flink-core/src/main/java/org/apache/flink/types/parser/BigIntParser.java b/flink-core/src/main/java/org/apache/flink/types/parser/BigIntParser.java
@@ -41,7 +41,7 @@ public int parseField(byte[] bytes, int startPos, int limit, byte[] delimiter, B
 		while (i < limit) {
 			if (i < delimLimit && delimiterNext(bytes, i, delimiter)) {
 				if (i == startPos) {
-					setErrorState(ParseErrorState.EMPTY_STRING);
+					setErrorState(ParseErrorState.EMPTY_COLUMN);
 					return -1;
 				}
 				break;