From d1ac6fbae025723d54eeeb7d15b89a0df5912a3c Mon Sep 17 00:00:00 2001 From: Parth Chandra Date: Thu, 2 Jun 2016 17:23:13 -0700 Subject: [PATCH] DRILL-4607: - Fix unittest failure. Janino cannot compile a function that uses generics; so replaced the implementation of StringFunctions.Split to not use any. --- .../exec/expr/fn/impl/StringFunctions.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) 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 41ff55f7096..524d254828e 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 static class Similar implements DrillSimpleFunc { @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 static class RegexpReplace implements DrillSimpleFunc { @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 static class Split implements DrillSimpleFunc { 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 void setup() { @Override public void eval() { - Iterable 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);