You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ch...@apache.org on 2016/07/20 10:14:18 UTC
[50/50] [abbrv] incubator-carbondata git commit: merge PRs from old
github This closes #45
merge PRs from old github This closes #45
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/1730082f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/1730082f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/1730082f
Branch: refs/heads/master
Commit: 1730082ff646959209f5085e9b334464c90e4b6e
Parents: 383b7db 54fb3d2
Author: chenliang613 <ch...@apache.org>
Authored: Wed Jul 20 18:11:09 2016 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Wed Jul 20 18:11:09 2016 +0800
----------------------------------------------------------------------
.../carbondata/common/logging/LogService.java | 7 +
.../common/logging/impl/StandardLogService.java | 18 +-
.../common/logging/impl/StatisticLevel.java | 64 ++
.../cache/dictionary/ColumnDictionaryInfo.java | 9 +-
.../carbon/datastore/block/Distributable.java | 25 +
.../datastore/block/SegmentProperties.java | 110 ++-
.../carbon/datastore/block/TableBlockInfo.java | 35 +-
.../carbon/datastore/block/TableTaskInfo.java | 114 +++
.../core/carbon/metadata/CarbonMetadata.java | 31 +
.../core/carbon/metadata/datatype/DataType.java | 3 +-
.../metadata/schema/table/CarbonTable.java | 29 +-
.../schema/table/column/CarbonDimension.java | 19 +-
.../core/carbon/path/CarbonTablePath.java | 26 +
.../carbon/querystatistics/QueryStatistic.java | 73 ++
.../QueryStatisticsRecorder.java | 74 ++
.../core/constants/CarbonCommonConstants.java | 18 +
.../BlockIndexerStorageForNoInvertedIndex.java | 2 +-
.../TimeStampDirectDictionaryGenerator.java | 58 +-
.../CarbonDictionaryMetadataReaderImpl.java | 28 +-
.../core/reader/CarbonDictionaryReaderImpl.java | 32 +-
.../CarbonDictionarySortIndexReaderImpl.java | 25 +-
.../core/util/CarbonLoadStatisticsDummy.java | 114 +++
.../core/util/CarbonLoadStatisticsImpl.java | 426 +++++++++++
.../core/util/CarbonTimeStatisticsFactory.java | 52 ++
.../org/carbondata/core/util/CarbonUtil.java | 17 +
.../core/util/DataFileFooterConverter.java | 54 +-
.../org/carbondata/core/util/DataTypeUtil.java | 108 ++-
.../carbondata/core/util/LoadStatistics.java | 67 ++
.../core/writer/CarbonDictionaryWriter.java | 3 +
.../core/writer/CarbonDictionaryWriterImpl.java | 15 +-
.../core/writer/CarbonFooterWriter.java | 11 +-
.../CarbonDictionarySortIndexWriterImpl.java | 58 +-
.../CarbonDictionarySortInfoPreparator.java | 55 +-
.../impl/ListBasedResultCollector.java | 12 +-
.../scan/complextypes/ArrayQueryType.java | 158 ++++
.../scan/complextypes/ComplexQueryType.java | 80 +++
.../scan/complextypes/PrimitiveQueryType.java | 180 +++++
.../scan/complextypes/StructQueryType.java | 184 +++++
.../executor/impl/AbstractQueryExecutor.java | 58 +-
.../executor/impl/QueryExecutorProperties.java | 30 +-
.../scan/executor/infos/BlockExecutionInfo.java | 53 ++
.../scan/executor/util/QueryUtil.java | 198 ++++-
.../scan/executor/util/RestructureUtil.java | 11 +-
.../scan/expression/ExpressionResult.java | 10 +-
.../conditional/EqualToExpression.java | 15 +-
.../expression/conditional/InExpression.java | 66 +-
.../conditional/NotEqualsExpression.java | 16 +-
.../expression/conditional/NotInExpression.java | 68 +-
.../scan/filter/FilterExpressionProcessor.java | 12 +-
.../org/carbondata/scan/filter/FilterUtil.java | 112 +--
.../scan/filter/GenericQueryType.java | 8 +-
.../executer/RowLevelFilterExecuterImpl.java | 35 +-
.../RowLevelRangeGrtThanFiterExecuterImpl.java | 3 +-
...elRangeGrtrThanEquaToFilterExecuterImpl.java | 3 +-
...velRangeLessThanEqualFilterExecuterImpl.java | 3 +-
.../RowLevelRangeLessThanFiterExecuterImpl.java | 3 +-
.../DimColumnResolvedFilterInfo.java | 12 -
.../visitor/CustomTypeDictionaryVisitor.java | 26 +-
.../visitor/DictionaryColumnVisitor.java | 7 +
.../visitor/NoDictionaryTypeVisitor.java | 7 +
.../org/carbondata/scan/model/QueryModel.java | 55 +-
.../scan/result/AbstractScannedResult.java | 39 +-
.../iterator/DetailQueryResultIterator.java | 2 +-
.../impl/DetailQueryResultPreparatorImpl.java | 9 +
.../impl/RawQueryResultPreparatorImpl.java | 9 +
.../dictionary/AbstractDictionaryCacheTest.java | 1 +
.../datastore/block/SegmentPropertiesTest.java | 4 +-
.../metadata/schema/table/CarbonTableTest.java | 2 +-
.../CarbonFormatDirectoryStructureTest.java | 4 +
.../writer/CarbonDictionaryWriterImplTest.java | 15 +-
.../src/main/resources/datawithoutheader.csv | 10 +
.../examples/AllDictionaryExample.scala | 62 ++
.../examples/util/AllDictionaryUtil.scala | 108 +++
.../carbondata/hadoop/CarbonInputFormat.java | 10 +-
.../hadoop/test/util/StoreCreator.java | 5 +-
.../spark/merger/CarbonCompactionExecutor.java | 2 +
.../carbondata/spark/load/CarbonLoadModel.java | 70 ++
.../carbondata/spark/load/CarbonLoaderUtil.java | 243 ++++---
.../spark/load/DeleteLoadFolders.java | 9 +
.../spark/merger/NodeBlockRelation.java | 8 +-
.../spark/merger/NodeMultiBlockRelation.java | 8 +-
.../org/apache/spark/sql/CarbonContext.scala | 27 +
.../sql/CarbonDatasourceHadoopRelation.scala | 4 +-
.../spark/sql/CarbonDatasourceRelation.scala | 42 +-
.../spark/sql/CarbonDictionaryDecoder.scala | 6 +-
.../org/apache/spark/sql/CarbonSqlParser.scala | 241 +++++--
.../execution/command/carbonTableSchema.scala | 54 +-
.../spark/sql/hive/CarbonMetastoreCatalog.scala | 73 +-
.../spark/sql/hive/CarbonStrategies.scala | 13 +-
.../spark/sql/hive/DistributionUtil.scala | 147 ++++
.../org/carbondata/spark/CarbonFilters.scala | 1 +
.../spark/rdd/CarbonDataLoadRDD.scala | 15 +-
.../spark/rdd/CarbonDataRDDFactory.scala | 35 +-
.../spark/rdd/CarbonGlobalDictionaryRDD.scala | 308 ++++++--
.../carbondata/spark/rdd/CarbonMergerRDD.scala | 132 +++-
.../carbondata/spark/rdd/CarbonScanRDD.scala | 64 +-
.../org/carbondata/spark/rdd/Compactor.scala | 16 +-
.../spark/tasks/DictionaryWriterTask.scala | 134 ++++
.../spark/tasks/SortIndexWriterTask.scala | 62 ++
.../carbondata/spark/util/CarbonScalaUtil.scala | 4 +-
.../org/carbondata/spark/util/CommonUtil.scala | 38 +
.../spark/util/GlobalDictionaryUtil.scala | 521 ++++++++++----
.../20160423/1400_1405/complex.dictionary | 20 +
.../sample/20160423/1400_1405/sample.dictionary | 9 +
.../spark/src/test/resources/bigIntData.csv | 14 +
.../src/test/resources/big_int_Decimal.csv | 3 +
.../spark/src/test/resources/channelsId.csv | 10 +
.../src/test/resources/complexTypeDecimal.csv | 9 +
.../test/resources/complexTypeDecimalNested.csv | 9 +
.../src/test/resources/complexdatareordered.csv | 10 +
.../src/test/resources/complextypesample.csv | 50 ++
.../src/test/resources/datasamplecomplex.csv | 2 +
.../datawithNegeativewithoutHeader.csv | 4 +
.../test/resources/datawithNegtiveNumber.csv | 5 +
.../test/resources/decimalDataWithHeader.csv | 18 +-
.../test/resources/decimalDataWithoutHeader.csv | 18 +-
.../src/test/resources/deviceInformationId.csv | 48 ++
.../src/test/resources/deviceInformationId2.csv | 6 +
.../src/test/resources/emptyrow/emptyRows.csv | 7 +
.../resources/locationInfoActiveCountry.csv | 9 +
integration/spark/src/test/resources/mac.csv | 39 +
.../spark/src/test/resources/mobileimei.csv | 24 +
.../test/resources/nullvalueserialization.csv | 2 +
.../test/resources/verticalDelimitedData.csv | 12 +
.../apache/spark/sql/TestCarbonSqlParser.scala | 11 +
...plexPrimitiveTimestampDirectDictionary.scala | 60 ++
.../complexType/TestComplexTypeQuery.scala | 119 +++
.../dataload/TestLoadDataWithBlankLine.scala | 2 +-
.../TestLoadDataWithMaxMinInteger.scala | 18 +-
.../AllDataTypesTestCaseAggregate.scala | 23 +-
.../AllDataTypesTestCaseAggregate.scala | 44 +-
.../allqueries/TestQueryWithoutDataLoad.scala | 63 ++
.../testsuite/bigdecimal/TestAvgForBigInt.scala | 59 ++
.../testsuite/bigdecimal/TestBigDecimal.scala | 18 +
.../TestDimensionWithDecimalDataType.scala | 61 ++
.../createtable/TestCreateTableSyntax.scala | 12 +
.../datacompaction/DataCompactionLockTest.scala | 2 +-
.../dataload/TestLoadDataWithHiveSyntax.scala | 473 ++++++++----
.../TestNoInvertedIndexLoadAndQuery.scala | 8 +-
.../deleteTable/TestDeleteTableNewDDL.scala | 23 +-
.../detailquery/AllDataTypesTestCase.scala | 7 +-
.../ColumnGroupDataTypesTestCase.scala | 18 +
.../HighCardinalityDataTypesTestCase.scala | 82 ++-
.../NoDictionaryColumnTestCase.scala | 58 ++
.../testsuite/emptyrow/TestEmptyRows.scala | 82 +++
.../filterexpr/AllDataTypesTestCaseFilter.scala | 7 +-
.../filterexpr/FilterProcessorTestCase.scala | 78 ++
.../HadoopFSRelationTestCase.scala | 8 +-
.../joinquery/AllDataTypesTestCaseJoin.scala | 7 +-
.../TestNullValueSerialization.scala | 112 +++
.../sortexpr/AllDataTypesTestCaseSort.scala | 7 +-
.../spark/util/AllDictionaryTestCase.scala | 140 ++++
.../AutoHighCardinalityIdentifyTestCase.scala | 44 +-
.../spark/util/DictionaryTestCaseUtil.scala | 52 ++
.../util/ExternalColumnDictionaryTestCase.scala | 213 ++++++
...GlobalDictionaryUtilConcurrentTestCase.scala | 177 +++++
.../util/GlobalDictionaryUtilTestCase.scala | 26 +-
processing/pom.xml | 7 +-
.../carbondata/lcm/locks/CarbonLockFactory.java | 15 +-
.../org/carbondata/lcm/locks/HdfsFileLock.java | 28 +-
.../org/carbondata/lcm/locks/LocalFileLock.java | 51 +-
.../org/carbondata/lcm/locks/LockUsage.java | 9 +-
.../carbondata/lcm/locks/ZooKeeperLocking.java | 27 +-
.../lcm/status/SegmentStatusManager.java | 32 +-
.../processing/api/dataloader/SchemaInfo.java | 20 +
.../processing/csvload/DataGraphExecuter.java | 35 -
.../processing/csvload/GraphExecutionUtil.java | 28 -
.../csvreaderstep/BlockDataHandler.java | 718 -------------------
.../csvreaderstep/CrLfMatcherInterface.java | 26 -
.../processing/csvreaderstep/CsvInput.java | 165 ++---
.../processing/csvreaderstep/CsvInputData.java | 5 -
.../processing/csvreaderstep/CsvInputMeta.java | 18 +-
.../processing/csvreaderstep/CustomReader.java | 157 ++++
.../csvreaderstep/EmptyPatternMatcher.java | 28 -
.../csvreaderstep/MultiByteBigCrLfMatcher.java | 40 --
.../MultiByteLittleCrLfMatcher.java | 40 --
.../csvreaderstep/MultiBytePatternMatcher.java | 38 -
.../csvreaderstep/PatternMatcherInterface.java | 24 -
.../csvreaderstep/SingleByteCrLfMatcher.java | 32 -
.../csvreaderstep/SingleBytePatternMatcher.java | 28 -
.../csvreaderstep/UnivocityCsvParser.java | 182 +++++
.../csvreaderstep/UnivocityCsvParserVo.java | 184 +++++
.../processing/datatypes/PrimitiveDataType.java | 9 +-
.../graphgenerator/GraphGenerator.java | 15 +
.../configuration/GraphConfigurationInfo.java | 23 +
.../processing/mdkeygen/MDKeyGenStep.java | 14 +-
.../processing/schema/metadata/TableOption.java | 82 +++
.../schema/metadata/TableOptionWrapper.java | 106 +++
.../sortdata/IntermediateFileMerger.java | 6 +
.../sortandgroupby/sortdata/SortDataRows.java | 1 -
.../sortdatastep/SortKeyStep.java | 7 +
.../store/CarbonFactDataHandlerColumnar.java | 2 +-
.../CarbonCSVBasedDimSurrogateKeyGen.java | 39 +
.../csvbased/CarbonCSVBasedSeqGenMeta.java | 39 +-
.../csvbased/CarbonCSVBasedSeqGenStep.java | 32 +-
.../FileStoreSurrogateKeyGenForCSV.java | 8 +
.../processing/util/CarbonSchemaParser.java | 16 +-
.../carbondata/lcm/locks/LocalFileLockTest.java | 7 +-
.../lcm/locks/ZooKeeperLockingTest.java | 7 +-
199 files changed, 8065 insertions(+), 2489 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/1730082f/integration/spark/src/main/scala/org/apache/spark/sql/CarbonContext.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/1730082f/integration/spark/src/main/scala/org/carbondata/spark/CarbonFilters.scala
----------------------------------------------------------------------