Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BCE2F200BEA for ; Tue, 13 Dec 2016 04:18:41 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BB6BF160B2A; Tue, 13 Dec 2016 03:18:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0ECE5160B22 for ; Tue, 13 Dec 2016 04:18:40 +0100 (CET) Received: (qmail 97972 invoked by uid 500); 13 Dec 2016 03:18:40 -0000 Mailing-List: contact issues-help@carbondata.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@carbondata.incubator.apache.org Delivered-To: mailing list issues@carbondata.incubator.apache.org Received: (qmail 97963 invoked by uid 99); 13 Dec 2016 03:18:40 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Dec 2016 03:18:40 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id D9DB61A039F for ; Tue, 13 Dec 2016 03:18:39 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -7.018 X-Spam-Level: X-Spam-Status: No, score=-7.018 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id jo3VhEB6GTzO for ; Tue, 13 Dec 2016 03:18:38 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id D02115F1A1 for ; Tue, 13 Dec 2016 03:18:37 +0000 (UTC) Received: (qmail 97919 invoked by uid 99); 13 Dec 2016 03:18:37 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Dec 2016 03:18:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D01BCE09B3; Tue, 13 Dec 2016 03:18:36 +0000 (UTC) From: piaoyats To: issues@carbondata.incubator.apache.org Reply-To: issues@carbondata.incubator.apache.org References: In-Reply-To: Subject: [GitHub] incubator-carbondata pull request #388: [CARBONDATA-431]bigdecimal compressi... Content-Type: text/plain Message-Id: <20161213031836.D01BCE09B3@git1-us-west.apache.org> Date: Tue, 13 Dec 2016 03:18:36 +0000 (UTC) archived-at: Tue, 13 Dec 2016 03:18:41 -0000 Github user piaoyats commented on a diff in the pull request: https://github.com/apache/incubator-carbondata/pull/388#discussion_r92091360 --- Diff: core/src/main/java/org/apache/carbondata/core/util/ValueCompressionUtil.java --- @@ -243,46 +270,64 @@ public static Object getCompressedValues(COMPRESSION_TYPE compType, double[] val * @param actualDataType * @return compressor based on actualdatatype */ - public static ValueCompressor getValueCompressor(DataType actualDataType) { - switch (actualDataType) { - case DATA_BIGINT: - return new BigIntCompressor(); - default: - return new DoubleCompressor(); + public static ValueCompressor getValueCompressor( + CompressionFinder compressionFinder) { + if (compressionFinder instanceof BigDecimalCompressionFinder) { + return new BigDecimalCompressor(); + } else { + switch (compressionFinder.getActualDataType()) { + case DATA_BIGINT: + return new BigIntCompressor(); + default: + return new DoubleCompressor(); + } } } - private static ValueCompressonHolder.UnCompressValue[] getUncompressedValues( - COMPRESSION_TYPE[] compType, DataType[] actualDataType, DataType[] changedDataType) { - - ValueCompressonHolder.UnCompressValue[] compressValue = - new ValueCompressonHolder.UnCompressValue[changedDataType.length]; - for (int i = 0; i < changedDataType.length; i++) { - switch (compType[i]) { - case ADAPTIVE: - compressValue[i] = getUnCompressNone(changedDataType[i], actualDataType[i]); - break; - - case DELTA_DOUBLE: - compressValue[i] = getUnCompressDecimalMaxMin(changedDataType[i], actualDataType[i]); - break; - - case BIGINT: - compressValue[i] = getUnCompressNonDecimal(changedDataType[i]); - break; - - case BIGDECIMAL: - compressValue[i] = new UnCompressByteArray(UnCompressByteArray.ByteArrayType.BIG_DECIMAL); - break; + /** + * get uncompressed object + * @param compressionFinders : Compression types for measures + * @return + */ + private static UnCompressValue[] getUncompressedValues( + CompressionFinder[] compressionFinders) { + UnCompressValue[] unCompressedValues = new UnCompressValue[compressionFinders.length]; + for (int i=0; i< compressionFinders.length; i++) { + unCompressedValues[i] = getUncompressedValue(compressionFinders[i]); + } + return unCompressedValues; + } + /** + * + * @param compressionFinder bigdecimal compression finder + * @return Uncompressed measure object + */ + private static UnCompressValue getUncompressedValue( + BigDecimalCompressionFinder compressionFinder) { + UnCompressValue leftPart = getUncompressedValue(compressionFinder.getLeftCompType(), + compressionFinder.getLeftActualDataType(), compressionFinder.getLeftChangedDataType()); + UnCompressValue rightPart = getUncompressedValue(compressionFinder.getRightCompType(), + compressionFinder.getRightActualDataType(), compressionFinder.getRightChangedDataType()); + return new UnCompressBigDecimal<>(compressionFinder, leftPart, rightPart); + } - default: - compressValue[i] = getUnCompressNonDecimalMaxMin(changedDataType[i]); - } + /** + * + * @param compressionFinder for measure other then bigdecimal + * @return + */ + private static UnCompressValue getUncompressedValue( + CompressionFinder compressionFinder) { + if (compressionFinder instanceof BigDecimalCompressionFinder) { + return getUncompressedValue( --- End diff -- same instanceof here --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---