You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by bl...@apache.org on 2013/12/03 08:19:27 UTC
git commit: TAJO-355: Implement repeat(text,
int) function. (DaeMyung Kang via jaehwa)
Updated Branches:
refs/heads/master 2659cda4a -> 29a0aa01c
TAJO-355: Implement repeat(text,int) function. (DaeMyung Kang via jaehwa)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/29a0aa01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/29a0aa01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/29a0aa01
Branch: refs/heads/master
Commit: 29a0aa01c5e68422841170b86537eab169eabf26
Parents: 2659cda
Author: blrunner <jh...@gruter.com>
Authored: Tue Dec 3 16:18:57 2013 +0900
Committer: blrunner <jh...@gruter.com>
Committed: Tue Dec 3 16:18:57 2013 +0900
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../tajo/engine/function/string/Repeat.java | 61 ++++++++++++++++++++
.../java/org/apache/tajo/master/TajoMaster.java | 5 ++
.../TestStringOperatorsAndFunctions.java | 14 +++++
4 files changed, 82 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/29a0aa01/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 257dd93..ab0e893 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,8 @@ Release 0.8.0 - unreleased
NEW FEATURES
+ TAJO-355: Implement repeat(text,int) function. (DaeMyung Kang via jaehwa)
+
TAJO-339: Implement sin( x ) - returns the sine of x (x is in radians). (Jae Young Lee via jaehwa)
TAJO-348: Implement octet_length(text). (DaeMyung Kang via jaehwa)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/29a0aa01/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/function/string/Repeat.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/function/string/Repeat.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/function/string/Repeat.java
new file mode 100644
index 0000000..c170e5d
--- /dev/null
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/function/string/Repeat.java
@@ -0,0 +1,61 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tajo.engine.function.string;
+
+import org.apache.tajo.catalog.Column;
+import org.apache.tajo.common.TajoDataTypes;
+import org.apache.tajo.datum.Datum;
+import org.apache.tajo.datum.DatumFactory;
+import org.apache.tajo.datum.NullDatum;
+import org.apache.tajo.engine.function.GeneralFunction;
+import org.apache.tajo.storage.Tuple;
+
+/**
+ * Function definition
+ *
+ * text reverse(string text)
+ */
+public class Repeat extends GeneralFunction {
+ public Repeat() {
+ super(new Column[] {
+ new Column("text", TajoDataTypes.Type.TEXT),
+ new Column("count", TajoDataTypes.Type.INT4)
+ });
+ }
+
+ private String repeat(String word, int count) {
+ StringBuilder builder = new StringBuilder();
+ for (int i = 0; i < count; i++) {
+ builder.append(word);
+ }
+
+ return builder.toString();
+ }
+
+ @Override
+ public Datum eval(Tuple params) {
+ Datum datum = params.get(0);
+ if(datum instanceof NullDatum) return NullDatum.get();
+
+ Datum countDatum = params.get(1);
+ if(countDatum instanceof NullDatum) return NullDatum.get();
+
+ return DatumFactory.createText(repeat(datum.asChars(), countDatum.asInt4()));
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/29a0aa01/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TajoMaster.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TajoMaster.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TajoMaster.java
index d3e9cae..58c3ef1 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TajoMaster.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TajoMaster.java
@@ -343,6 +343,11 @@ public class TajoMaster extends CompositeService {
CatalogUtil.newSimpleDataTypeArray(Type.TEXT)));
sqlFuncs.add(
+ new FunctionDesc("repeat", Repeat.class, FunctionType.GENERAL,
+ CatalogUtil.newSimpleDataType(Type.TEXT),
+ CatalogUtil.newSimpleDataTypeArray(Type.TEXT, Type.INT4)));
+
+ sqlFuncs.add(
new FunctionDesc("left", Left.class, FunctionType.GENERAL,
CatalogUtil.newSimpleDataType(Type.TEXT),
CatalogUtil.newSimpleDataTypeArray(Type.TEXT, Type.INT4)));
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/29a0aa01/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/function/TestStringOperatorsAndFunctions.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/function/TestStringOperatorsAndFunctions.java b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/function/TestStringOperatorsAndFunctions.java
index bbe6939..24c658e 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/function/TestStringOperatorsAndFunctions.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/function/TestStringOperatorsAndFunctions.java
@@ -218,6 +218,20 @@ public class TestStringOperatorsAndFunctions extends ExprTestBase {
}
@Test
+ public void testRepeat() throws IOException {
+ testSimpleEval("select repeat('ab',4) as col1 ", new String[]{"abababab"});
+ testSimpleEval("select repeat('가',3) as col1 ", new String[]{"가가가"});
+ testSimpleEval("select repeat('a',2) as col1 ", new String[]{"aa"});
+
+ Schema schema = new Schema();
+ schema.addColumn("col1", TEXT);
+ schema.addColumn("col2", TEXT);
+ schema.addColumn("col3", TEXT);
+ testEval(schema, "table1", "abc,efg,3.14", "select repeat(col1,2) from table1", new String[]{"abcabc"});
+ }
+
+
+ @Test
public void testUpper() throws IOException {
testSimpleEval("select upper('abcdef') as col1 ", new String[]{"ABCDEF"});