carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chenliang...@apache.org
Subject [50/50] [abbrv] incubator-carbondata git commit: Code merge from HuaweiBigData/master to apache/master This closes #6
Date Thu, 30 Jun 2016 17:42:37 GMT
Code merge from HuaweiBigData/master to apache/master This closes #6


Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/6e943ff7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/6e943ff7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/6e943ff7

Branch: refs/heads/master
Commit: 6e943ff73a293a84aeea8fc69802703499d81800
Parents: e9bbf75 4444c32
Author: chenliang613 <chenliang613@apache.org>
Authored: Thu Jun 30 23:11:12 2016 +0530
Committer: chenliang613 <chenliang613@apache.org>
Committed: Thu Jun 30 23:11:12 2016 +0530

----------------------------------------------------------------------
 common/pom.xml                                  |    8 +-
 .../common/logging/impl/StandardLogService.java |   15 +-
 conf/carbon.properties.template                 |   98 +
 .../common/ext/ColumnUniqueIdGenerator.java     |   41 +
 .../common/ext/DictionaryFactory.java           |  119 +
 .../org/carbondata/common/ext/PathFactory.java  |   48 +
 .../common/factory/CarbonCommonFactory.java     |   54 +
 .../dictionary/AbstractDictionaryCache.java     |   43 +-
 .../cache/dictionary/ColumnDictionaryInfo.java  |    5 +-
 .../cache/dictionary/DictionaryCacheLoader.java |    7 +-
 .../dictionary/DictionaryCacheLoaderImpl.java   |   28 +-
 .../DictionaryColumnUniqueIdentifier.java       |    9 +-
 .../dictionary/ForwardDictionaryCache.java      |   11 +-
 .../dictionary/ReverseDictionaryCache.java      |   11 +-
 .../core/carbon/ColumnIdentifier.java           |  109 +
 .../core/carbon/datastore/BlockIndexStore.java  |  184 +-
 .../carbon/datastore/SegmentTaskIndexStore.java |   21 +-
 .../datastore/block/SegmentProperties.java      |   94 +-
 .../carbon/datastore/block/TableBlockInfo.java  |   18 +-
 .../impl/ColumnGroupDimensionDataChunk.java     |    7 +-
 .../ThriftWrapperSchemaConverterImpl.java       |    4 +
 .../carbon/metadata/index/BlockIndexInfo.java   |   92 +
 .../metadata/schema/table/CarbonTable.java      |    2 +-
 .../schema/table/column/CarbonColumn.java       |   23 +
 .../schema/table/column/ColumnSchema.java       |   49 +
 .../core/carbon/path/CarbonTablePath.java       |  120 +-
 .../core/constants/CarbonCommonConstants.java   |  285 +-
 .../store/columnar/ColumnGroupModel.java        |   21 -
 .../store/filesystem/HDFSCarbonFile.java        |    3 +-
 .../store/filesystem/ViewFSCarbonFile.java      |    6 +-
 .../core/datastorage/util/StoreFactory.java     |   18 +-
 .../DirectDictionaryGenerator.java              |   13 +
 .../TimeStampDirectDictionaryGenerator.java     |   46 +-
 .../core/load/LoadMetadataDetails.java          |   43 +
 .../CarbonDictionaryMetadataReaderImpl.java     |   17 +-
 .../core/reader/CarbonDictionaryReaderImpl.java |   28 +-
 .../core/reader/CarbonIndexFileReader.java      |   95 +
 .../carbondata/core/reader/ThriftReader.java    |   47 +-
 .../CarbonDictionarySortIndexReaderImpl.java    |   21 +-
 .../core/service/ColumnUniqueIdService.java     |   34 +
 .../core/service/DictionaryService.java         |   92 +
 .../carbondata/core/service/PathService.java    |   38 +
 .../core/util/CarbonMetadataUtil.java           |  114 +-
 .../carbondata/core/util/CarbonProperties.java  |  401 +--
 .../org/carbondata/core/util/CarbonUtil.java    |  245 +-
 .../core/util/DataFileFooterConverter.java      |   65 +-
 .../core/writer/CarbonDictionaryWriterImpl.java |   45 +-
 .../core/writer/CarbonIndexFileWriter.java      |   64 +
 .../core/writer/HierarchyValueWriterForCSV.java |    2 +-
 .../CarbonDictionarySortIndexWriterImpl.java    |   21 +-
 .../scan/executor/infos/KeyStructureInfo.java   |   18 -
 .../scan/executor/util/QueryUtil.java           |  105 +-
 .../scan/expression/ColumnExpression.java       |    3 +-
 .../carbondata/scan/expression/Expression.java  |    4 +-
 .../scan/expression/ExpressionResult.java       |  104 +-
 .../expression/arithmetic/AddExpression.java    |    4 +-
 .../expression/arithmetic/DivideExpression.java |    4 +-
 .../arithmetic/MultiplyExpression.java          |    4 +-
 .../arithmetic/SubstractExpression.java         |    4 +-
 .../conditional/EqualToExpression.java          |    5 +-
 .../GreaterThanEqualToExpression.java           |    4 +-
 .../conditional/GreaterThanExpression.java      |    5 +-
 .../expression/conditional/InExpression.java    |    6 +-
 .../conditional/LessThanEqualToExpression.java  |    5 +-
 .../conditional/LessThanExpression.java         |    4 +-
 .../expression/conditional/ListExpression.java  |    7 +-
 .../conditional/NotEqualsExpression.java        |    4 +-
 .../expression/conditional/NotInExpression.java |    6 +-
 .../exception/FilterIllegalMemberException.java |   98 +
 .../exception/FilterUnsupportedException.java   |    1 -
 .../scan/expression/logical/AndExpression.java  |    6 +-
 .../scan/expression/logical/NotExpression.java  |    4 +-
 .../scan/expression/logical/OrExpression.java   |    4 +-
 .../scan/filter/FilterExpressionProcessor.java  |   36 +-
 .../org/carbondata/scan/filter/FilterUtil.java  |  163 +-
 .../executer/ColGroupFilterExecuterImpl.java    |  190 --
 .../ExcludeColGroupFilterExecuterImpl.java      |  137 +
 .../executer/ExcludeFilterExecuterImpl.java     |   49 +-
 .../IncludeColGroupFilterExecuterImpl.java      |  209 ++
 .../executer/IncludeFilterExecuterImpl.java     |    8 +-
 .../executer/RowLevelFilterExecuterImpl.java    |  116 +-
 .../RowLevelRangeGrtThanFiterExecuterImpl.java  |  148 +-
 ...elRangeGrtrThanEquaToFilterExecuterImpl.java |  139 +-
 ...velRangeLessThanEqualFilterExecuterImpl.java |  187 +-
 .../RowLevelRangeLessThanFiterExecuterImpl.java |  190 +-
 .../RowLevelRangeTypeExecuterFacory.java        |   13 +-
 .../filter/resolver/AndFilterResolverImpl.java  |    5 +-
 .../resolver/ConditionalFilterResolverImpl.java |   19 +-
 .../filter/resolver/FilterResolverIntf.java     |    5 +-
 .../resolver/LogicalFilterResolverImpl.java     |    3 +-
 .../resolver/RestructureFilterResolverImpl.java |    5 +-
 .../RowLevelRangeFilterResolverImpl.java        |   77 +-
 .../visitor/CustomTypeDictionaryVisitor.java    |   16 +-
 .../visitor/DictionaryColumnVisitor.java        |   11 +-
 .../visitor/NoDictionaryTypeVisitor.java        |   12 +-
 .../scan/result/iterator/RawResultIterator.java |    2 +
 .../org/carbondata/scan/util/DataTypeUtil.java  |    2 +-
 .../dictionary/AbstractDictionaryCacheTest.java |    7 +-
 .../dictionary/ForwardDictionaryCacheTest.java  |    4 +-
 .../dictionary/ReverseDictionaryCacheTest.java  |    4 +-
 .../datastore/SegmentTaskIndexStoreTest.java    |  143 -
 ...CarbonDictionarySortIndexReaderImplTest.java |    6 +-
 .../writer/CarbonDictionaryWriterImplTest.java  |    9 +-
 .../core/writer/CarbonFooterWriterTest.java     |   58 +-
 ...CarbonDictionarySortIndexWriterImplTest.java |   13 +-
 dev/molap.properties.template                   |   94 -
 dev/molap.properties_spark                      |   90 -
 .../examples/GenerateDictionaryExample.scala    |    4 +-
 format/src/main/thrift/carbondataindex.thrift   |   45 +
 format/src/main/thrift/schema.thrift            |   13 +-
 .../org/carbondata/hadoop/CarbonPathFilter.java |    4 +-
 .../AbstractDictionaryDecodedReadSupport.java   |    4 +-
 .../hadoop/test/util/StoreCreator.java          |   11 +-
 .../FACT_UNITED_DATA_INFO_sample_cube.csv       |   20 -
 .../FACT_UNITED_DATA_INFO_sample_table.csv      |   20 +
 .../src/test/resources/restructure_cube.csv     |  101 -
 .../src/test/resources/restructure_table.csv    |  101 +
 .../allqueries/AllDataTypesTestCase1.scala      |   82 +-
 .../allqueries/AllDataTypesTestCase2.scala      |  116 +-
 .../allqueries/AllDataTypesTestCase3.scala      |  211 +-
 .../allqueries/AllDataTypesTestCase4.scala      | 2576 +++++-------------
 .../allqueries/AllDataTypesTestCase5.scala      |  165 +-
 .../allqueries/AllDataTypesTestCase6.scala      | 2377 ++++------------
 .../spark/merger/RowResultMerger.java           |   20 +-
 .../carbondata/spark/load/CarbonLoadModel.java  |    2 +
 .../carbondata/spark/load/CarbonLoaderUtil.java |  202 +-
 .../spark/load/DeleteLoadFolders.java           |    5 +-
 .../spark/merger/CarbonDataMergerUtil.java      |  401 +--
 .../spark/sql/CarbonDatasourceRelation.scala    |   22 +-
 .../spark/sql/CarbonDictionaryDecoder.scala     |   17 +-
 .../org/apache/spark/sql/CarbonSqlParser.scala  |  376 +--
 .../execution/command/carbonTableSchema.scala   |  179 +-
 .../spark/sql/hive/CarbonMetastoreCatalog.scala |   85 +-
 .../spark/sql/hive/CarbonStrategies.scala       |   45 +-
 .../spark/CarbonColumnValidator.scala           |   36 +
 .../carbondata/spark/CarbonSparkFactory.scala   |   63 +
 .../spark/DictionaryDetailHelper.scala          |   66 +
 .../spark/rdd/CarbonDataLoadRDD.scala           |    4 +
 .../spark/rdd/CarbonDataRDDFactory.scala        |  240 +-
 .../spark/rdd/CarbonGlobalDictionaryRDD.scala   |    7 +-
 .../carbondata/spark/rdd/CarbonScanRDD.scala    |   13 +-
 .../org/carbondata/spark/rdd/Compactor.scala    |   19 +-
 .../org/carbondata/spark/util/CommonUtil.scala  |   79 +-
 .../spark/util/GlobalDictionaryUtil.scala       |   85 +-
 .../spark/load/CarbonLoaderUtilTest.java        |    4 +-
 .../validation/FileFooterValidator.java         |    6 +-
 integration/spark/src/test/resources/data2.csv  |    6 +-
 .../src/test/resources/data2_DiffTimeFormat.csv |    4 +
 .../resources/datawithcomplexspecialchar.csv    |  151 +
 .../test/resources/datawithescapecharacter.csv  |   22 +
 .../src/test/resources/datawithnullmeasure.csv  |    5 +
 .../test/resources/datawithspecialcharacter.csv |   38 +
 .../spark/src/test/resources/filter/emp2.csv    |    9 +
 .../src/test/resources/filter/emp2allnull.csv   |    9 +
 .../src/test/resources/filter/emp2nonull.csv    |    8 +
 .../test/resources/nullandnonparsableValue.csv  |    3 +
 .../apache/spark/sql/TestCarbonSqlParser.scala  |   37 +-
 .../dataload/TestLoadDataWithBlankLine.scala    |   18 +-
 .../TestLoadDataWithEmptyArrayColumns.scala     |   12 +-
 .../TestLoadDataWithMaxMinInteger.scala         |    6 +-
 .../dataload/TestLoadDataWithNullMeasures.scala |   15 +-
 .../AllDataTypesTestCaseAggregate.scala         |   44 +-
 .../aggquery/IntegerDataTypeTestCase.scala      |    7 +-
 .../AllDataTypesTestCaseAggregate.scala         |    8 +-
 .../testsuite/bigdecimal/TestBigDecimal.scala   |   10 +
 .../bigdecimal/TestNullAndEmptyFields.scala     |  110 +
 .../createtable/TestCreateTableSyntax.scala     |   32 +-
 .../DataCompactionCardinalityBoundryTest.scala  |   12 +-
 .../datacompaction/DataCompactionLockTest.scala |  111 +
 .../datacompaction/DataCompactionTest.scala     |   12 +-
 .../dataload/TestLoadDataWithHiveSyntax.scala   |  108 +-
 ...ataWithMalformedCarbonCommandException.scala |    4 +-
 .../dataretention/DataRetentionTestCase.scala   |   37 +
 .../detailquery/AllDataTypesTestCase.scala      |    6 +-
 .../ColumnGroupDataTypesTestCase.scala          |   63 +-
 .../ColumnPropertyValidationTestCase.scala      |   28 +
 .../HighCardinalityDataTypesTestCase.scala      |   66 +-
 .../detailquery/IntegerDataTypeTestCase.scala   |    6 +-
 ...estampDataTypeDirectDictionaryTestCase.scala |   12 +-
 ...TypeDirectDictionaryWithNoDictTestCase.scala |    4 +-
 .../filterexpr/AllDataTypesTestCaseFilter.scala |    6 +-
 .../filterexpr/FilterProcessorTestCase.scala    |  131 +-
 .../GrtLtFilterProcessorTestCase.scala          |  176 ++
 .../filterexpr/IntegerDataTypeTestCase.scala    |    6 +-
 .../NullMeasureValueTestCaseFilter.scala        |   39 +
 .../HadoopFSRelationTestCase.scala              |   16 +-
 .../joinquery/AllDataTypesTestCaseJoin.scala    |    6 +-
 .../joinquery/IntegerDataTypeTestCase.scala     |    6 +-
 .../NullMeasureValueTestCaseAggregate.scala     |    2 +-
 .../sortexpr/AllDataTypesTestCaseSort.scala     |    6 +-
 .../sortexpr/IntegerDataTypeTestCase.scala      |   13 +-
 .../util/GlobalDictionaryUtilTestCase.scala     |   51 +-
 .../carbonaggregatesurrogategenerator/icon.png  |  Bin 9058 -> 0 bytes
 .../plugin.xml                                  |    1 -
 .../steps/carbonautoagggraphgenerator/icon.png  |  Bin 9058 -> 0 bytes
 .../carbonautoagggraphgenerator/plugin.xml      |    1 -
 .../steps/carbonautoaggslicemerger/icon.png     |  Bin 9058 -> 0 bytes
 .../steps/carbonautoaggslicemerger/plugin.xml   |    1 -
 .../plugins/steps/carboncsvbasedseqgen/icon.png |  Bin 24093 -> 0 bytes
 .../steps/carboncsvbasedseqgen/plugin.xml       |    1 -
 .../plugins/steps/carboncsvreader/icon.png      |  Bin 24093 -> 0 bytes
 .../plugins/steps/carboncsvreader/plugin.xml    |    1 -
 .../plugins/steps/carboncsvreaderstrep/icon.png |  Bin 9058 -> 0 bytes
 .../steps/carboncsvreaderstrep/plugin.xml       |    1 -
 .../steps/carbondatawriter/Binary-icon.png      |  Bin 14573 -> 0 bytes
 .../plugins/steps/carbondatawriter/plugin.xml   |    1 -
 .../plugins/steps/carbonfactreader/icon.png     |  Bin 9058 -> 0 bytes
 .../plugins/steps/carbonfactreader/plugin.xml   |    1 -
 .../plugins/steps/carbongroupby/icon.png        |  Bin 9058 -> 0 bytes
 .../plugins/steps/carbongroupby/plugin.xml      |    1 -
 .../steps/carboninmemoryfactreader/icon.png     |  Bin 9058 -> 0 bytes
 .../steps/carboninmemoryfactreader/plugin.xml   |    1 -
 .../.kettle/plugins/steps/carbonseqgen/icon.png |  Bin 24093 -> 0 bytes
 .../plugins/steps/carbonseqgen/plugin.xml       |    1 -
 .../plugins/steps/carbonslicemerger/icon.png    |  Bin 9058 -> 0 bytes
 .../plugins/steps/carbonslicemerger/plugin.xml  |    1 -
 .../steps/carbonsortkeyandgroupby/icon.png      |  Bin 9058 -> 0 bytes
 .../steps/carbonsortkeyandgroupby/plugin.xml    |    1 -
 .../.kettle/plugins/steps/mdkeygenstep/icon.png |  Bin 9058 -> 0 bytes
 .../plugins/steps/mdkeygenstep/plugin.xml       |    1 -
 .../.kettle/plugins/steps/sortkeystep/icon.png  |  Bin 9058 -> 0 bytes
 .../plugins/steps/sortkeystep/plugin.xml        |    1 -
 .../org/carbondata/lcm/locks/LocalFileLock.java |    4 +-
 .../org/carbondata/lcm/locks/LockUsage.java     |    3 +-
 .../lcm/status/SegmentStatusManager.java        |  111 +-
 .../api/dataloader/DataLoadModel.java           |    9 +
 .../processing/csvload/DataGraphExecuter.java   |    8 +
 .../csvreaderstep/BlockDataHandler.java         |   83 +-
 .../processing/csvreaderstep/CsvInput.java      |    4 +-
 .../processing/csvreaderstep/CsvInputData.java  |    2 +
 .../processing/csvreaderstep/CsvInputMeta.java  |   21 +-
 .../dataprocessor/DataProcessTaskStatus.java    |   10 +
 .../dataprocessor/IDataProcessStatus.java       |    2 +
 .../graphgenerator/GraphGenerator.java          |    6 +
 .../configuration/GraphConfigurationInfo.java   |   10 +
 .../processing/mdkeygen/MDKeyGenStep.java       |   41 +-
 .../merger/step/CarbonSliceMergerStep.java      |    3 +-
 .../processing/schema/metadata/ColumnsInfo.java |   10 +
 .../store/CarbonFactDataHandlerColumnar.java    |  111 +-
 .../store/CarbonFactDataHandlerModel.java       |   63 +-
 .../store/SingleThreadFinalSortFilesMerger.java |    6 +-
 .../store/colgroup/ColGroupDataHolder.java      |    4 +-
 .../store/colgroup/ColGroupMinMax.java          |   30 +-
 .../store/writer/AbstractFactDataWriter.java    |  143 +-
 ...actDataWriterImplForIntIndexAndAggBlock.java |    6 +-
 .../csvbased/CarbonCSVBasedSeqGenMeta.java      |   36 +
 .../csvbased/CarbonCSVBasedSeqGenStep.java      |   19 +-
 .../FileStoreSurrogateKeyGenForCSV.java         |   12 +-
 .../processing/util/CarbonSchemaParser.java     |   44 +
 .../store/colgroup/ColGroupMinMaxTest.java      |  385 +--
 250 files changed, 8623 insertions(+), 7448 deletions(-)
----------------------------------------------------------------------



Mime
View raw message