carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [51/56] [abbrv] incubator-carbondata git commit: Merge pull request #707 from ravipesala/merge3
Date Thu, 23 Jun 2016 14:16:39 GMT
Merge pull request #707 from ravipesala/merge3

Merging code from master to spark16 branch

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

Branch: refs/heads/master
Commit: 3c41deb8881831d1633d93e19a0e76de4ba7bcd2
Parents: bf7557d a76ca0f
Author: Liang Chen <chenliang613@huawei.com>
Authored: Tue Jun 21 14:01:10 2016 +0800
Committer: GitHub <noreply@github.com>
Committed: Tue Jun 21 14:01:10 2016 +0800

----------------------------------------------------------------------
 .../core/carbon/path/CarbonTablePath.java       |  20 +-
 .../core/constants/CarbonCommonConstants.java   |  27 +
 .../fileperations/AtomicFileOperationsImpl.java |   3 +-
 .../store/filesystem/AbstractDFSCarbonFile.java | 217 +++++++
 .../store/filesystem/HDFSCarbonFile.java        | 249 ++------
 .../store/filesystem/LocalCarbonFile.java       |   1 +
 .../store/filesystem/ViewFSCarbonFile.java      | 126 ++++
 .../store/impl/DFSFileHolderImpl.java           | 183 ++++++
 .../datastorage/store/impl/FileFactory.java     |  36 +-
 .../store/impl/HDFSFileHolderImpl.java          | 186 ------
 .../TimeStampDirectDictionaryGenerator.java     |  17 +-
 .../core/locks/CarbonLockFactory.java           |  10 +-
 .../carbondata/core/locks/ZooKeeperLocking.java |  53 +-
 .../carbondata/core/locks/ZookeeperInit.java    |  64 ++
 .../org/carbondata/core/util/CarbonUtil.java    |  23 +-
 .../resolver/ConditionalFilterResolverImpl.java |   9 +-
 .../core/locks/ZooKeeperLockingTest.java        |   9 +-
 .../org/carbondata/examples/CarbonExample.scala |   8 +-
 .../examples/GenerateDictionaryExample.scala    |   2 +-
 .../AbstractDictionaryDecodedReadSupport.java   |   8 +-
 .../carbondata/hadoop/util/SchemaReader.java    |   3 +-
 .../hadoop/ft/CarbonInputMapperTest.java        |  12 +-
 .../hadoop/test/util/StoreCreator.java          |   4 +-
 integration-testcases/pom.xml                   |   2 +-
 .../sql/common/util/CarbonHiveContext.scala     |   4 +-
 .../allqueries/AllDataTypesTestCase2.scala      |   9 +-
 .../allqueries/AllDataTypesTestCase4.scala      |  72 +--
 .../allqueries/AllDataTypesTestCase5.scala      |   9 +-
 .../allqueries/AllDataTypesTestCase6.scala      |  27 +-
 integration/spark/pom.xml                       |   2 +-
 .../spark/merger/CarbonCompactionExecutor.java  |   1 +
 .../spark/merger/CarbonCompactionUtil.java      |  33 --
 .../spark/merger/CompactionCallable.java        |  68 +++
 .../spark/merger/RowResultMerger.java           |  17 +-
 .../carbondata/spark/load/CarbonLoaderUtil.java |  20 +-
 .../spark/merger/CarbonDataMergerUtil.java      |  28 +-
 .../readsupport/SparkRowReadSupportImpl.java    |   7 +
 .../spark/sql/CarbonCatalystOperators.scala     |   2 +-
 .../org/apache/spark/sql/CarbonSqlParser.scala  |  47 +-
 .../execution/command/carbonTableSchema.scala   |  37 +-
 .../spark/sql/hive/CarbonMetastoreCatalog.scala |  11 +
 .../scala/org/carbondata/spark/KeyVal.scala     |   9 +-
 .../spark/csv/CarbonCsvRelation.scala           | 242 ++++++++
 .../carbondata/spark/csv/DefaultSource.scala    |  94 +--
 .../spark/rdd/CarbonDataLoadRDD.scala           |  20 +-
 .../spark/rdd/CarbonDataRDDFactory.scala        | 245 +++++---
 .../carbondata/spark/rdd/CarbonMergerRDD.scala  |  27 +-
 .../org/carbondata/spark/rdd/Compactor.scala    |  15 +-
 .../spark/util/GlobalDictionaryUtil.scala       |  53 +-
 .../src/test/resources/InvalidCsvFormatdata.csv |   3 -
 .../spark/src/test/resources/avgTest.csv        |  30 +-
 .../test/resources/compaction/compaction1.csv   |  10 +-
 .../test/resources/compaction/compaction2.csv   |  10 +-
 .../test/resources/compaction/compaction3.csv   |  10 +-
 integration/spark/src/test/resources/data2.csv  |   4 +-
 .../spark/src/test/resources/datasamplenull.csv |   3 +
 .../TestLoadDataWithEmptyArrayColumns.scala     |  11 +-
 .../AllDataTypesTestCaseAggregate.scala         |   4 +
 .../aggquery/AverageQueryTestCase.scala         |   7 +-
 .../AllDataTypesTestCaseAggregate.scala         |  10 +-
 .../testsuite/bigdecimal/TestBigDecimal.scala   |   7 +
 .../spark/testsuite/bigdecimal/TestBigInt.scala |   7 +
 .../DataCompactionCardinalityBoundryTest.scala  |  10 +-
 .../DataCompactionNoDictionaryTest.scala        |  29 +-
 .../datacompaction/DataCompactionTest.scala     |  12 +-
 .../dataload/DefaultSourceTestCase.scala        |  25 +-
 .../TestDataWithDicExcludeAndInclude.scala      |   9 +-
 .../dataload/TestLoadDataWithHiveSyntax.scala   |   8 +-
 .../dataload/TestLoadTblNameIsKeyword.scala     |  96 +++
 .../dataretention/DataRetentionTestCase.scala   |  11 +-
 .../TimestampDataTypeNullDataTest.scala         |  92 +++
 .../filterexpr/FilterProcessorTestCase.scala    |   9 +
 .../NullMeasureValueTestCaseAggregate.scala     |  14 +-
 .../csvreaderstep/BlockDataHandler.java         | 579 +++++++++----------
 .../processing/csvreaderstep/CsvInput.java      |  10 +-
 .../processing/csvreaderstep/CsvInputMeta.java  |  66 +--
 .../graphgenerator/GraphGenerator.java          |  14 +-
 .../processing/mdkeygen/MDKeyGenStep.java       |   2 +-
 .../sortandgroupby/sortdata/SortDataRows.java   |   2 +-
 .../store/CarbonFactDataHandlerColumnar.java    |  30 +-
 .../store/CarbonFactDataHandlerModel.java       |  22 +
 .../csvbased/CarbonCSVBasedSeqGenStep.java      |  29 +-
 .../FileStoreSurrogateKeyGenForCSV.java         |   2 +-
 .../util/CarbonDataProcessorUtil.java           |  48 +-
 84 files changed, 2302 insertions(+), 1304 deletions(-)
----------------------------------------------------------------------



Mime
View raw message