You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by al...@apache.org on 2015/01/07 16:05:02 UTC
[1/2] flink git commit: [FLINK-1365] Fix ValueTypeInfo
Repository: flink
Updated Branches:
refs/heads/master 47ec09e10 -> 383ae265c
[FLINK-1365] Fix ValueTypeInfo
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/59970361
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/59970361
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/59970361
Branch: refs/heads/master
Commit: 59970361c11b8177edbf56786e896ce4da82c6ba
Parents: 47ec09e
Author: Aljoscha Krettek <al...@gmail.com>
Authored: Thu Dec 18 16:14:21 2014 +0100
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Wed Jan 7 14:47:31 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/flink/api/java/typeutils/ValueTypeInfo.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/59970361/flink-java/src/main/java/org/apache/flink/api/java/typeutils/ValueTypeInfo.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/typeutils/ValueTypeInfo.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/ValueTypeInfo.java
index b3c25e4..2e40ff9 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/typeutils/ValueTypeInfo.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/ValueTypeInfo.java
@@ -96,10 +96,10 @@ public class ValueTypeInfo<T extends Value> extends TypeInformation<T> implement
}
if (CopyableValue.class.isAssignableFrom(type)) {
- return (TypeComparator<T>) new ValueComparator(sortOrderAscending, type);
+ return (TypeComparator<T>) new CopyableValueComparator(sortOrderAscending, type);
}
else {
- return (TypeComparator<T>) new CopyableValueComparator(sortOrderAscending, type);
+ return (TypeComparator<T>) new ValueComparator(sortOrderAscending, type);
}
}
[2/2] flink git commit: [FLINK-1366] Enable FastPath in
TextValueInputFormat again
Posted by al...@apache.org.
[FLINK-1366] Enable FastPath in TextValueInputFormat again
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/383ae265
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/383ae265
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/383ae265
Branch: refs/heads/master
Commit: 383ae265c20b4f482f37a4d9b73ab2e54cf9c35e
Parents: 5997036
Author: Aljoscha Krettek <al...@gmail.com>
Authored: Fri Dec 5 14:14:25 2014 +0100
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Wed Jan 7 14:47:59 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/flink/api/java/io/TextValueInputFormat.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/383ae265/flink-java/src/main/java/org/apache/flink/api/java/io/TextValueInputFormat.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/io/TextValueInputFormat.java b/flink-java/src/main/java/org/apache/flink/api/java/io/TextValueInputFormat.java
index 58d62ab..1444fb1 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/io/TextValueInputFormat.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/io/TextValueInputFormat.java
@@ -25,6 +25,7 @@ import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import java.util.Arrays;
+import com.google.common.base.Charsets;
import org.apache.flink.api.common.io.DelimitedInputFormat;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.core.fs.Path;
@@ -82,6 +83,10 @@ public class TextValueInputFormat extends DelimitedInputFormat<StringValue> {
if (charsetName == null || !Charset.isSupported(charsetName)) {
throw new RuntimeException("Unsupported charset: " + charsetName);
}
+
+ if (charsetName.equalsIgnoreCase(Charsets.US_ASCII.name())) {
+ ascii = true;
+ }
this.decoder = Charset.forName(charsetName).newDecoder();
this.byteWrapper = ByteBuffer.allocate(1);