Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code merge from HuaweiBigData/master to apache/master #6

Merged
merged 54 commits into from
Jun 30, 2016

Conversation

ravipesala
Copy link
Contributor

No description provided.

ravikiran23 and others added 30 commits June 21, 2016 14:43
…pache#708)

* double or decimal should not be set as DICTIONARY_EXCLUDE

* fixed checkstyle

* modified by suggestion
…g the empty result even though null data is available (apache#718)
Timestamp dimension is showing as Dictionary column. Correct to make it as Key Column
…pache#706)

[issue-705]Fix  data cleanup before data load and data load failure (apache#706)
* fix cleanup while data load failure or useless files exist
* use segmentstatusmanage to read tablestatus file
…ll existing test cases (apache#740)

* Using create table instead of create cube in all existing test cases

* Corrected test case
… load. (apache#741)

* If table status lock is failed, retry to acquire, then complete data load or the compaction should fail.
… numbers. (apache#737)

* Minor compaction need to be done based on the number of segments.
User will give the number of segments to be merged in levels.
* Add property carbon.compaction.level.threshold, removing carbon.compaction.minor.size
While data loading, encoding is not proper for all dimension

Fixed query execution for no dictionary and column groups
Fixed test cases and added more test case for column group and dictionary exclude
Fixed review comment
* Removed unused properties from carbon

* Removed unused carbon properties

* Fixed review comments
…ESHOLD_MIN (apache#750)

[Bug] fix bug when high.cardinality.threshold == HIGH_CARDINALITY_THRESHOLD_MIN (apache#750)
…ompaction (apache#748)

* handling the cleanup of stale compacted segments in the compaction also.
* Fix problem in preserving segments during compaction
* Memory leak problem in query flow.
…ile cleanup fix (apache#749)

* Added comments for carbon.properties.template
* clean files not cleaning .carbonindex files
…apache#752)

* Added Validation for delete segments, load start time parameter

* fixed review comment
…ll fail to provide filter result. this is because while (apache#754)

querying the engine is trying to get the direct surrogate based in user defined time format in properties file.
kumarvishal09 and others added 18 commits June 27, 2016 07:15
Make block level btree loading in executor multi threaded.
* Removed all cube related DDL/DMLs
* Corrected test cases
…blocks (apache#721)

* When Range filters(>,<,>=,<=) is applied Direct Surrogate Column block and blocklet pruning is supported
* Binary search inside block let for range filters.
When handle data with quotes,we need to follow the rules:
1)the cell should be enclosed in quote character
2)inside the data eache quote is escaped using escape character.

for example:
"""abc""" -> "abc" (escape char and quote is ")
”\"i\"" ->"i" (escape char is\ ,quote is ")
Added use name, thread id, database name and table name to audit log.
Conflicts:
	README.md
	core/src/main/java/org/carbondata/core/datastorage/util/StoreFactory.java
	core/src/main/java/org/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGenerator.java
	core/src/main/java/org/carbondata/core/util/CarbonUtil.java
	core/src/main/java/org/carbondata/core/util/DataFileFooterConverter.java
	core/src/main/java/org/carbondata/query/aggregator/impl/CustomAggregatorHelper.java
	core/src/main/java/org/carbondata/query/carbon/executor/internal/impl/InternalDetailQueryExecutor.java
	core/src/main/java/org/carbondata/query/carbon/processor/impl/AggregateQueryBlockProcessor.java
	core/src/main/java/org/carbondata/query/filter/executer/ColGroupFilterExecuterImpl.java
	core/src/main/java/org/carbondata/query/filter/executer/IncludeColGroupFilterExecuterImpl.java
	core/src/main/java/org/carbondata/scan/executor/util/QueryUtil.java
	core/src/main/java/org/carbondata/scan/expression/Expression.java
	core/src/main/java/org/carbondata/scan/expression/ExpressionResult.java
	core/src/main/java/org/carbondata/scan/expression/arithmetic/AddExpression.java
	core/src/main/java/org/carbondata/scan/expression/arithmetic/DivideExpression.java
	core/src/main/java/org/carbondata/scan/expression/arithmetic/MultiplyExpression.java
	core/src/main/java/org/carbondata/scan/expression/arithmetic/SubstractExpression.java
	core/src/main/java/org/carbondata/scan/expression/conditional/EqualToExpression.java
	core/src/main/java/org/carbondata/scan/expression/conditional/GreaterThanEqualToExpression.java
	core/src/main/java/org/carbondata/scan/expression/conditional/GreaterThanExpression.java
	core/src/main/java/org/carbondata/scan/expression/conditional/InExpression.java
	core/src/main/java/org/carbondata/scan/expression/conditional/LessThanEqualToExpression.java
	core/src/main/java/org/carbondata/scan/expression/conditional/LessThanExpression.java
	core/src/main/java/org/carbondata/scan/expression/conditional/ListExpression.java
	core/src/main/java/org/carbondata/scan/expression/conditional/NotEqualsExpression.java
	core/src/main/java/org/carbondata/scan/expression/conditional/NotInExpression.java
	core/src/main/java/org/carbondata/scan/expression/exception/FilterUnsupportedException.java
	core/src/main/java/org/carbondata/scan/expression/logical/AndExpression.java
	core/src/main/java/org/carbondata/scan/expression/logical/NotExpression.java
	core/src/main/java/org/carbondata/scan/expression/logical/OrExpression.java
	core/src/main/java/org/carbondata/scan/filter/FilterUtil.java
	core/src/main/java/org/carbondata/scan/filter/executer/ColGroupFilterExecuterImpl.java
	core/src/main/java/org/carbondata/scan/filter/executer/RowLevelFilterExecuterImpl.java
	core/src/main/java/org/carbondata/scan/filter/executer/RowLevelRangeGrtThanFiterExecuterImpl.java
	core/src/main/java/org/carbondata/scan/filter/executer/RowLevelRangeGrtrThanEquaToFilterExecuterImpl.java
	core/src/main/java/org/carbondata/scan/filter/executer/RowLevelRangeLessThanEqualFilterExecuterImpl.java
	core/src/main/java/org/carbondata/scan/filter/executer/RowLevelRangeLessThanFiterExecuterImpl.java
	core/src/main/java/org/carbondata/scan/filter/executer/RowLevelRangeTypeExecuterFacory.java
	core/src/main/java/org/carbondata/scan/filter/resolver/AndFilterResolverImpl.java
	core/src/main/java/org/carbondata/scan/filter/resolver/FilterResolverIntf.java
	core/src/main/java/org/carbondata/scan/filter/resolver/LogicalFilterResolverImpl.java
	core/src/main/java/org/carbondata/scan/filter/resolver/RestructureFilterResolverImpl.java
	core/src/main/java/org/carbondata/scan/filter/resolver/RowLevelRangeFilterResolverImpl.java
	core/src/main/java/org/carbondata/scan/filter/resolver/resolverinfo/visitor/CustomTypeDictionaryVisitor.java
	core/src/main/java/org/carbondata/scan/filter/resolver/resolverinfo/visitor/DictionaryColumnVisitor.java
	core/src/main/java/org/carbondata/scan/filter/resolver/resolverinfo/visitor/NoDictionaryTypeVisitor.java
	core/src/main/java/org/carbondata/scan/util/DataTypeUtil.java
	integration-testcases/src/test/scala/org/carbondata/spark/testsuite/allqueries/AllDataTypesTestCase1.scala
	integration-testcases/src/test/scala/org/carbondata/spark/testsuite/allqueries/AllDataTypesTestCase2.scala
	integration/spark/src/main/java/org/carbondata/spark/load/CarbonLoaderUtil.java
	integration/spark/src/main/scala/org/apache/spark/sql/CarbonDatasourceRelation.scala
	integration/spark/src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala
	integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
	integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonMetastoreCatalog.scala
	integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonSQLDialect.scala
	integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonStrategies.scala
	integration/spark/src/main/scala/org/carbondata/spark/agg/CarbonAggregates.scala
	integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonScanRDD.scala
	integration/spark/src/test/scala/org/carbondata/spark/testsuite/allqueries/AllDataTypesTestCaseAggregate.scala
	processing/src/main/java/org/carbondata/processing/store/CarbonFactDataHandlerModel.java
	processing/src/main/java/org/carbondata/processing/store/colgroup/ColGroupDataHolder.java
	processing/src/main/java/org/carbondata/processing/store/colgroup/ColGroupMinMax.java
	processing/src/main/java/org/carbondata/processing/store/writer/AbstractFactDataWriter.java
	processing/src/test/java/org/carbondata/processing/store/colgroup/ColGroupMinMaxTest.java
@ravipesala
Copy link
Contributor Author

@chenliang613 Please merge directly, don't do squash merge.

@asfgit asfgit merged commit 4444c32 into apache:master Jun 30, 2016
foryou2030 pushed a commit to foryou2030/incubator-carbondata that referenced this pull request Nov 23, 2016
shutdown dictionary server and client
mayunSaicmotor referenced this pull request in mayunSaicmotor/incubator-carbondata Mar 21, 2017
Beyyes pushed a commit to Beyyes/carbondata that referenced this pull request Jun 11, 2017
add default value for properties.getProperty function
kumarvishal09 pushed a commit to kumarvishal09/incubator-carbondata that referenced this pull request May 22, 2018
… issue

Code refactored to update the mv table at the end of mv to avoid intrusive changes inside mv code.
And fixed alias issue of join query and group by having filter issue.

This closes apache#6
MarvinLitt added a commit to MarvinLitt/carbondata that referenced this pull request Dec 2, 2019
parent d6662b3
author litao <litao_xidian@126.com> 1574689267 +0800
committer litao <litao_xidian@126.com> 1575292552 +0800

# This is a combination of 3 commits.
# This is the 1st commit message:

part of carbon data spatial index code include how to create the hash id and get from query list to hash id list.

Geospatial support in create table, load, alter and query polygon

Merge branch 'geo' of https://github.com/VenuReddy2103/carbondata into mybranch

# This is the commit message apache#2:

[CARBONDATA-3584] Fix Select Query failure for Boolean dictionary column when Codegen is enabled

Induced because of apache#3463

This closes apache#3470

# This is the commit message apache#3:

[HOTFIX][checkstyle] update AnnotationLocation rule apache#3464

This closes apache#3464

# This is the commit message apache#6:

[HOTFIX] Change not to use cache when creating CarbonTable from schema file apache#3472

Using cache will lead to incorrect table path set in SDK writer.
This PR corrects it

This closes apache#3472

# This is the commit message apache#7:

[CARBONDATA-3594] Optimize getSplits() during compaction

Problem:
In MergerRDD, for compaction of n segments per task, get splits is called n times.
Solution:
In MergerRDD, for per compaction task,get all validSegments and call getsplits only once for those valid segments

This closes apache#3475

# This is the commit message apache#8:

[CARBONDATA-3589]: Adding NULL segments check and empty segments check before prepriming

Insert into select from hive table into carbon table having partition
fails with index server running because of the fact that empty segments
were being sent for prepriming. Added a check for the same.

This closes apache#3468
QiangCai pushed a commit to QiangCai/carbondata that referenced this pull request Dec 25, 2019
QiangCai pushed a commit to QiangCai/carbondata that referenced this pull request Dec 25, 2019
支持从Flink写数据到Carbon

apache#6



See merge request dplatform/Carbon!26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.