You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by pa...@apache.org on 2016/06/04 00:45:20 UTC
drill git commit: DRILL-4607: - Fix unittest failure. Janino cannot
compile a function that uses generics;
so replaced the implementation of StringFunctions.Split to not use any.
Repository: drill
Updated Branches:
refs/heads/master 3186217e5 -> d1ac6fbae
DRILL-4607: - Fix unittest failure. Janino cannot compile a function that uses generics; so replaced the implementation of StringFunctions.Split to not use any.
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/d1ac6fba
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/d1ac6fba
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/d1ac6fba
Branch: refs/heads/master
Commit: d1ac6fbae025723d54eeeb7d15b89a0df5912a3c
Parents: 3186217
Author: Parth Chandra <pa...@apache.org>
Authored: Thu Jun 2 17:23:13 2016 -0700
Committer: Parth Chandra <pa...@apache.org>
Committed: Fri Jun 3 17:43:07 2016 -0700
----------------------------------------------------------------------
.../drill/exec/expr/fn/impl/StringFunctions.java | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/d1ac6fba/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctions.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctions.java
index 41ff55f..524d254 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctions.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctions.java
@@ -172,7 +172,9 @@ public class StringFunctions{
@Override
public void setup() {
- matcher = java.util.regex.Pattern.compile(org.apache.drill.exec.expr.fn.impl.RegexpUtil.sqlToRegexSimilar(org.apache.drill.exec.expr.fn.impl.StringFunctionHelpers.toStringFromUTF8(pattern.start, pattern.end, pattern.buffer))).matcher("");
+ matcher = java.util.regex.Pattern.compile(org.apache.drill.exec.expr.fn.impl.RegexpUtil.sqlToRegexSimilar(
+ org.apache.drill.exec.expr.fn.impl.StringFunctionHelpers
+ .toStringFromUTF8(pattern.start, pattern.end, pattern.buffer))).matcher("");
charSequenceWrapper = new org.apache.drill.exec.expr.fn.impl.CharSequenceWrapper();
matcher.reset(charSequenceWrapper);
}
@@ -231,7 +233,8 @@ public class StringFunctions{
@Override
public void setup() {
- matcher = java.util.regex.Pattern.compile(org.apache.drill.exec.expr.fn.impl.StringFunctionHelpers.toStringFromUTF8(pattern.start, pattern.end, pattern.buffer)).matcher("");
+ matcher = java.util.regex.Pattern.compile(org.apache.drill.exec.expr.fn.impl.StringFunctionHelpers.toStringFromUTF8(
+ pattern.start, pattern.end, pattern.buffer)).matcher("");
charSequenceWrapper = new org.apache.drill.exec.expr.fn.impl.CharSequenceWrapper();
matcher.reset(charSequenceWrapper);
}
@@ -1345,7 +1348,7 @@ public class StringFunctions{
public void setup() {
int len = delimiter.end - delimiter.start;
if (len != 1) {
- throw new IllegalArgumentException("Only single character delimiters are supportted for split()");
+ throw new IllegalArgumentException("Only single character delimiters are supported for split()");
}
char splitChar = org.apache.drill.exec.expr.fn.impl.StringFunctionHelpers.
toStringFromUTF8(delimiter.start, delimiter.end, delimiter.buffer).charAt(0);
@@ -1354,12 +1357,13 @@ public class StringFunctions{
@Override
public void eval() {
- Iterable<String> tokens = splitter.split(
- org.apache.drill.exec.expr.fn.impl.StringFunctionHelpers.toStringFromUTF8(input.start, input.end, input.buffer));
+ // Convert the iterable to an array as Janino will not handle generics.
+ Object[] tokens = com.google.common.collect.Iterables.toArray(splitter.split(
+ org.apache.drill.exec.expr.fn.impl.StringFunctionHelpers.toStringFromUTF8(input.start, input.end, input.buffer)), String.class);
org.apache.drill.exec.vector.complex.writer.BaseWriter.ListWriter list = writer.rootAsList();
list.startList();
- for (String token : tokens) {
- final byte[] strBytes = token.getBytes(com.google.common.base.Charsets.UTF_8);
+ for(int i = 0; i < tokens.length; i++ ) {
+ final byte[] strBytes = ((String)tokens[i]).getBytes(com.google.common.base.Charsets.UTF_8);
buffer = buffer.reallocIfNeeded(strBytes.length);
buffer.setBytes(0, strBytes);
list.varChar().writeVarChar(0, strBytes.length, buffer);