1
1
    2
Merge branch 'master_zt'

Conflicts:
	.cproject
	.settings/language.settings.xml
	Block/DynamicBlockBuffer.cpp
	Block/DynamicBlockBuffer.h
	Block/ResultSet.h
	BlockStreamIterator/BlockStreamIteratorBase.cpp
	BlockStreamIterator/BlockStreamIteratorBase.h
	BlockStreamIterator/BlockStreamResultCollector.cpp
	BlockStreamIterator/BlockStreamResultCollector.h
	BlockStreamIterator/ParallelBlockStreamIterator/ExpandableBlockStreamFilter.cpp
	Catalog/Attribute.h
	LogicalQueryPlan/DataflowPartitionDescriptor.cpp
	LogicalQueryPlan/DataflowPartitionDescriptor.h
	LogicalQueryPlan/EqualJoin.h
	LogicalQueryPlan/Filter.h
	LogicalQueryPlan/LogicalOperator.cpp
	LogicalQueryPlan/LogicalOperator.h
	LogicalQueryPlan/LogicalQueryPlanRoot.cpp
	LogicalQueryPlan/LogicalQueryPlanRoot.h
	LogicalQueryPlan/Requirement.cpp
	LogicalQueryPlan/Requirement.h
	LogicalQueryPlan/Scan.cpp
	LogicalQueryPlan/Test/ResultCollect_test.cpp
	LogicalQueryPlan/Test/getOptimalQueryPlan.cpp
	LogicalQueryPlan/Test/testGenerateIteratorTree.cpp
	Test/TestMain.cpp