Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 80AAB108C7 for ; Tue, 27 Aug 2013 17:10:35 +0000 (UTC) Received: (qmail 21918 invoked by uid 500); 27 Aug 2013 17:10:35 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 21896 invoked by uid 500); 27 Aug 2013 17:10:35 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 21876 invoked by uid 99); 27 Aug 2013 17:10:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Aug 2013 17:10:34 +0000 X-ASF-Spam-Status: No, hits=-1999.4 required=5.0 tests=ALL_TRUSTED,TVD_GET_STOCK X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Aug 2013 17:10:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CBD9323888D7; Tue, 27 Aug 2013 17:10:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1517888 [1/6] - in /hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions: ./ aggregates/ aggregates/gen/ gen/ templates/ Date: Tue, 27 Aug 2013 17:10:01 -0000 To: commits@hive.apache.org From: hashutosh@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130827171009.CBD9323888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hashutosh Date: Tue Aug 27 17:09:56 2013 New Revision: 1517888 URL: http://svn.apache.org/r1517888 Log: HIVE-5126 : Make vector expressions serializable. (Jitendra Nath Pandey via Ashutosh Chauhan) Added: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterConstantBooleanVectorExpression.java Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ConstantVectorExpression.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterNotExpr.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColLikeStringScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNotNull.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNull.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarDivideLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/NotCol.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsFalse.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNotNull.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNull.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsTrue.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColCol.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatScalarCol.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLower.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStart.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStartLen.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDF.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUpper.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorExpression.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDayOfMonthLong.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFHourLong.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMinuteLong.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMonthLong.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFSecondLong.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldLong.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFUnixTimeStampLong.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFWeekOfYearLong.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFYearLong.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorAggregateExpression.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCount.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/VectorUDAFCountStar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgDouble.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFAvgLong.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMaxDouble.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMaxLong.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMaxString.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMinDouble.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMinLong.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFMinString.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdPopDouble.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdPopLong.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdSampDouble.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFStdSampLong.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFSumDouble.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFSumLong.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarPopDouble.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarPopLong.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarSampDouble.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/aggregates/gen/VectorUDAFVarSampLong.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColAddLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColDivideLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColEqualDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColGreaterDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColGreaterEqualDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColLessDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColLessEqualDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColModuloDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColModuloDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColModuloLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColModuloLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColMultiplyDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColMultiplyDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColMultiplyLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColMultiplyLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColNotEqualDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColSubtractDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColSubtractDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColSubtractLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColSubtractLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleColUnaryMinus.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarAddDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarAddLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarDivideDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarDivideLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarModuloDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarModuloLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarMultiplyDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarMultiplyLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarSubtractDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/DoubleScalarSubtractLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColEqualDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColEqualDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColEqualLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColEqualLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterEqualDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterEqualDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterEqualLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterEqualLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColGreaterLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessEqualDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessEqualDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessEqualLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessEqualLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColLessLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColNotEqualDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColNotEqualDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColNotEqualLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleColNotEqualLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleScalarEqualDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleScalarEqualLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleScalarGreaterDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleScalarGreaterEqualDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleScalarGreaterEqualLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleScalarGreaterLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleScalarLessDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleScalarLessEqualDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleScalarLessEqualLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleScalarLessLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleScalarNotEqualDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterDoubleScalarNotEqualLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColEqualDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColEqualDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColEqualLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColEqualLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterEqualDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterEqualDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterEqualLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterEqualLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColGreaterLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessEqualDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessEqualDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessEqualLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessEqualLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColLessLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColNotEqualDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColNotEqualDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColNotEqualLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongColNotEqualLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongScalarEqualDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongScalarEqualLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongScalarGreaterDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongScalarGreaterEqualDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongScalarGreaterEqualLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongScalarGreaterLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongScalarLessDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongScalarLessEqualDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongScalarLessEqualLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongScalarLessLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongScalarNotEqualDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterLongScalarNotEqualLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColEqualStringColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColEqualStringScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColGreaterEqualStringColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColGreaterEqualStringScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColGreaterStringColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColGreaterStringScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessEqualStringColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessEqualStringScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessStringColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColLessStringScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColNotEqualStringColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringColNotEqualStringScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarEqualStringColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarGreaterEqualStringColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarGreaterStringColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarLessEqualStringColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarLessStringColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/FilterStringScalarNotEqualStringColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColAddLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColDivideDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColDivideDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColEqualDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColGreaterDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColGreaterEqualDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColLessDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColLessEqualDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColModuloLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColMultiplyLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColNotEqualDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractDoubleScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColSubtractLongScalar.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongColUnaryMinus.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarAddDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarAddLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarDivideDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarModuloDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarModuloLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarMultiplyDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarMultiplyLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarSubtractDoubleColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/gen/LongScalarSubtractLongColumn.java hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnArithmeticColumn.txt hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnArithmeticScalar.txt hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnCompareScalar.txt hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ColumnUnaryMinus.txt hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterColumnCompareColumn.txt hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterColumnCompareScalar.txt hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterScalarCompareColumn.txt hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterStringColumnCompareColumn.txt hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterStringColumnCompareScalar.txt hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/FilterStringScalarCompareColumn.txt hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/ScalarArithmeticColumn.txt hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFAvg.txt hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFMinMax.txt hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFMinMaxString.txt hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFSum.txt hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/templates/VectorUDAFVar.txt Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java Tue Aug 27 17:09:56 2013 @@ -24,16 +24,24 @@ import org.apache.hadoop.hive.ql.exec.ve * Evaluate AND of two boolean columns and store result in the output boolean column. */ public class ColAndCol extends VectorExpression { - private final int colNum1; - private final int colNum2; - private final int outputColumn; + + private static final long serialVersionUID = 1L; + + private int colNum1; + private int colNum2; + private int outputColumn; public ColAndCol(int colNum1, int colNum2, int outputColumn) { + this(); this.colNum1 = colNum1; this.colNum2 = colNum2; this.outputColumn = outputColumn; } + public ColAndCol() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -136,4 +144,24 @@ public class ColAndCol extends VectorExp public String getOutputType() { return "boolean"; } + + public int getColNum1() { + return colNum1; + } + + public void setColNum1(int colNum1) { + this.colNum1 = colNum1; + } + + public int getColNum2() { + return colNum2; + } + + public void setColNum2(int colNum2) { + this.colNum2 = colNum2; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java Tue Aug 27 17:09:56 2013 @@ -27,16 +27,24 @@ import org.apache.hadoop.hive.ql.exec.ve * are supposed to be represented as 0/1 in a long vector. */ public class ColOrCol extends VectorExpression { - private final int colNum1; - private final int colNum2; - private final int outputColumn; + + private static final long serialVersionUID = 1L; + + private int colNum1; + private int colNum2; + private int outputColumn; public ColOrCol(int colNum1, int colNum2, int outputColumn) { + this(); this.colNum1 = colNum1; this.colNum2 = colNum2; this.outputColumn = outputColumn; } + public ColOrCol() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -284,4 +292,24 @@ public class ColOrCol extends VectorExpr public String getOutputType() { return "boolean"; } + + public int getColNum1() { + return colNum1; + } + + public void setColNum1(int colNum1) { + this.colNum1 = colNum1; + } + + public int getColNum2() { + return colNum2; + } + + public void setColNum2(int colNum2) { + this.colNum2 = colNum2; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ConstantVectorExpression.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ConstantVectorExpression.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ConstantVectorExpression.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ConstantVectorExpression.java Tue Aug 27 17:09:56 2013 @@ -28,30 +28,31 @@ import org.apache.hadoop.hive.ql.exec.ve */ public class ConstantVectorExpression extends VectorExpression { + private static final long serialVersionUID = 1L; + private static enum Type { LONG, DOUBLE, BYTES } - private final Type type; - private final int outputColumn; - private long longValue = 0; + private int outputColumn; + protected long longValue = 0; private double doubleValue = 0; private byte[] bytesValue = null; - private int bytesValueLength = 0; - private final String typeString; + private String typeString; + + private transient Type type; + private transient int bytesValueLength = 0; + + public ConstantVectorExpression() { + super(); + } ConstantVectorExpression(int outputColumn, String typeString) { + this(); this.outputColumn = outputColumn; - this.typeString = typeString; - if ("string".equalsIgnoreCase(typeString)) { - this.type = Type.BYTES; - } else if ("double".equalsIgnoreCase(typeString)) { - this.type = Type.DOUBLE; - } else { - this.type = Type.LONG; - } + setTypeString(typeString); } public ConstantVectorExpression(int outputColumn, long value) { @@ -66,8 +67,7 @@ public class ConstantVectorExpression ex public ConstantVectorExpression(int outputColumn, byte[] value) { this(outputColumn, "string"); - this.bytesValue = value; - this.bytesValueLength = this.bytesValue.length; + setBytesValue(value); } private void evaluateLong(VectorizedRowBatch vrg) { @@ -113,6 +113,50 @@ public class ConstantVectorExpression ex @Override public String getOutputType() { + return getTypeString(); + } + + public long getLongValue() { + return longValue; + } + + public void setLongValue(long longValue) { + this.longValue = longValue; + } + + public double getDoubleValue() { + return doubleValue; + } + + public void setDoubleValue(double doubleValue) { + this.doubleValue = doubleValue; + } + + public byte[] getBytesValue() { + return bytesValue; + } + + public void setBytesValue(byte[] bytesValue) { + this.bytesValue = bytesValue; + this.bytesValueLength = bytesValue.length; + } + + public String getTypeString() { return typeString; } + + public void setTypeString(String typeString) { + this.typeString = typeString; + if ("string".equalsIgnoreCase(typeString)) { + this.type = Type.BYTES; + } else if ("double".equalsIgnoreCase(typeString)) { + this.type = Type.DOUBLE; + } else { + this.type = Type.LONG; + } + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } Added: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterConstantBooleanVectorExpression.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterConstantBooleanVectorExpression.java?rev=1517888&view=auto ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterConstantBooleanVectorExpression.java (added) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterConstantBooleanVectorExpression.java Tue Aug 27 17:09:56 2013 @@ -0,0 +1,42 @@ +/** + * 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.hadoop.hive.ql.exec.vector.expressions; + +import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; + +public class FilterConstantBooleanVectorExpression extends ConstantVectorExpression { + + private static final long serialVersionUID = 1L; + + public FilterConstantBooleanVectorExpression() { + super(); + } + + public FilterConstantBooleanVectorExpression(long value) { + super(-1, value); + } + + @Override + public void evaluate(VectorizedRowBatch vrg) { + if (longValue == 0) { + // All values are filtered out + vrg.size = 0; + } + } +} Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java Tue Aug 27 17:09:56 2013 @@ -25,12 +25,19 @@ import org.apache.hadoop.hive.ql.exec.ve */ public class FilterExprAndExpr extends VectorExpression { + private static final long serialVersionUID = 1L; + public FilterExprAndExpr(VectorExpression childExpr1, VectorExpression childExpr2) { + this(); this.childExpressions = new VectorExpression[2]; childExpressions[0] = childExpr1; childExpressions[1] = childExpr2; } + public FilterExprAndExpr() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { childExpressions[0].evaluate(batch); Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterNotExpr.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterNotExpr.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterNotExpr.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterNotExpr.java Tue Aug 27 17:09:56 2013 @@ -24,13 +24,18 @@ import org.apache.hadoop.hive.ql.exec.ve * This class represents an NOT filter expression. This applies short circuit optimization. */ public class FilterNotExpr extends VectorExpression { - private final VectorExpression childExpr1; - private final int[] initialSelected = new int[VectorizedRowBatch.DEFAULT_SIZE]; - private int[] unselected = new int[VectorizedRowBatch.DEFAULT_SIZE]; - private final int[] tmp = new int[VectorizedRowBatch.DEFAULT_SIZE]; + private static final long serialVersionUID = 1L; + private transient final int[] initialSelected = new int[VectorizedRowBatch.DEFAULT_SIZE]; + private transient int[] unselected = new int[VectorizedRowBatch.DEFAULT_SIZE]; + private transient final int[] tmp = new int[VectorizedRowBatch.DEFAULT_SIZE]; public FilterNotExpr(VectorExpression childExpr1) { - this.childExpr1 = childExpr1; + this(); + this.childExpressions = new VectorExpression[] {childExpr1}; + } + + public FilterNotExpr() { + super(); } @Override @@ -53,6 +58,7 @@ public class FilterNotExpr extends Vecto batch.selectedInUse = true; } + VectorExpression childExpr1 = this.childExpressions[0]; childExpr1.evaluate(batch); // Calculate unselected ones in last evaluate. Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColLikeStringScalar.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColLikeStringScalar.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColLikeStringScalar.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColLikeStringScalar.java Tue Aug 27 17:09:56 2013 @@ -18,9 +18,7 @@ package org.apache.hadoop.hive.ql.exec.vector.expressions; -import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; -import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; -import org.apache.hadoop.io.Text; +import static org.apache.hadoop.hive.ql.udf.UDFLike.likePatternToRegExp; import java.nio.ByteBuffer; import java.nio.CharBuffer; @@ -29,23 +27,28 @@ import java.nio.charset.CharsetDecoder; import java.nio.charset.CodingErrorAction; import java.util.regex.Pattern; -import static org.apache.hadoop.hive.ql.udf.UDFLike.likePatternToRegExp; +import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector; +import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; +import org.apache.hadoop.io.Text; /** * Evaluate LIKE filter on a batch for a vector of strings. */ public class FilterStringColLikeStringScalar extends VectorExpression { + private static final long serialVersionUID = 1L; private int colNum; private Pattern compiledPattern; - private final Text simplePattern = new Text(); - private ByteBuffer byteBuffer; - private CharBuffer charBuffer; - private CharsetDecoder decoder; private PatternType type = PatternType.NONE; + private String simpleStringPattern; + + private transient Text simplePattern = new Text(); + private transient ByteBuffer byteBuffer; + private transient CharBuffer charBuffer; + private transient CharsetDecoder decoder; // Doing characters comparison directly instead of regular expression // matching for simple patterns like "%abc%". - enum PatternType { + public enum PatternType { NONE, // "abc" BEGIN, // "abc%" END, // "%abc" @@ -54,12 +57,17 @@ public class FilterStringColLikeStringSc } public FilterStringColLikeStringScalar(int colNum, Text likePattern) { + this(); this.colNum = colNum; String stringLikePattern = likePattern.toString(); parseSimplePattern(stringLikePattern); if (type == PatternType.COMPLEX) { compiledPattern = Pattern.compile(likePatternToRegExp(stringLikePattern)); } + } + + public FilterStringColLikeStringScalar() { + super(); decoder = Charset.forName("UTF-8").newDecoder() .onMalformedInput(CodingErrorAction.REPLACE) .onUnmappableCharacter(CodingErrorAction.REPLACE); @@ -67,7 +75,7 @@ public class FilterStringColLikeStringSc charBuffer = CharBuffer.allocate(4); } - PatternType getType() { + public PatternType getType() { return type; } @@ -259,16 +267,17 @@ public class FilterStringColLikeStringSc } strPattern += likePattern.substring(beginIndex, endIndex); - simplePattern.set(strPattern); + simpleStringPattern = strPattern; + simplePattern.set(simpleStringPattern); } @Override public void evaluate(VectorizedRowBatch batch) { - + if (childExpressions != null) { super.evaluateChildren(batch); } - + BytesColumnVector inputColVector = (BytesColumnVector) batch.cols[colNum]; int[] sel = batch.selected; boolean[] nullPos = inputColVector.isNull; @@ -528,4 +537,33 @@ public class FilterStringColLikeStringSc public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public Pattern getCompiledPattern() { + return compiledPattern; + } + + public void setCompiledPattern(Pattern compiledPattern) { + this.compiledPattern = compiledPattern; + } + + public void setType(PatternType type) { + this.type = type; + } + + public String getSimpleStringPattern() { + return simpleStringPattern; + } + + public void setSimpleStringPattern(String simpleStringPattern) { + this.simpleStringPattern = simpleStringPattern; + simplePattern.set(simpleStringPattern); + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java Tue Aug 27 17:09:56 2013 @@ -23,8 +23,14 @@ import org.apache.hadoop.hive.ql.exec.ve * An expression representing a column, only children are evaluated. */ public class IdentityExpression extends VectorExpression { - private final int colNum; - private final String type; + + private static final long serialVersionUID = 1L; + + private int colNum = -1; + private String type = null; + + public IdentityExpression() { + } public IdentityExpression(int colNum, String type) { this.colNum = colNum; @@ -47,4 +53,20 @@ public class IdentityExpression extends public String getOutputType() { return type; } + + public int getColNum() { + return getOutputColumn(); + } + + public String getType() { + return getOutputType(); + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public void setType(String type) { + this.type = type; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNotNull.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNotNull.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNotNull.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNotNull.java Tue Aug 27 17:09:56 2013 @@ -26,14 +26,20 @@ import org.apache.hadoop.hive.ql.exec.ve * The boolean output is stored in the specified output column. */ public class IsNotNull extends VectorExpression { - private final int colNum; - private final int outputColumn; + private static final long serialVersionUID = 1L; + private int colNum; + private int outputColumn; public IsNotNull(int colNum, int outputColumn) { + this(); this.colNum = colNum; this.outputColumn = outputColumn; } + public IsNotNull() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -86,4 +92,16 @@ public class IsNotNull extends VectorExp public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNull.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNull.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNull.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNull.java Tue Aug 27 17:09:56 2013 @@ -26,14 +26,21 @@ import org.apache.hadoop.hive.ql.exec.ve * The boolean output is stored in the specified output column. */ public class IsNull extends VectorExpression { - private final int colNum; - private final int outputColumn; + + private static final long serialVersionUID = 1L; + private int colNum; + private int outputColumn; public IsNull(int colNum, int outputColumn) { + this(); this.colNum = colNum; this.outputColumn = outputColumn; } + public IsNull() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -83,4 +90,16 @@ public class IsNull extends VectorExpres public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongColumn.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongColumn.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongColumn.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongColumn.java Tue Aug 27 17:09:56 2013 @@ -28,16 +28,22 @@ import org.apache.hadoop.hive.ql.exec.ve * from a template like the other arithmetic operations are. */ public class LongColDivideLongColumn extends VectorExpression { + private static final long serialVersionUID = 1L; int colNum1; int colNum2; int outputColumn; public LongColDivideLongColumn(int colNum1, int colNum2, int outputColumn) { + this(); this.colNum1 = colNum1; this.colNum2 = colNum2; this.outputColumn = outputColumn; } + public LongColDivideLongColumn() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -125,4 +131,24 @@ public class LongColDivideLongColumn ext public String getOutputType() { return "double"; } + + public int getColNum1() { + return colNum1; + } + + public void setColNum1(int colNum1) { + this.colNum1 = colNum1; + } + + public int getColNum2() { + return colNum2; + } + + public void setColNum2(int colNum2) { + this.colNum2 = colNum2; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongScalar.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongScalar.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongScalar.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongScalar.java Tue Aug 27 17:09:56 2013 @@ -28,16 +28,22 @@ import org.apache.hadoop.hive.ql.exec.ve * from a template like the other arithmetic operations are. */ public class LongColDivideLongScalar extends VectorExpression { - private final int colNum; - private final long value; - private final int outputColumn; + private static final long serialVersionUID = 1L; + private int colNum; + private long value; + private int outputColumn; public LongColDivideLongScalar(int colNum, long value, int outputColumn) { + this(); this.colNum = colNum; this.value = value; this.outputColumn = outputColumn; } + public LongColDivideLongScalar() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -108,4 +114,24 @@ public class LongColDivideLongScalar ext public String getOutputType() { return "double"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public long getValue() { + return value; + } + + public void setValue(long value) { + this.value = value; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarDivideLongColumn.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarDivideLongColumn.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarDivideLongColumn.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarDivideLongColumn.java Tue Aug 27 17:09:56 2013 @@ -28,16 +28,22 @@ import org.apache.hadoop.hive.ql.exec.ve * from a template like the other arithmetic operations are. */ public class LongScalarDivideLongColumn extends VectorExpression { - private final int colNum; - private final double value; - private final int outputColumn; + private static final long serialVersionUID = 1L; + private int colNum; + private double value; + private int outputColumn; public LongScalarDivideLongColumn(long value, int colNum, int outputColumn) { + this(); this.colNum = colNum; this.value = (double) value; this.outputColumn = outputColumn; } + public LongScalarDivideLongColumn() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -108,4 +114,24 @@ public class LongScalarDivideLongColumn public String getOutputType() { return "double"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public double getValue() { + return value; + } + + public void setValue(double value) { + this.value = value; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/NotCol.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/NotCol.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/NotCol.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/NotCol.java Tue Aug 27 17:09:56 2013 @@ -24,14 +24,20 @@ import org.apache.hadoop.hive.ql.exec.ve * Evaluates the boolean complement of the input. */ public class NotCol extends VectorExpression { - private final int colNum; - private final int outputColumn; + private static final long serialVersionUID = 1L; + private int colNum; + private int outputColumn; public NotCol(int colNum, int outputColumn) { + this(); this.colNum = colNum; this.outputColumn = outputColumn; } + public NotCol() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -101,4 +107,16 @@ public class NotCol extends VectorExpres public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsFalse.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsFalse.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsFalse.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsFalse.java Tue Aug 27 17:09:56 2013 @@ -25,12 +25,18 @@ import org.apache.hadoop.hive.ql.exec.ve * This expression selects a row if the given boolean column is false. */ public class SelectColumnIsFalse extends VectorExpression { - private final int colNum1; + private static final long serialVersionUID = 1L; + private int colNum1; public SelectColumnIsFalse(int colNum1) { + this(); this.colNum1 = colNum1; } + public SelectColumnIsFalse() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -122,4 +128,12 @@ public class SelectColumnIsFalse extends public String getOutputType() { return "boolean"; } + + public int getColNum1() { + return colNum1; + } + + public void setColNum1(int colNum1) { + this.colNum1 = colNum1; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNotNull.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNotNull.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNotNull.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNotNull.java Tue Aug 27 17:09:56 2013 @@ -25,12 +25,18 @@ import org.apache.hadoop.hive.ql.exec.ve * This expression selects a row if the given column is null. */ public class SelectColumnIsNotNull extends VectorExpression { - private final int colNum; + private static final long serialVersionUID = 1L; + private int colNum; public SelectColumnIsNotNull(int colNum) { + this(); this.colNum = colNum; } + public SelectColumnIsNotNull() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -91,4 +97,12 @@ public class SelectColumnIsNotNull exten public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNull.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNull.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNull.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNull.java Tue Aug 27 17:09:56 2013 @@ -25,12 +25,19 @@ import org.apache.hadoop.hive.ql.exec.ve * This expression selects a row if the given column is null. */ public class SelectColumnIsNull extends VectorExpression { - private final int colNum; + private static final long serialVersionUID = 1L; + private int colNum; public SelectColumnIsNull(int colNum) { + this(); this.colNum = colNum; } + public SelectColumnIsNull() { + super(); + } + + @Override public void evaluate(VectorizedRowBatch batch) { if (childExpressions != null) { @@ -88,4 +95,12 @@ public class SelectColumnIsNull extends public String getOutputType() { return "boolean"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsTrue.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsTrue.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsTrue.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsTrue.java Tue Aug 27 17:09:56 2013 @@ -25,12 +25,18 @@ import org.apache.hadoop.hive.ql.exec.ve * This expression selects a row if the given boolean column is true. */ public class SelectColumnIsTrue extends VectorExpression { - private final int colNum1; + private static final long serialVersionUID = 1L; + private int colNum1; public SelectColumnIsTrue(int colNum1) { + this(); this.colNum1 = colNum1; } + public SelectColumnIsTrue() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { if (childExpressions != null) { @@ -121,4 +127,12 @@ public class SelectColumnIsTrue extends public String getOutputType() { return "boolean"; } + + public int getColNum1() { + return colNum1; + } + + public void setColNum1(int colNum1) { + this.colNum1 = colNum1; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColCol.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColCol.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColCol.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColCol.java Tue Aug 27 17:09:56 2013 @@ -27,16 +27,22 @@ import org.apache.hadoop.hive.ql.exec.ve * the output in a third column. */ public class StringConcatColCol extends VectorExpression { + private static final long serialVersionUID = 1L; private int colNum1; private int colNum2; private int outputColumn; public StringConcatColCol(int colNum1, int colNum2, int outputColumn) { + this(); this.colNum1 = colNum1; this.colNum2 = colNum2; this.outputColumn = outputColumn; } + public StringConcatColCol() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { @@ -411,4 +417,24 @@ public class StringConcatColCol extends public String getOutputType() { return "String"; } + + public int getColNum1() { + return colNum1; + } + + public void setColNum1(int colNum1) { + this.colNum1 = colNum1; + } + + public int getColNum2() { + return colNum2; + } + + public void setColNum2(int colNum2) { + this.colNum2 = colNum2; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColScalar.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColScalar.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColScalar.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColScalar.java Tue Aug 27 17:09:56 2013 @@ -26,16 +26,22 @@ import org.apache.hadoop.hive.ql.exec.ve * the result in an output column. */ public class StringConcatColScalar extends VectorExpression { + private static final long serialVersionUID = 1L; private int colNum; private int outputColumn; private byte[] value; StringConcatColScalar(int colNum, int outputColumn, byte[] value) { + this(); this.colNum = colNum; this.outputColumn = outputColumn; this.value = value; } + public StringConcatColScalar() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { BytesColumnVector inputColVector = (BytesColumnVector) batch.cols[colNum]; @@ -115,4 +121,24 @@ public class StringConcatColScalar exten public String getOutputType() { return "String"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public byte[] getValue() { + return value; + } + + public void setValue(byte[] value) { + this.value = value; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatScalarCol.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatScalarCol.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatScalarCol.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatScalarCol.java Tue Aug 27 17:09:56 2013 @@ -26,16 +26,22 @@ import org.apache.hadoop.hive.ql.exec.ve * the result in an output column. */ public class StringConcatScalarCol extends VectorExpression { + private static final long serialVersionUID = 1L; private int colNum; private int outputColumn; private byte[] value; StringConcatScalarCol(byte[] value, int colNum, int outputColumn) { + this(); this.colNum = colNum; this.outputColumn = outputColumn; this.value = value; } + public StringConcatScalarCol() { + super(); + } + @Override public void evaluate(VectorizedRowBatch batch) { BytesColumnVector inputColVector = (BytesColumnVector) batch.cols[colNum]; @@ -115,4 +121,24 @@ public class StringConcatScalarCol exten public String getOutputType() { return "String"; } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public byte[] getValue() { + return value; + } + + public void setValue(byte[] value) { + this.value = value; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java Tue Aug 27 17:09:56 2013 @@ -27,14 +27,20 @@ import org.apache.hadoop.hive.ql.exec.ve * it in the output column vector. */ public class StringLength extends VectorExpression { - private final int colNum; - private final int outputColumn; + private static final long serialVersionUID = 1L; + private int colNum; + private int outputColumn; public StringLength(int colNum, int outputColumn) { + this(); this.colNum = colNum; this.outputColumn = outputColumn; } + public StringLength() { + super(); + } + // Calculate the length of the UTF-8 strings in input vector and place results in output vector. @Override public void evaluate(VectorizedRowBatch batch) { @@ -137,5 +143,15 @@ public class StringLength extends Vector return "Long"; } + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLower.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLower.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLower.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLower.java Tue Aug 27 17:09:56 2013 @@ -26,7 +26,13 @@ import org.apache.hadoop.hive.ql.udf.UDF * Extends {@link StringUnaryUDF}. */ public class StringLower extends StringUnaryUDF { + private static final long serialVersionUID = 1L; + public StringLower(int colNum, int outputColumn) { super(colNum, outputColumn, (IUDFUnaryString) new UDFLower()); } + + public StringLower() { + super(); + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStart.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStart.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStart.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStart.java Tue Aug 27 17:09:56 2013 @@ -29,10 +29,11 @@ import org.apache.hadoop.hive.ql.exec.ve * string will be in the output. */ public class StringSubstrColStart extends VectorExpression { - private final int startIdx; - private final int colNum; - private final int outputColumn; - private static byte[] EMPTYSTRING; + private static final long serialVersionUID = 1L; + private int startIdx; + private int colNum; + private int outputColumn; + private transient static byte[] EMPTYSTRING; // Populating the Empty string bytes. Putting it as static since it should be immutable and can // be shared. @@ -45,11 +46,16 @@ public class StringSubstrColStart extend } public StringSubstrColStart(int colNum, int startIdx, int outputColumn) { + this(); this.colNum = colNum; this.startIdx = startIdx; this.outputColumn = outputColumn; } + public StringSubstrColStart() { + super(); + } + /** * Given the substring start index param it finds the starting offset of the passed in utf8 * string byte array that matches the index. @@ -196,4 +202,24 @@ public class StringSubstrColStart extend public String getOutputType() { return "string"; } + + public int getStartIdx() { + return startIdx; + } + + public void setStartIdx(int startIdx) { + this.startIdx = startIdx; + } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStartLen.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStartLen.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStartLen.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStartLen.java Tue Aug 27 17:09:56 2013 @@ -31,12 +31,13 @@ import org.apache.hadoop.hive.ql.exec.ve * ending index. */ public class StringSubstrColStartLen extends VectorExpression { - private final int startIdx; - private final int colNum; - private final int length; - private final int outputColumn; - private final int[] offsetArray; - private static byte[] EMPTYSTRING; + private static final long serialVersionUID = 1L; + private int startIdx; + private int colNum; + private int length; + private int outputColumn; + private transient final int[] offsetArray; + private transient static byte[] EMPTYSTRING; // Populating the Empty string bytes. Putting it as static since it should be immutable and can be // shared @@ -49,10 +50,15 @@ public class StringSubstrColStartLen ext } public StringSubstrColStartLen(int colNum, int startIdx, int length, int outputColumn) { + this(); this.colNum = colNum; this.startIdx = startIdx; this.length = length; this.outputColumn = outputColumn; + } + + public StringSubstrColStartLen() { + super(); offsetArray = new int[2]; } @@ -216,4 +222,32 @@ public class StringSubstrColStartLen ext return "string"; } + public int getStartIdx() { + return startIdx; + } + + public void setStartIdx(int startIdx) { + this.startIdx = startIdx; + } + + public int getColNum() { + return colNum; + } + + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public int getLength() { + return length; + } + + public void setLength(int length) { + this.length = length; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } + } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDF.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDF.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDF.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDF.java Tue Aug 27 17:09:56 2013 @@ -29,15 +29,21 @@ import org.apache.hadoop.io.Text; * the vector. */ public class StringUnaryUDF extends VectorExpression { - private final int colNum; - private final int outputColumn; - private final IUDFUnaryString func; - private final Text s; + private static final long serialVersionUID = 1L; + private int colNum; + private int outputColumn; + private IUDFUnaryString func; + private transient final Text s; StringUnaryUDF(int colNum, int outputColumn, IUDFUnaryString func) { + this(); this.colNum = colNum; this.outputColumn = outputColumn; this.func = func; + } + + public StringUnaryUDF() { + super(); s = new Text(); } @@ -138,5 +144,23 @@ public class StringUnaryUDF extends Vect return "String"; } + public int getColNum() { + return colNum; + } + public void setColNum(int colNum) { + this.colNum = colNum; + } + + public IUDFUnaryString getFunc() { + return func; + } + + public void setFunc(IUDFUnaryString func) { + this.func = func; + } + + public void setOutputColumn(int outputColumn) { + this.outputColumn = outputColumn; + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUpper.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUpper.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUpper.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUpper.java Tue Aug 27 17:09:56 2013 @@ -26,7 +26,13 @@ import org.apache.hadoop.hive.ql.udf.UDF * Extends {@link StringUnaryUDF}. */ public class StringUpper extends StringUnaryUDF { + private static final long serialVersionUID = 1L; + public StringUpper(int colNum, int outputColumn) { super(colNum, outputColumn, (IUDFUnaryString) new UDFUpper()); } + + public StringUpper() { + super(); + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorExpression.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorExpression.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorExpression.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorExpression.java Tue Aug 27 17:09:56 2013 @@ -18,13 +18,16 @@ package org.apache.hadoop.hive.ql.exec.vector.expressions; +import java.io.Serializable; + import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; /** * Base class for expressions. */ -public abstract class VectorExpression { +public abstract class VectorExpression implements Serializable { + private static final long serialVersionUID = 1L; /** * Child expressions are evaluated post order. */ Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDayOfMonthLong.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDayOfMonthLong.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDayOfMonthLong.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFDayOfMonthLong.java Tue Aug 27 17:09:56 2013 @@ -26,8 +26,13 @@ import java.util.Calendar; */ public final class VectorUDFDayOfMonthLong extends VectorUDFTimestampFieldLong { + private static final long serialVersionUID = 1L; + public VectorUDFDayOfMonthLong(int colNum, int outputColumn) { super(Calendar.DAY_OF_MONTH, colNum, outputColumn); } + public VectorUDFDayOfMonthLong() { + super(); + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFHourLong.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFHourLong.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFHourLong.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFHourLong.java Tue Aug 27 17:09:56 2013 @@ -26,8 +26,14 @@ import java.util.Calendar; */ public final class VectorUDFHourLong extends VectorUDFTimestampFieldLong { + private static final long serialVersionUID = 1L; + public VectorUDFHourLong(int colNum, int outputColumn) { super(Calendar.HOUR_OF_DAY, colNum, outputColumn); } + public VectorUDFHourLong() { + super(); + } + } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMinuteLong.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMinuteLong.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMinuteLong.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMinuteLong.java Tue Aug 27 17:09:56 2013 @@ -26,8 +26,13 @@ import java.util.Calendar; */ public final class VectorUDFMinuteLong extends VectorUDFTimestampFieldLong { + private static final long serialVersionUID = 1L; + public VectorUDFMinuteLong(int colNum, int outputColumn) { super(Calendar.MINUTE, colNum, outputColumn); } + public VectorUDFMinuteLong() { + super(); + } } Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMonthLong.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMonthLong.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMonthLong.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFMonthLong.java Tue Aug 27 17:09:56 2013 @@ -26,10 +26,16 @@ import java.util.Calendar; */ public final class VectorUDFMonthLong extends VectorUDFTimestampFieldLong { + private static final long serialVersionUID = 1L; + public VectorUDFMonthLong(int colNum, int outputColumn) { super(Calendar.MONTH, colNum, outputColumn); } + public VectorUDFMonthLong() { + super(); + } + @Override protected long getField(long time) { /* january is 0 */ Modified: hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFSecondLong.java URL: http://svn.apache.org/viewvc/hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFSecondLong.java?rev=1517888&r1=1517887&r2=1517888&view=diff ============================================================================== --- hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFSecondLong.java (original) +++ hive/branches/vectorization/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFSecondLong.java Tue Aug 27 17:09:56 2013 @@ -26,8 +26,13 @@ import java.util.Calendar; */ public final class VectorUDFSecondLong extends VectorUDFTimestampFieldLong { + private static final long serialVersionUID = 1L; + public VectorUDFSecondLong(int colNum, int outputColumn) { super(Calendar.SECOND, colNum, outputColumn); } + public VectorUDFSecondLong() { + super(); + } }