You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2016/08/01 10:05:45 UTC
[47/47] incubator-carbondata git commit: Merge PRs from old github
This closes #58
Merge PRs from old github This closes #58
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/80cfa39c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/80cfa39c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/80cfa39c
Branch: refs/heads/master
Commit: 80cfa39c6d784883fd14c87774ade88bbea57ff8
Parents: 10ed89a 21d8c7e
Author: ravipesala <ra...@gmail.com>
Authored: Mon Aug 1 15:34:11 2016 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Mon Aug 1 15:34:11 2016 +0530
----------------------------------------------------------------------
.../core/carbon/ColumnIdentifier.java | 4 +
.../carbon/datastore/SegmentTaskIndexStore.java | 2 +-
.../metadata/schema/table/CarbonTable.java | 48 ++--
.../schema/table/column/CarbonDimension.java | 4 +
.../core/carbon/path/CarbonStorePath.java | 2 +-
.../core/carbon/path/CarbonTablePath.java | 18 +-
.../carbon/querystatistics/QueryStatistic.java | 12 +
.../core/constants/CarbonCommonConstants.java | 29 ++
.../org/carbondata/core/load/BlockDetails.java | 8 +-
.../core/load/LoadMetadataDetails.java | 20 ++
.../core/util/CarbonLoadStatisticsDummy.java | 12 +-
.../core/util/CarbonLoadStatisticsImpl.java | 65 ++---
.../org/carbondata/core/util/DataTypeUtil.java | 97 +++++--
.../carbondata/core/util/LoadStatistics.java | 6 +-
.../scan/executor/util/QueryUtil.java | 55 ++--
.../scan/filter/FilterExpressionProcessor.java | 20 +-
.../org/carbondata/scan/filter/FilterUtil.java | 32 +++
.../filter/resolver/AndFilterResolverImpl.java | 5 +-
.../resolver/LogicalFilterResolverImpl.java | 11 +-
.../visitor/CustomTypeDictionaryVisitor.java | 8 +
.../visitor/DictionaryColumnVisitor.java | 4 +-
.../examples/ComplexTypeExample.scala | 6 +-
.../hadoop/test/util/StoreCreator.java | 2 +-
.../spark/sql/common/util/CsvCompare.scala | 1 -
.../spark/merger/CompactionCallable.java | 36 +--
.../carbondata/spark/load/CarbonLoaderUtil.java | 22 +-
.../spark/merger/CarbonDataMergerUtil.java | 84 ++++--
.../spark/sql/CarbonDatasourceRelation.scala | 24 +-
.../spark/sql/CarbonDictionaryDecoder.scala | 6 +-
.../org/apache/spark/sql/CarbonSqlParser.scala | 216 +++++++++------
.../spark/sql/SparkUnknownExpression.scala | 24 +-
.../execution/command/carbonTableSchema.scala | 34 ++-
.../spark/sql/hive/CarbonMetastoreCatalog.scala | 27 +-
.../scala/org/apache/spark/util/FileUtils.scala | 6 +-
.../org/apache/spark/util/SplitUtils.scala | 6 +-
.../spark/rdd/CarbonDataLoadRDD.scala | 65 +++--
.../spark/rdd/CarbonDataRDDFactory.scala | 268 ++++++++++---------
.../spark/rdd/CarbonGlobalDictionaryRDD.scala | 35 ++-
.../carbondata/spark/rdd/CarbonMergerRDD.scala | 183 +++++++------
.../carbondata/spark/rdd/CarbonScanRDD.scala | 51 +++-
.../org/carbondata/spark/rdd/Compactor.scala | 79 +++---
.../spark/tasks/DictionaryWriterTask.scala | 56 ++--
.../carbondata/spark/util/CarbonScalaUtil.scala | 13 +
.../spark/util/GlobalDictionaryUtil.scala | 16 +-
integration/spark/src/test/resources/array1.csv | 2 +
.../resources/complexTypeDecimalNestedHive.csv | 8 +
.../spark/src/test/resources/datadelimiter.csv | 11 +
.../src/test/resources/datanullmeasurecol.csv | 3 +
.../spark/src/test/resources/datasample.csv | 1 +
.../resources/decimalBoundaryDataCarbon.csv | 12 +
.../test/resources/decimalBoundaryDataHive.csv | 11 +
.../test/resources/emptyDimensionDataHive.csv | 20 ++
.../spark/src/test/resources/struct_all.csv | 4 +
.../src/test/resources/structusingstruct.csv | 2 +
.../spark/src/test/resources/timestampdata.csv | 2 +
.../apache/spark/sql/TestCarbonSqlParser.scala | 72 ++---
...plexPrimitiveTimestampDirectDictionary.scala | 12 +
.../complexType/TestComplexTypeQuery.scala | 52 +++-
.../dataload/TestLoadDataWithJunkChars.scala | 43 +++
.../dataload/TestLoadDataWithNullMeasures.scala | 1 +
.../testsuite/bigdecimal/TestBigDecimal.scala | 52 +++-
.../createtable/TestCreateTableSyntax.scala | 29 +-
.../DataCompactionCardinalityBoundryTest.scala | 6 +-
.../datacompaction/DataCompactionTest.scala | 6 +-
.../MajorCompactionIgnoreInMinorTest.scala | 130 +++++++++
.../MajorCompactionStopsAfterCompaction.scala | 125 +++++++++
.../TestDataWithDicExcludeAndInclude.scala | 22 +-
.../dataload/TestLoadDataWithHiveSyntax.scala | 59 +++-
.../dataload/TestLoadDataWithNoMeasure.scala | 2 +-
.../TestLoadDataWithNotProperInputFile.scala | 6 +-
.../NoDictionaryColumnTestCase.scala | 6 +-
...estampDataTypeDirectDictionaryTestCase.scala | 61 ++++-
...TypeDirectDictionaryWithNoDictTestCase.scala | 6 +-
.../TimestampDataTypeNullDataTest.scala | 2 +-
.../filterexpr/AllDataTypesTestCaseFilter.scala | 14 +-
.../filterexpr/CountStarTestCase.scala | 72 +++++
.../NullMeasureValueTestCaseFilter.scala | 7 +-
...GlobalDictionaryUtilConcurrentTestCase.scala | 2 +-
.../util/GlobalDictionaryUtilTestCase.scala | 4 +-
.../carbondata/lcm/locks/CarbonLockFactory.java | 27 +-
.../org/carbondata/lcm/locks/HdfsFileLock.java | 25 +-
.../org/carbondata/lcm/locks/LocalFileLock.java | 16 +-
.../carbondata/lcm/locks/ZooKeeperLocking.java | 49 +++-
.../lcm/status/SegmentStatusManager.java | 2 -
.../processing/csvload/GraphExecutionUtil.java | 31 +++
.../csvreaderstep/CustomDataStream.java | 108 ++++++++
.../processing/csvreaderstep/CustomReader.java | 157 -----------
.../csvreaderstep/UnivocityCsvParser.java | 13 +-
.../processing/datatypes/PrimitiveDataType.java | 28 +-
.../processing/mdkeygen/MDKeyGenStep.java | 2 +-
.../processing/mdkeygen/MDKeyGenStepMeta.java | 3 +-
.../sortandgroupby/sortdata/SortDataRows.java | 2 +-
.../CarbonCSVBasedDimSurrogateKeyGen.java | 21 ++
.../csvbased/CarbonCSVBasedSeqGenMeta.java | 3 +-
.../csvbased/CarbonCSVBasedSeqGenStep.java | 72 ++++-
.../FileStoreSurrogateKeyGenForCSV.java | 3 +-
.../util/CarbonDataProcessorUtil.java | 7 +-
.../processing/util/CarbonSchemaParser.java | 1 +
98 files changed, 2222 insertions(+), 937 deletions(-)
----------------------------------------------------------------------