Merge remote-tracking branch 'HuaweiBigData/master' into apache/master
authorravipesala <ravi.pesala@gmail.com>
Thu, 4 Aug 2016 13:58:37 +0000 (19:28 +0530)
committerravipesala <ravi.pesala@gmail.com>
Thu, 4 Aug 2016 13:58:37 +0000 (19:28 +0530)
commit975983816666c07b401fdc75b9729c3fabe61e88
tree53769822a2f49266f543ec6674036b6933ed91ed
parent29f9cf2261ab5788590c98751848da1daae44918
parent89847ea20308d6685c0d28dbbadd620bffb971b5
Merge remote-tracking branch 'HuaweiBigData/master' into apache/master

Conflicts:
core/src/main/java/org/carbondata/query/aggregator/impl/AvgBigDecimalAggregator.java
core/src/main/java/org/carbondata/query/carbon/executor/internal/impl/InternalDetailQueryExecutor.java
core/src/main/java/org/carbondata/query/carbon/result/iterator/AbstractDetailQueryResultIterator.java
integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
integration/spark/src/main/scala/org/carbondata/spark/agg/CarbonAggregates.scala
integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataRDDFactory.scala
integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonScanRDD.scala
integration/spark/src/main/scala/org/carbondata/spark/util/CarbonScalaUtil.scala
integration/spark/src/test/scala/org/carbondata/spark/testsuite/joinquery/EquiJoinTestCase.scala
16 files changed:
core/src/main/java/org/carbondata/core/constants/CarbonCommonConstants.java
integration-testcases/src/test/scala/org/carbondata/spark/testsuite/allqueries/AllDataTypesTestCase6.scala
integration/spark/src/main/java/org/carbondata/spark/load/CarbonLoaderUtil.java
integration/spark/src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala
integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataLoadRDD.scala
integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataRDDFactory.scala
integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonGlobalDictionaryRDD.scala
integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonMergerRDD.scala
integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonScanRDD.scala
integration/spark/src/main/scala/org/carbondata/spark/util/CarbonScalaUtil.scala
processing/src/main/java/org/carbondata/processing/csvload/DataGraphExecuter.java
processing/src/main/java/org/carbondata/processing/csvload/GraphExecutionUtil.java
processing/src/main/java/org/carbondata/processing/csvreaderstep/CsvInput.java
processing/src/main/java/org/carbondata/processing/store/CarbonFactDataHandlerColumnar.java
processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/CarbonCSVBasedSeqGenStep.java