From commits-return-11662-archive-asf-public=cust-asf.ponee.io@carbondata.apache.org Fri Jun 22 03:34:08 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id D3D5A18062B for ; Fri, 22 Jun 2018 03:34:04 +0200 (CEST) Received: (qmail 89821 invoked by uid 500); 22 Jun 2018 01:34:03 -0000 Mailing-List: contact commits-help@carbondata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@carbondata.apache.org Delivered-To: mailing list commits@carbondata.apache.org Received: (qmail 89283 invoked by uid 99); 22 Jun 2018 01:34:03 -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; Fri, 22 Jun 2018 01:34:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C177AE1150; Fri, 22 Jun 2018 01:34:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jackylk@apache.org To: commits@carbondata.apache.org Date: Fri, 22 Jun 2018 01:34:24 -0000 Message-Id: <15440e341f4e43b69ad5926fe909facb@git.apache.org> In-Reply-To: <3146ba9062d748839b5da035a0a6df0e@git.apache.org> References: <3146ba9062d748839b5da035a0a6df0e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [23/50] [abbrv] carbondata git commit: [HOTFIX] fix java style errors [HOTFIX] fix java style errors This closes #2371 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/ff036459 Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/ff036459 Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/ff036459 Branch: refs/heads/carbonstore Commit: ff0364599c5bc1d403b4294237e6c88a254beaf4 Parents: 685087e Author: Zhang Zhichao <441586683@qq.com> Authored: Wed Jun 13 12:13:41 2018 +0800 Committer: Jacky Li Committed: Wed Jun 13 15:54:54 2018 +0800 ---------------------------------------------------------------------- .../apache/spark/sql/catalyst/CarbonDDLSqlParser.scala | 2 +- .../command/management/CarbonLoadDataCommand.scala | 2 ++ .../processing/loading/model/CarbonLoadModel.java | 2 +- .../processing/loading/model/CarbonLoadModelBuilder.java | 3 ++- .../carbondata/processing/loading/model/LoadOption.java | 5 +++-- .../carbondata/processing/util/CarbonLoaderUtil.java | 10 +++++----- 6 files changed, 14 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/ff036459/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala b/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala index 1f04fa4..61a5b42 100644 --- a/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala +++ b/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala @@ -885,7 +885,7 @@ abstract class CarbonDDLSqlParser extends AbstractCarbonSparkSQLParser { "ALL_DICTIONARY_PATH", "MAXCOLUMNS", "COMMENTCHAR", "DATEFORMAT", "BAD_RECORD_PATH", "BATCH_SORT_SIZE_INMB", "GLOBAL_SORT_PARTITIONS", "SINGLE_PASS", "IS_EMPTY_DATA_BAD_RECORD", "HEADER", "TIMESTAMPFORMAT", "SKIP_EMPTY_LINE", - "SORT_COLUMN_BOUNDS","LOAD_MIN_SIZE_INMB" + "SORT_COLUMN_BOUNDS", "LOAD_MIN_SIZE_INMB" ) var isSupported = true val invalidOptions = StringBuilder.newBuilder http://git-wip-us.apache.org/repos/asf/carbondata/blob/ff036459/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonLoadDataCommand.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonLoadDataCommand.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonLoadDataCommand.scala index 4703b23..69db3ea 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonLoadDataCommand.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonLoadDataCommand.scala @@ -24,6 +24,7 @@ import java.util.UUID import scala.collection.JavaConverters._ import scala.collection.mutable import scala.collection.mutable.ArrayBuffer + import org.apache.commons.lang3.StringUtils import org.apache.hadoop.conf.Configuration import org.apache.spark.rdd.RDD @@ -44,6 +45,7 @@ import org.apache.spark.sql.types._ import org.apache.spark.storage.StorageLevel import org.apache.spark.unsafe.types.UTF8String import org.apache.spark.util.{CarbonReflectionUtils, CausedBy, FileUtils} + import org.apache.carbondata.common.exceptions.sql.MalformedCarbonCommandException import org.apache.carbondata.common.logging.{LogService, LogServiceFactory} import org.apache.carbondata.core.constants.{CarbonCommonConstants, CarbonLoadOptionConstants} http://git-wip-us.apache.org/repos/asf/carbondata/blob/ff036459/processing/src/main/java/org/apache/carbondata/processing/loading/model/CarbonLoadModel.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/model/CarbonLoadModel.java b/processing/src/main/java/org/apache/carbondata/processing/loading/model/CarbonLoadModel.java index f267fa7..90c297e 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/model/CarbonLoadModel.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/model/CarbonLoadModel.java @@ -210,7 +210,7 @@ public class CarbonLoadModel implements Serializable { * Flder path to where data should be written for this load. */ private String dataWritePath; - + /** * sort columns bounds */ http://git-wip-us.apache.org/repos/asf/carbondata/blob/ff036459/processing/src/main/java/org/apache/carbondata/processing/loading/model/CarbonLoadModelBuilder.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/model/CarbonLoadModelBuilder.java b/processing/src/main/java/org/apache/carbondata/processing/loading/model/CarbonLoadModelBuilder.java index 4ad1984..a88ce60 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/model/CarbonLoadModelBuilder.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/model/CarbonLoadModelBuilder.java @@ -270,7 +270,8 @@ public class CarbonLoadModelBuilder { carbonLoadModel.setMaxColumns(String.valueOf(validatedMaxColumns)); carbonLoadModel.readAndSetLoadMetadataDetails(); carbonLoadModel.setSortColumnsBoundsStr(optionsFinal.get("sort_column_bounds")); - carbonLoadModel.setLoadMinSize(optionsFinal.get(CarbonCommonConstants.CARBON_LOAD_MIN_SIZE_INMB)); + carbonLoadModel.setLoadMinSize( + optionsFinal.get(CarbonCommonConstants.CARBON_LOAD_MIN_SIZE_INMB)); } private int validateMaxColumns(String[] csvHeaders, String maxColumns) http://git-wip-us.apache.org/repos/asf/carbondata/blob/ff036459/processing/src/main/java/org/apache/carbondata/processing/loading/model/LoadOption.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/model/LoadOption.java b/processing/src/main/java/org/apache/carbondata/processing/loading/model/LoadOption.java index 1a65937..17c3651 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/model/LoadOption.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/model/LoadOption.java @@ -196,8 +196,9 @@ public class LoadOption { optionsFinal.put("single_pass", String.valueOf(singlePass)); optionsFinal.put("sort_scope", "local_sort"); optionsFinal.put("sort_column_bounds", Maps.getOrDefault(options, "sort_column_bounds", "")); - optionsFinal.put(CarbonCommonConstants.CARBON_LOAD_MIN_SIZE_INMB, Maps.getOrDefault(options,CarbonCommonConstants.CARBON_LOAD_MIN_SIZE_INMB, CarbonCommonConstants - .CARBON_LOAD_MIN_NODE_SIZE_INMB_DEFAULT)); + optionsFinal.put(CarbonCommonConstants.CARBON_LOAD_MIN_SIZE_INMB, + Maps.getOrDefault(options,CarbonCommonConstants.CARBON_LOAD_MIN_SIZE_INMB, + CarbonCommonConstants.CARBON_LOAD_MIN_NODE_SIZE_INMB_DEFAULT)); return optionsFinal; } http://git-wip-us.apache.org/repos/asf/carbondata/blob/ff036459/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java index d5a0b78..0ea7223 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java +++ b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java @@ -582,7 +582,7 @@ public final class CarbonLoaderUtil { */ public static Map> nodeBlockMapping( List blockInfos, int noOfNodesInput, List activeNodes, - BlockAssignmentStrategy blockAssignmentStrategy, String expectedMinSizePerNode ) { + BlockAssignmentStrategy blockAssignmentStrategy, String expectedMinSizePerNode) { ArrayList rtnNode2Blocks = new ArrayList<>(); Set uniqueBlocks = new HashSet<>(blockInfos); @@ -630,13 +630,13 @@ public final class CarbonLoaderUtil { } else { blockAssignmentStrategy = BlockAssignmentStrategy.BLOCK_NUM_FIRST; } - LOGGER.info("Specified minimum data size to load is less than the average size for each node, " - + "fallback to default strategy" + blockAssignmentStrategy); + LOGGER.info("Specified minimum data size to load is less than the average size " + + "for each node, fallback to default strategy" + blockAssignmentStrategy); } else { sizePerNode = iexpectedMinSizePerNode; } } - + if (BlockAssignmentStrategy.NODE_MIN_SIZE_FIRST == blockAssignmentStrategy) { // assign blocks to each node ignore data locality assignBlocksIgnoreDataLocality(rtnNode2Blocks, sizePerNode, uniqueBlocks, activeNodes); @@ -658,7 +658,7 @@ public final class CarbonLoaderUtil { } return rtnNodeBlocksMap; } - + /** * Assigning the blocks of a node to tasks. *