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/06 10:00:35 UTC
[18/20] incubator-carbondata git commit: Merge remote-tracking branch
'apache-master/master' into merge7
Merge remote-tracking branch 'apache-master/master' into merge7
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/fd5493b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/fd5493b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/fd5493b9
Branch: refs/heads/master
Commit: fd5493b9dd4ebbba2a7cbec33dd8fc301b1e8316
Parents: d5b62e2 8552a82
Author: ravipesala <ra...@gmail.com>
Authored: Sat Aug 6 14:09:51 2016 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Sat Aug 6 14:09:51 2016 +0530
----------------------------------------------------------------------
DISCLAIMER | 10 +
LICENSE | 2 +-
NOTICE | 8 +
assembly/pom.xml | 70 ++--
common/pom.xml | 52 +--
common/src/test/java/log4j.properties | 17 +
conf/carbon.properties.template | 18 +
core/CARBON_CORELogResource.properties | 17 +
core/pom.xml | 65 +--
.../carbon/datastore/block/AbstractIndex.java | 18 +
.../impl/VariableLengthDimensionDataChunk.java | 18 +
.../compression/type/UnCompressDefaultLong.java | 18 +
.../type/UnCompressMaxMinByteForLong.java | 18 +
.../type/UnCompressMaxMinDefaultLong.java | 18 +
...tiDimKeyVarLengthVariableSplitGenerator.java | 18 +
.../core/util/CarbonMetadataUtil.java | 18 +
.../impl/NonFilterQueryScannedResult.java | 18 +
.../dictionary/AbstractDictionaryCacheTest.java | 18 +
.../carbon/datastore/BlockIndexStoreTest.java | 18 +
.../datastore/block/SegmentPropertiesTest.java | 18 +
.../block/SegmentPropertiesTestUtil.java | 18 +
.../impl/btree/BTreeBlockFinderTest.java | 18 +
.../carbondata/core/util/CarbonUtilTest.java | 18 +
core/src/test/resources/carbonTest.properties | 17 +
dev/java-code-format-template.xml | 18 +
docs/Carbon-Packaging-and-Interfaces.md | 19 +
docs/Carbondata-File-Structure-and-Format.md | 19 +
docs/DDL-Operations-on-Carbon.md | 18 +
docs/DML-Operations-on-Carbon.md | 19 +
docs/Data-Management.md | 18 +
...stalling-CarbonData-And-IDE-Configuartion.md | 19 +
examples/CARBON_EXAMPLESLogResource.properties | 17 +
examples/pom.xml | 69 ++--
format/pom.xml | 57 +--
hadoop/CARBON_HADOOPLogResource.properties | 17 +
hadoop/pom.xml | 69 ++--
.../org/carbondata/hadoop/CarbonProjection.java | 18 +
.../carbondata/hadoop/CarbonRecordReader.java | 18 +
.../hadoop/readsupport/CarbonReadSupport.java | 18 +
.../AbstractDictionaryDecodedReadSupport.java | 18 +
.../impl/ArrayWritableReadSupport.java | 18 +
.../impl/DictionaryDecodedReadSupportImpl.java | 18 +
.../readsupport/impl/RawDataReadSupport.java | 18 +
.../hadoop/util/ObjectSerializationUtil.java | 18 +
.../carbondata/hadoop/util/SchemaReader.java | 18 +
.../hadoop/ft/CarbonInputMapperTest.java | 18 +
integration-testcases/pom.xml | 397 ++++++++++---------
.../spark/sql/common/util/CsvCompare.scala | 18 +
.../spark/sql/common/util/DataFrameUtil.scala | 18 +
...CARBON_SPARK_INTERFACELogResource.properties | 17 +
integration/spark/pom.xml | 70 ++--
.../spark/merger/NodeMultiBlockRelation.java | 18 +
.../readsupport/SparkRowReadSupportImpl.java | 18 +
.../spark/load/CarbonLoaderUtilTest.java | 18 +
.../validation/FileFooterValidator.java | 18 +
.../apache/spark/sql/TestCarbonSqlParser.scala | 18 +
.../TestLoadDataWithEmptyArrayColumns.scala | 18 +
.../dataload/TestLoadDataWithJunkChars.scala | 18 +
.../DataCompactionCardinalityBoundryTest.scala | 18 +
.../datacompaction/DataCompactionLockTest.scala | 18 +
.../DataCompactionNoDictionaryTest.scala | 18 +
.../datacompaction/DataCompactionTest.scala | 18 +
.../MajorCompactionIgnoreInMinorTest.scala | 18 +
.../MajorCompactionStopsAfterCompaction.scala | 18 +
.../deleteTable/TestDeleteTableNewDDL.scala | 18 +
.../ColumnPropertyValidationTestCase.scala | 18 +
.../NullMeasureValueTestCaseFilter.scala | 18 +
.../NullMeasureValueTestCaseAggregate.scala | 18 +
pom.xml | 154 ++++++-
.../CARBON_PROCESSINGLogResource.properties | 17 +
processing/pom.xml | 61 +--
.../org/carbondata/lcm/locks/ZookeeperInit.java | 18 +
.../csvreaderstep/CustomDataStream.java | 18 +
.../mdkeygen/messages/messages_en_US.properties | 17 +
.../store/messages/messages_en_US.properties | 17 +
.../dbbased/messages/messages_en_US.properties | 17 +
.../messages/messages_en_US.properties | 17 +
.../carbondata/lcm/locks/LocalFileLockTest.java | 17 +-
.../lcm/locks/ZooKeeperLockingTest.java | 17 +-
.../store/colgroup/ColGroupMinMaxTest.java | 18 +
80 files changed, 1821 insertions(+), 460 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/fd5493b9/integration/spark/src/test/scala/org/carbondata/spark/testsuite/datacompaction/MajorCompactionStopsAfterCompaction.scala
----------------------------------------------------------------------