Return-Path: X-Original-To: apmail-tajo-commits-archive@minotaur.apache.org Delivered-To: apmail-tajo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F113C10589 for ; Sat, 30 Nov 2013 14:18:18 +0000 (UTC) Received: (qmail 523 invoked by uid 500); 30 Nov 2013 14:16:55 -0000 Delivered-To: apmail-tajo-commits-archive@tajo.apache.org Received: (qmail 213 invoked by uid 500); 30 Nov 2013 14:16:39 -0000 Mailing-List: contact commits-help@tajo.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tajo.incubator.apache.org Delivered-To: mailing list commits@tajo.incubator.apache.org Received: (qmail 100 invoked by uid 99); 30 Nov 2013 14:16:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Nov 2013 14:16:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 30 Nov 2013 14:16:34 +0000 Received: (qmail 99855 invoked by uid 99); 30 Nov 2013 14:16:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Nov 2013 14:16:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 59E6891222C; Sat, 30 Nov 2013 14:16:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jihoonson@apache.org To: commits@tajo.incubator.apache.org Date: Sat, 30 Nov 2013 14:16:16 -0000 Message-Id: <7b8e9042b84e4be1a86b6d63d124bd12@git.apache.org> In-Reply-To: <7d47946a4a3845f69429e35c78d67849@git.apache.org> References: <7d47946a4a3845f69429e35c78d67849@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/7] git commit: TAJO-207: Implement bit_length(string) function. (DaeMyung Kang via jihoon) X-Virus-Checked: Checked by ClamAV on apache.org TAJO-207: Implement bit_length(string) function. (DaeMyung Kang via jihoon) Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/a26c588e Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/a26c588e Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/a26c588e Branch: refs/heads/DAG-execplan Commit: a26c588e31c54e791cbb45f7d5bf1336d0c72da6 Parents: f9a6e9c Author: Jihoon Son Authored: Sat Nov 30 20:56:05 2013 +0900 Committer: Jihoon Son Committed: Sat Nov 30 20:56:05 2013 +0900 ---------------------------------------------------------------------- .../tajo/engine/function/string/BitLength.java | 48 ++++++++++++++++++++ .../java/org/apache/tajo/master/TajoMaster.java | 7 ++- .../TestStringOperatorsAndFunctions.java | 12 +++++ 3 files changed, 65 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/a26c588e/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/function/string/BitLength.java ---------------------------------------------------------------------- diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/function/string/BitLength.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/function/string/BitLength.java new file mode 100644 index 0000000..3a84f5b --- /dev/null +++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/function/string/BitLength.java @@ -0,0 +1,48 @@ +/** + * 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 + * + * INT4 bit_length(string text) + */ +public class BitLength extends GeneralFunction { + public BitLength() { + super(new Column[] { + new Column("text", TajoDataTypes.Type.TEXT) + }); + } + + @Override + public Datum eval(Tuple params) { + Datum datum = params.get(0); + if(datum instanceof NullDatum) return NullDatum.get(); + + return DatumFactory.createInt4(datum.asByteArray().length*8); + } +} http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/a26c588e/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 f91cc0b..1c823d3 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 @@ -352,7 +352,10 @@ public class TajoMaster extends CompositeService { new FunctionDesc("character_length", CharLength.class, FunctionType.GENERAL, CatalogUtil.newSimpleDataType(Type.TEXT), CatalogUtil.newSimpleDataTypeArray(Type.TEXT))); - + sqlFuncs.add( + new FunctionDesc("bit_length", BitLength.class, FunctionType.GENERAL, + CatalogUtil.newSimpleDataType(Type.TEXT), + CatalogUtil.newSimpleDataTypeArray(Type.TEXT))); sqlFuncs.add( new FunctionDesc("split_part", SplitPart.class, FunctionType.GENERAL, CatalogUtil.newSimpleDataType(Type.TEXT), @@ -617,4 +620,4 @@ public class TajoMaster extends CompositeService { System.exit(-1); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/a26c588e/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 5e73f88..27b9355 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 @@ -222,4 +222,16 @@ public class TestStringOperatorsAndFunctions extends ExprTestBase { testEval(schema, "table1", ",abcdef,3.14", "select substr(lower(col2), 2, 3) from table1", new String[]{"bcd"}); } + + @Test + public void testBitLength() throws IOException { + testSimpleEval("select bit_length('123456') as col1 ", new String[]{"48"}); + + Schema schema = new Schema(); + schema.addColumn("col1", TEXT); + schema.addColumn("col2", TEXT); + schema.addColumn("col3", TEXT); + testEval(schema, "table1", "ABC,DEF,3.14", "select bit_length(lower(col1) || lower(col2)) from table1", + new String[]{"48"}); + } }