You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by gv...@apache.org on 2017/03/16 09:28:57 UTC

[14/14] incubator-carbondata git commit: [CARBONDATA-777] Alter table support for spark 2.1.This closes #641

[CARBONDATA-777] Alter table support for spark 2.1.This closes #641


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

Branch: refs/heads/master
Commit: 892cf689caffd9071f68a30993e2ef6dfa5c5ee3
Parents: 6e333f0 06efc20
Author: Venkata Ramana G <ra...@huawei.com>
Authored: Thu Mar 16 14:57:07 2017 +0530
Committer: Venkata Ramana G <ra...@huawei.com>
Committed: Thu Mar 16 14:57:07 2017 +0530

----------------------------------------------------------------------
 .../core/cache/dictionary/ManageDictionary.java | 113 ++++++
 .../core/constants/CarbonCommonConstants.java   |   7 +
 .../core/datastore/block/SegmentProperties.java |  60 ++-
 .../core/metadata/blocklet/DataFileFooter.java  |  13 +
 .../ThriftWrapperSchemaConverterImpl.java       |  25 +-
 .../core/metadata/schema/table/CarbonTable.java |  99 ++++-
 .../schema/table/column/CarbonColumn.java       |  14 +-
 .../schema/table/column/CarbonMeasure.java      |  16 +-
 .../scan/collector/ResultCollectorFactory.java  |  77 ++++
 .../impl/AbstractScannedResultCollector.java    | 108 ++----
 .../impl/DictionaryBasedResultCollector.java    | 215 ++++++-----
 .../DictionaryBasedVectorResultCollector.java   |  73 ++--
 .../collector/impl/RawBasedResultCollector.java |  45 ++-
 ...structureBasedDictionaryResultCollector.java |  93 +++++
 .../RestructureBasedRawResultCollector.java     | 253 ++++++++++++
 .../RestructureBasedVectorResultCollector.java  | 214 +++++++++++
 .../executor/impl/AbstractQueryExecutor.java    | 205 +++++-----
 .../executor/impl/QueryExecutorProperties.java  |   7 -
 .../scan/executor/infos/AggregatorInfo.java     | 103 -----
 .../scan/executor/infos/BlockExecutionInfo.java | 109 +++---
 .../core/scan/executor/infos/DimensionInfo.java | 112 ++++++
 .../core/scan/executor/infos/MeasureInfo.java   | 103 +++++
 .../core/scan/executor/util/QueryUtil.java      |  20 +-
 .../scan/executor/util/RestructureUtil.java     | 270 +++++++++++--
 .../carbondata/core/scan/filter/FilterUtil.java | 151 ++++++--
 .../executer/RestructureEvaluatorImpl.java      |  81 ++++
 .../RestructureExcludeFilterExecutorImpl.java   |  63 +++
 .../RestructureIncludeFilterExecutorImpl.java   |  64 ++++
 .../executer/RowLevelFilterExecuterImpl.java    | 181 +++++++--
 .../RowLevelRangeGrtThanFiterExecuterImpl.java  |  84 ++--
 ...elRangeGrtrThanEquaToFilterExecuterImpl.java |  84 ++--
 ...velRangeLessThanEqualFilterExecuterImpl.java |  84 ++--
 .../RowLevelRangeLessThanFiterExecuterImpl.java |  84 ++--
 .../resolver/ConditionalFilterResolverImpl.java |   8 +-
 .../filter/resolver/FilterResolverIntf.java     |   6 +-
 .../resolver/LogicalFilterResolverImpl.java     |   5 +-
 .../resolver/RowLevelFilterResolverImpl.java    |   1 +
 .../RowLevelRangeFilterResolverImpl.java        |  23 +-
 .../DimColumnResolvedFilterInfo.java            |  24 +-
 .../MeasureColumnResolvedFilterInfo.java        |  11 +
 .../visitor/NoDictionaryTypeVisitor.java        |  15 +-
 .../processor/AbstractDataBlockIterator.java    |  19 +-
 .../scan/result/vector/CarbonColumnVector.java  |  14 +
 .../vector/MeasureDataVectorProcessor.java      |   4 +
 .../core/util/CarbonMetadataUtil.java           |   4 +-
 .../apache/carbondata/core/util/CarbonUtil.java |  38 ++
 .../core/util/DataFileFooterConverterV3.java    |   1 +
 .../carbondata/core/util/DataTypeUtil.java      | 125 +++++-
 .../core/writer/CarbonDictionaryWriterImpl.java |   2 +-
 .../core/writer/CarbonIndexFileWriter.java      |   2 +-
 .../carbondata/core/writer/ThriftWriter.java    |  37 +-
 .../DictionaryBasedResultCollectorTest.java     |   4 +-
 .../impl/RawBasedResultCollectorTest.java       |   4 +-
 .../scan/executor/util/RestructureUtilTest.java |  46 ++-
 format/src/main/thrift/carbondata.thrift        |   3 +-
 format/src/main/thrift/schema.thrift            |   1 +
 .../src/test/resources/restructure/data1.csv    |   1 +
 .../src/test/resources/restructure/data2.csv    |   1 +
 .../src/test/resources/restructure/data3.csv    |   1 +
 .../src/test/resources/restructure/data4.csv    |   1 +
 .../src/test/resources/restructure/data5.csv    |   1 +
 .../spark/merger/CarbonCompactionExecutor.java  |  29 +-
 .../spark/merger/CarbonCompactionUtil.java      |  84 ++++
 .../spark/merger/RowResultMerger.java           |   8 +-
 .../spark/rdd/CarbonGlobalDictionaryRDD.scala   |  14 +-
 .../carbondata/spark/rdd/CarbonMergerRDD.scala  |  44 +--
 .../spark/rdd/DataManagementFunc.scala          |   2 +-
 .../spark/tasks/DictionaryWriterTask.scala      |  30 +-
 .../spark/tasks/SortIndexWriterTask.scala       |  22 +-
 .../carbondata/spark/util/CarbonScalaUtil.scala |  73 ++++
 .../spark/util/DataTypeConverterUtil.scala      |  26 ++
 .../spark/util/GlobalDictionaryUtil.scala       | 118 +++++-
 .../spark/sql/catalyst/CarbonDDLSqlParser.scala |  55 ++-
 .../execution/command/carbonTableSchema.scala   | 174 ++++++++-
 .../readsupport/SparkRowReadSupportImpl.java    |   3 +-
 .../spark/sql/CarbonDictionaryDecoder.scala     |  42 +-
 .../vectorreader/ColumnarVectorWrapper.java     |  34 ++
 .../spark/sql/CarbonDictionaryDecoder.scala     |  12 +-
 .../org/apache/spark/sql/CarbonSource.scala     |  34 +-
 .../execution/command/AlterTableCommands.scala  | 383 +++++++++++++++++++
 .../sql/execution/command/DDLStrategy.scala     |  37 ++
 .../execution/command/carbonTableSchema.scala   |  41 +-
 .../apache/spark/sql/hive/CarbonMetastore.scala | 128 +++++--
 .../sql/parser/CarbonSpark2SqlParser.scala      |  93 ++++-
 .../spark/sql/parser/CarbonSparkSqlParser.scala |   7 +-
 .../org/apache/spark/util/AlterTableUtil.scala  |  99 +++++
 .../AlterTableValidationTestCase.scala          | 295 ++++++++++++++
 .../rowreader/AddColumnTestCases.scala          | 121 ++++++
 .../rowreader/ChangeDataTypeTestCases.scala     |  95 +++++
 .../rowreader/DropColumnTestCases.scala         |  70 ++++
 .../vectorreader/AddColumnTestCases.scala       | 114 ++++++
 .../vectorreader/ChangeDataTypeTestCases.scala  |  96 +++++
 .../vectorreader/DropColumnTestCases.scala      |  71 ++++
 .../newflow/CarbonDataLoadConfiguration.java    |  71 +++-
 .../newflow/DataLoadProcessBuilder.java         |   1 +
 .../sortandgroupby/sortdata/SortParameters.java |   3 +-
 .../store/CarbonFactDataHandlerColumnar.java    |   4 +
 .../store/CarbonFactDataHandlerModel.java       |  16 +-
 .../store/writer/CarbonDataWriterVo.java        |  16 +
 .../writer/v3/CarbonFactDataWriterImplV3.java   |   4 +-
 .../csvbased/CarbonCSVBasedSeqGenMeta.java      |  14 +-
 .../util/CarbonDataProcessorUtil.java           |  42 +-
 102 files changed, 5275 insertions(+), 982 deletions(-)
----------------------------------------------------------------------