You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by zu...@apache.org on 2016/05/27 03:23:34 UTC
[43/50] [abbrv] incubator-quickstep git commit: Fixed some style
issues.
Fixed some style issues.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/0c8b104f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/0c8b104f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/0c8b104f
Branch: refs/heads/partition_aware_hashjoin_with_optimizer_support
Commit: 0c8b104f73b70c5ffdfd09f191e899e3266ec2ea
Parents: 61266e3
Author: Adalbert Gerald Soosai Raj <ge...@cs.wisc.edu>
Authored: Tue May 24 17:15:37 2016 -0500
Committer: Adalbert Gerald Soosai Raj <ge...@cs.wisc.edu>
Committed: Tue May 24 17:15:37 2016 -0500
----------------------------------------------------------------------
query_optimizer/ExecutionGenerator.cpp | 10 +++++-----
query_optimizer/logical/CreateTable.hpp | 2 +-
query_optimizer/resolver/Resolver.cpp | 3 ++-
storage/StorageManager.cpp | 1 -
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/0c8b104f/query_optimizer/ExecutionGenerator.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/ExecutionGenerator.cpp b/query_optimizer/ExecutionGenerator.cpp
index 12dacda..6a27178 100644
--- a/query_optimizer/ExecutionGenerator.cpp
+++ b/query_optimizer/ExecutionGenerator.cpp
@@ -366,7 +366,7 @@ void ExecutionGenerator::createPartitionedTemporaryCatalogRelation(
PartitionSchemeHeader *part_scheme_header = new HashPartitionSchemeHeader(num_partitions, part_attr_id);
PartitionScheme *partition_scheme = new PartitionScheme(part_scheme_header);
catalog_relation->setPartitionScheme(partition_scheme);
- NUMAPlacementScheme *placement_scheme = new NUMAPlacementScheme(num_partitions);
+ NUMAPlacementScheme *placement_scheme = new NUMAPlacementScheme(num_partitions);
catalog_relation->setNUMAPlacementScheme(placement_scheme);
*catalog_relation_output = catalog_relation.get();
@@ -1166,17 +1166,17 @@ void ExecutionGenerator::convertCreateTable(
}
if (physical_plan->partition_scheme()) {
- std::cout<<"Relation created with partition scheme."<<std::endl;
+ LOG(INFO) << "Relation created with partition scheme." << std::endl;
std::size_t num_partitions = physical_plan->partition_scheme()->getPartitionSchemeHeader().getNumPartitions();
attribute_id part_attr_id = physical_plan->partition_scheme()->getPartitionSchemeHeader().getPartitionAttributeId();
PartitionSchemeHeader *part_scheme_header = new HashPartitionSchemeHeader(num_partitions, part_attr_id);
PartitionScheme *partition_scheme = new PartitionScheme(part_scheme_header);
catalog_relation->setPartitionScheme(partition_scheme);
- NUMAPlacementScheme *placement_scheme = new NUMAPlacementScheme(num_partitions);
+ NUMAPlacementScheme *placement_scheme = new NUMAPlacementScheme(num_partitions);
catalog_relation->setNUMAPlacementScheme(placement_scheme);
}
-
- execution_plan_->addRelationalOperator(new CreateTableOperator(catalog_relation.release(), optimizer_context_->catalog_database()));
+ execution_plan_->addRelationalOperator(
+ new CreateTableOperator(catalog_relation.release(), optimizer_context_->catalog_database()));
}
void ExecutionGenerator::convertDeleteTuples(
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/0c8b104f/query_optimizer/logical/CreateTable.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/logical/CreateTable.hpp b/query_optimizer/logical/CreateTable.hpp
index 87c8405..5befe1d 100644
--- a/query_optimizer/logical/CreateTable.hpp
+++ b/query_optimizer/logical/CreateTable.hpp
@@ -131,7 +131,7 @@ class CreateTable : public Logical {
block_properties_(block_properties),
block_properties_representation_(
getOptimizerRepresentationForProto<OptimizerTreeBaseNodePtr>(block_properties_.get())),
- partition_scheme_(partition_scheme){}
+ partition_scheme_(partition_scheme) {}
std::string relation_name_;
std::vector<expressions::AttributeReferencePtr> attributes_;
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/0c8b104f/query_optimizer/resolver/Resolver.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/resolver/Resolver.cpp b/query_optimizer/resolver/Resolver.cpp
index a7eea87..31da478 100644
--- a/query_optimizer/resolver/Resolver.cpp
+++ b/query_optimizer/resolver/Resolver.cpp
@@ -494,7 +494,8 @@ PartitionSchemeHeader* Resolver::resolvePartitionClause(
}
// Check for Hash partition.
if (type_string.compare("0") == 0) {
- std::unique_ptr<PartitionSchemeHeader> hash_partition_scheme_header (new HashPartitionSchemeHeader(partition_clause->num_partitions()->long_value(), column_id));
+ std::unique_ptr<PartitionSchemeHeader> hash_partition_scheme_header(
+ new HashPartitionSchemeHeader(partition_clause->num_partitions()->long_value(), column_id));
partition_scheme_header = std::move(hash_partition_scheme_header);
} else if (type_string.compare("1") == 0) {
THROW_SQL_ERROR_AT(partition_clause)
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/0c8b104f/storage/StorageManager.cpp
----------------------------------------------------------------------
diff --git a/storage/StorageManager.cpp b/storage/StorageManager.cpp
index e6a2756..4b40d0e 100644
--- a/storage/StorageManager.cpp
+++ b/storage/StorageManager.cpp
@@ -186,7 +186,6 @@ StorageManager::~StorageManager() {
if (it->second.block->isDirty()) {
LOG(WARNING) << "Block with ID " << BlockIdUtil::ToString(it->first)
<< " is dirty during StorageManager shutdown";
-
}
delete it->second.block;
deallocateSlots(it->second.block_memory, it->second.block_memory_size);