You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by ji...@apache.org on 2018/02/26 19:16:20 UTC
[39/46] incubator-quickstep git commit: Upgrade cpplint
Upgrade cpplint
- Added several missing headers.
- Modified the lint_everything file to add the command line flags.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/d886ddb0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/d886ddb0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/d886ddb0
Branch: refs/heads/fix-iwyu
Commit: d886ddb095d3eaafde00bdfb5f85f97aabe5e7e2
Parents: c43107d
Author: Harshad Deshmukh <hb...@apache.org>
Authored: Tue Dec 19 12:56:36 2017 -0600
Committer: Harshad Deshmukh <hb...@apache.org>
Committed: Thu Dec 21 14:30:47 2017 -0600
----------------------------------------------------------------------
.travis.yml | 2 +-
catalog/CatalogRelation.hpp | 1 +
catalog/IndexScheme.hpp | 1 +
catalog/tests/Catalog_unittest.cpp | 1 +
cli/tests/NetworkIO_unittest.cpp | 6 +-
.../aggregation/AggregationHandleSum.cpp | 1 +
expressions/scalar/ScalarAttribute.cpp | 1 +
.../WindowAggregateFunctionAvg.cpp | 1 +
.../WindowAggregateFunctionAvg.hpp | 1 +
.../WindowAggregateFunctionCount.cpp | 1 +
.../WindowAggregateFunctionCount.hpp | 1 +
.../WindowAggregateFunctionMax.cpp | 1 +
.../WindowAggregateFunctionMax.hpp | 1 +
.../WindowAggregateFunctionMin.cpp | 1 +
.../WindowAggregateFunctionMin.hpp | 1 +
.../WindowAggregateFunctionSum.cpp | 1 +
.../WindowAggregateFunctionSum.hpp | 1 +
lint_everything.py | 47 +
parser/ParseBlockProperties.cpp | 8 +-
parser/ParseBlockProperties.hpp | 8 +-
parser/ParseString.hpp | 2 +-
query_optimizer/LIPFilterGenerator.cpp | 1 +
.../expressions/BinaryExpression.cpp | 1 +
query_optimizer/expressions/Exists.cpp | 4 +-
query_optimizer/expressions/InTableQuery.cpp | 1 +
query_optimizer/expressions/InValueList.cpp | 2 +
query_optimizer/expressions/LogicalAnd.cpp | 1 +
query_optimizer/expressions/LogicalOr.cpp | 1 +
query_optimizer/expressions/SearchedCase.cpp | 1 +
query_optimizer/expressions/SimpleCase.cpp | 2 +
.../expressions/SubqueryExpression.cpp | 1 +
query_optimizer/logical/SetOperation.hpp | 1 +
query_optimizer/logical/Sort.hpp | 1 +
.../physical/SharedSubplanReference.hpp | 1 +
query_optimizer/physical/Sort.hpp | 1 +
query_optimizer/physical/TableReference.hpp | 1 +
query_optimizer/resolver/NameResolver.cpp | 1 +
query_optimizer/resolver/NameResolver.hpp | 1 +
query_optimizer/rules/AttachLIPFilters.cpp | 5 +-
.../StarSchemaHashJoinOrderOptimization.cpp | 2 +
query_optimizer/rules/UnnestSubqueries.cpp | 1 +
.../rules/tests/PushDownFilter_unittest.cpp | 2 +
.../rules/tests/UpdateExpression_unittest.cpp | 2 +
.../strategy/tests/Aggregate_unittest.cpp | 1 +
.../strategy/tests/Join_unittest.cpp | 1 +
.../strategy/tests/OneToOne_unittest.cpp | 2 +
.../strategy/tests/Selection_unittest.cpp | 2 +
query_optimizer/strategy/tests/StrategyTest.hpp | 2 +
.../tests/ExecutionGeneratorTestRunner.cpp | 2 +-
.../tests/ExecutionGeneratorTestRunner.hpp | 2 +-
relational_operators/AggregationOperator.hpp | 1 +
relational_operators/InsertOperator.cpp | 1 +
relational_operators/InsertOperator.hpp | 1 +
.../WindowAggregationOperator.cpp | 1 +
.../WindowAggregationOperator.hpp | 1 +
.../BasicColumnStoreTupleStorageSubBlock.hpp | 4 +-
storage/BasicColumnStoreValueAccessor.hpp | 13 +-
storage/CollisionFreeVectorTable.hpp | 1 +
storage/CompressedTupleStorageSubBlock.hpp | 4 +-
storage/LinearOpenAddressingHashTable.hpp | 1 +
storage/PackedPayloadHashTable.cpp | 1 +
storage/SplitRowStoreTupleStorageSubBlock.cpp | 1 +
storage/SplitRowStoreTupleStorageSubBlock.hpp | 1 +
storage/StorageManager.cpp | 1 +
storage/SubBlockTypeRegistry.cpp | 1 +
storage/ThreadPrivateCompactKeyHashTable.cpp | 2 +
.../tests/BloomFilterIndexSubBlock_unittest.cpp | 1 +
storage/tests/FileManager_unittest_common.hpp | 4 -
storage/tests/StorageBlockSort_unittest.cpp | 1 +
third_party/src/cpplint/cpplint.py | 1205 +++++++++---------
third_party/src/cpplint/lint_everything.py | 40 -
transaction/LockManager.cpp | 1 +
.../comparisons/AsciiStringComparators-inl.hpp | 1 +
types/operations/comparisons/Comparison-inl.hpp | 1 +
.../comparisons/LiteralComparators-inl.hpp | 1 +
.../PatternMatchingComparators-inl.hpp | 1 +
utility/tests/DAG_unittest.cpp | 2 +
utility/tests/ScopedReassignment_unittest.cpp | 2 +
utility/textbased_test/TextBasedTestDriver.cpp | 1 +
79 files changed, 729 insertions(+), 701 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 9820599..4e7833f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,7 +79,7 @@ before_script:
-D VECTOR_COPY_ELISION_LEVEL=$VECTOR_COPY_ELISION_LEVEL ..)
script:
- - ./third_party/src/cpplint/lint_everything.py
+ - ./lint_everything.py
- ./validate_cmakelists.py
- ./cyclic_dependency.py
- (cd build && make)
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/catalog/CatalogRelation.hpp
----------------------------------------------------------------------
diff --git a/catalog/CatalogRelation.hpp b/catalog/CatalogRelation.hpp
index 6439a1b..2b5a250 100644
--- a/catalog/CatalogRelation.hpp
+++ b/catalog/CatalogRelation.hpp
@@ -24,6 +24,7 @@
#include <cstddef>
#include <memory>
#include <string>
+#include <utility>
#include <vector>
#include "catalog/Catalog.pb.h"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/catalog/IndexScheme.hpp
----------------------------------------------------------------------
diff --git a/catalog/IndexScheme.hpp b/catalog/IndexScheme.hpp
index 3bf3f17..bc7f480 100644
--- a/catalog/IndexScheme.hpp
+++ b/catalog/IndexScheme.hpp
@@ -24,6 +24,7 @@
#include <cstddef>
#include <string>
#include <unordered_map>
+#include <utility>
#include <vector>
#include "catalog/Catalog.pb.h"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/catalog/tests/Catalog_unittest.cpp
----------------------------------------------------------------------
diff --git a/catalog/tests/Catalog_unittest.cpp b/catalog/tests/Catalog_unittest.cpp
index 7b121fa..d3c101d 100644
--- a/catalog/tests/Catalog_unittest.cpp
+++ b/catalog/tests/Catalog_unittest.cpp
@@ -23,6 +23,7 @@
#include <memory>
#include <sstream>
#include <string>
+#include <utility>
#include <vector>
#include "catalog/Catalog.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/cli/tests/NetworkIO_unittest.cpp
----------------------------------------------------------------------
diff --git a/cli/tests/NetworkIO_unittest.cpp b/cli/tests/NetworkIO_unittest.cpp
index 9dbd63e..48574c8 100644
--- a/cli/tests/NetworkIO_unittest.cpp
+++ b/cli/tests/NetworkIO_unittest.cpp
@@ -38,8 +38,8 @@ namespace quickstep {
using networkio_internal::RequestState;
-static std::string const kQueryRequest = "O Captain! My Captain!";
-static std::string const kQueryResponse = "Our fearful trip is done,";
+static char const kQueryRequest[] = "O Captain! My Captain!";
+static char const kQueryResponse[] = "Our fearful trip is done,";
/**
* Contains a server instance for testing.
@@ -123,7 +123,7 @@ TEST(NetworkIOTest, TestNetworkIOCommandInteraction) {
EXPECT_EQ(command->getCommand(), kQueryRequest);
// Set some output for the main test thread, destruction of the handle will return the request.
- fprintf(command->out(), "%s", kQueryResponse.c_str());
+ fprintf(command->out(), "%s", kQueryResponse);
});
server_handler.start();
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/expressions/aggregation/AggregationHandleSum.cpp
----------------------------------------------------------------------
diff --git a/expressions/aggregation/AggregationHandleSum.cpp b/expressions/aggregation/AggregationHandleSum.cpp
index 9f5f220..b3e0059 100644
--- a/expressions/aggregation/AggregationHandleSum.cpp
+++ b/expressions/aggregation/AggregationHandleSum.cpp
@@ -22,6 +22,7 @@
#include <cstddef>
#include <cstdint>
#include <memory>
+#include <utility>
#include <vector>
#include "catalog/CatalogTypedefs.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/expressions/scalar/ScalarAttribute.cpp
----------------------------------------------------------------------
diff --git a/expressions/scalar/ScalarAttribute.cpp b/expressions/scalar/ScalarAttribute.cpp
index 036eeba..944dc35 100644
--- a/expressions/scalar/ScalarAttribute.cpp
+++ b/expressions/scalar/ScalarAttribute.cpp
@@ -19,6 +19,7 @@
#include "expressions/scalar/ScalarAttribute.hpp"
+#include <memory>
#include <string>
#include <utility>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/expressions/window_aggregation/WindowAggregateFunctionAvg.cpp
----------------------------------------------------------------------
diff --git a/expressions/window_aggregation/WindowAggregateFunctionAvg.cpp b/expressions/window_aggregation/WindowAggregateFunctionAvg.cpp
index 20c296b..9776ba1 100644
--- a/expressions/window_aggregation/WindowAggregateFunctionAvg.cpp
+++ b/expressions/window_aggregation/WindowAggregateFunctionAvg.cpp
@@ -19,6 +19,7 @@
#include "expressions/window_aggregation/WindowAggregateFunctionAvg.hpp"
+#include <memory>
#include <vector>
#include "expressions/window_aggregation/WindowAggregationHandleAvg.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/expressions/window_aggregation/WindowAggregateFunctionAvg.hpp
----------------------------------------------------------------------
diff --git a/expressions/window_aggregation/WindowAggregateFunctionAvg.hpp b/expressions/window_aggregation/WindowAggregateFunctionAvg.hpp
index 1706ce8..af3d688 100644
--- a/expressions/window_aggregation/WindowAggregateFunctionAvg.hpp
+++ b/expressions/window_aggregation/WindowAggregateFunctionAvg.hpp
@@ -20,6 +20,7 @@
#ifndef QUICKSTEP_EXPRESSIONS_WINDOW_AGGREGATION_WINDOW_AGGREGATE_FUNCTION_AVG_HPP_
#define QUICKSTEP_EXPRESSIONS_WINDOW_AGGREGATION_WINDOW_AGGREGATE_FUNCTION_AVG_HPP_
+#include <memory>
#include <string>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/expressions/window_aggregation/WindowAggregateFunctionCount.cpp
----------------------------------------------------------------------
diff --git a/expressions/window_aggregation/WindowAggregateFunctionCount.cpp b/expressions/window_aggregation/WindowAggregateFunctionCount.cpp
index 9290ac0..55f42cc 100644
--- a/expressions/window_aggregation/WindowAggregateFunctionCount.cpp
+++ b/expressions/window_aggregation/WindowAggregateFunctionCount.cpp
@@ -19,6 +19,7 @@
#include "expressions/window_aggregation/WindowAggregateFunctionCount.hpp"
+#include <memory>
#include <vector>
#include "expressions/window_aggregation/WindowAggregationHandle.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/expressions/window_aggregation/WindowAggregateFunctionCount.hpp
----------------------------------------------------------------------
diff --git a/expressions/window_aggregation/WindowAggregateFunctionCount.hpp b/expressions/window_aggregation/WindowAggregateFunctionCount.hpp
index f508105..972de33 100644
--- a/expressions/window_aggregation/WindowAggregateFunctionCount.hpp
+++ b/expressions/window_aggregation/WindowAggregateFunctionCount.hpp
@@ -20,6 +20,7 @@
#ifndef QUICKSTEP_EXPRESSIONS_WINDOW_AGGREGATION_WINDOW_AGGREGATE_FUNCTION_COUNT_HPP_
#define QUICKSTEP_EXPRESSIONS_WINDOW_AGGREGATION_WINDOW_AGGREGATE_FUNCTION_COUNT_HPP_
+#include <memory>
#include <string>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/expressions/window_aggregation/WindowAggregateFunctionMax.cpp
----------------------------------------------------------------------
diff --git a/expressions/window_aggregation/WindowAggregateFunctionMax.cpp b/expressions/window_aggregation/WindowAggregateFunctionMax.cpp
index 594301a..082ccbd 100644
--- a/expressions/window_aggregation/WindowAggregateFunctionMax.cpp
+++ b/expressions/window_aggregation/WindowAggregateFunctionMax.cpp
@@ -19,6 +19,7 @@
#include "expressions/window_aggregation/WindowAggregateFunctionMax.hpp"
+#include <memory>
#include <vector>
#include "expressions/window_aggregation/WindowAggregationHandle.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/expressions/window_aggregation/WindowAggregateFunctionMax.hpp
----------------------------------------------------------------------
diff --git a/expressions/window_aggregation/WindowAggregateFunctionMax.hpp b/expressions/window_aggregation/WindowAggregateFunctionMax.hpp
index 15563df..315aeca 100644
--- a/expressions/window_aggregation/WindowAggregateFunctionMax.hpp
+++ b/expressions/window_aggregation/WindowAggregateFunctionMax.hpp
@@ -20,6 +20,7 @@
#ifndef QUICKSTEP_EXPRESSIONS_WINDOW_AGGREGATION_WINDOW_AGGREGATE_FUNCTION_MAX_HPP_
#define QUICKSTEP_EXPRESSIONS_WINDOW_AGGREGATION_WINDOW_AGGREGATE_FUNCTION_MAX_HPP_
+#include <memory>
#include <string>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/expressions/window_aggregation/WindowAggregateFunctionMin.cpp
----------------------------------------------------------------------
diff --git a/expressions/window_aggregation/WindowAggregateFunctionMin.cpp b/expressions/window_aggregation/WindowAggregateFunctionMin.cpp
index 650241f..66909ff 100644
--- a/expressions/window_aggregation/WindowAggregateFunctionMin.cpp
+++ b/expressions/window_aggregation/WindowAggregateFunctionMin.cpp
@@ -19,6 +19,7 @@
#include "expressions/window_aggregation/WindowAggregateFunctionMin.hpp"
+#include <memory>
#include <vector>
#include "expressions/window_aggregation/WindowAggregationHandle.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/expressions/window_aggregation/WindowAggregateFunctionMin.hpp
----------------------------------------------------------------------
diff --git a/expressions/window_aggregation/WindowAggregateFunctionMin.hpp b/expressions/window_aggregation/WindowAggregateFunctionMin.hpp
index 8bb4386..231f60b 100644
--- a/expressions/window_aggregation/WindowAggregateFunctionMin.hpp
+++ b/expressions/window_aggregation/WindowAggregateFunctionMin.hpp
@@ -20,6 +20,7 @@
#ifndef QUICKSTEP_EXPRESSIONS_WINDOW_AGGREGATION_WINDOW_AGGREGATE_FUNCTION_MIN_HPP_
#define QUICKSTEP_EXPRESSIONS_WINDOW_AGGREGATION_WINDOW_AGGREGATE_FUNCTION_MIN_HPP_
+#include <memory>
#include <string>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/expressions/window_aggregation/WindowAggregateFunctionSum.cpp
----------------------------------------------------------------------
diff --git a/expressions/window_aggregation/WindowAggregateFunctionSum.cpp b/expressions/window_aggregation/WindowAggregateFunctionSum.cpp
index 14c51d8..d774b8a 100644
--- a/expressions/window_aggregation/WindowAggregateFunctionSum.cpp
+++ b/expressions/window_aggregation/WindowAggregateFunctionSum.cpp
@@ -19,6 +19,7 @@
#include "expressions/window_aggregation/WindowAggregateFunctionSum.hpp"
+#include <memory>
#include <vector>
#include "expressions/window_aggregation/WindowAggregationHandle.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/expressions/window_aggregation/WindowAggregateFunctionSum.hpp
----------------------------------------------------------------------
diff --git a/expressions/window_aggregation/WindowAggregateFunctionSum.hpp b/expressions/window_aggregation/WindowAggregateFunctionSum.hpp
index 89582dd..a2f926a 100644
--- a/expressions/window_aggregation/WindowAggregateFunctionSum.hpp
+++ b/expressions/window_aggregation/WindowAggregateFunctionSum.hpp
@@ -20,6 +20,7 @@
#ifndef QUICKSTEP_EXPRESSIONS_WINDOW_AGGREGATION_WINDOW_AGGREGATE_FUNCTION_SUM_HPP_
#define QUICKSTEP_EXPRESSIONS_WINDOW_AGGREGATION_WINDOW_AGGREGATE_FUNCTION_SUM_HPP_
+#include <memory>
#include <string>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/lint_everything.py
----------------------------------------------------------------------
diff --git a/lint_everything.py b/lint_everything.py
new file mode 100755
index 0000000..ddc812c
--- /dev/null
+++ b/lint_everything.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python2
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import os
+import subprocess
+import sys
+
+EXCLUDED_PREFIXES = ['./.', './third_party', './build', './parser/preprocessed']
+
+print "Running cpplint on entire source tree. This may take several minutes ..."
+
+call_args = ['/usr/bin/env',
+ 'python2',
+ './third_party/src/cpplint/cpplint.py',
+ '--extensions=cpp,hpp',
+ '--linelength=120',
+ '--headers=hpp',
+ '--filter=-build/header_guard',
+ '--quiet']
+
+for (dirpath, dirnames, filenames) in os.walk('.'):
+ filtered = False
+ for prefix in EXCLUDED_PREFIXES:
+ if dirpath.startswith(prefix):
+ filtered = True
+ if not filtered:
+ for filename in filenames:
+ if filename.endswith('.hpp') or filename.endswith('.cpp'):
+ call_args.append(dirpath + '/' + filename)
+
+sys.exit(subprocess.call(call_args))
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/parser/ParseBlockProperties.cpp
----------------------------------------------------------------------
diff --git a/parser/ParseBlockProperties.cpp b/parser/ParseBlockProperties.cpp
index 31c30a0..053bd79 100644
--- a/parser/ParseBlockProperties.cpp
+++ b/parser/ParseBlockProperties.cpp
@@ -23,9 +23,9 @@
namespace quickstep {
-const std::string ParseBlockProperties::kKeyBlockSizeMB = "blocksizemb";
-const std::string ParseBlockProperties::kKeyCompress = "compress";
-const std::string ParseBlockProperties::kKeySort = "sort";
-const std::string ParseBlockProperties::kKeyType = "type";
+const char ParseBlockProperties::kKeyBlockSizeMB[] = "blocksizemb";
+const char ParseBlockProperties::kKeyCompress[] = "compress";
+const char ParseBlockProperties::kKeySort[] = "sort";
+const char ParseBlockProperties::kKeyType[] = "type";
} // namespace quickstep
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/parser/ParseBlockProperties.hpp
----------------------------------------------------------------------
diff --git a/parser/ParseBlockProperties.hpp b/parser/ParseBlockProperties.hpp
index fa176b1..f93107a 100644
--- a/parser/ParseBlockProperties.hpp
+++ b/parser/ParseBlockProperties.hpp
@@ -48,10 +48,10 @@ namespace quickstep {
*/
class ParseBlockProperties : public ParseTreeNode {
// Valid key names for the BlockProperties.
- static const std::string kKeyBlockSizeMB;
- static const std::string kKeyCompress;
- static const std::string kKeySort;
- static const std::string kKeyType;
+ static const char kKeyBlockSizeMB[];
+ static const char kKeyCompress[];
+ static const char kKeySort[];
+ static const char kKeyType[];
public:
/**
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/parser/ParseString.hpp
----------------------------------------------------------------------
diff --git a/parser/ParseString.hpp b/parser/ParseString.hpp
index 1997822..13dbf44 100644
--- a/parser/ParseString.hpp
+++ b/parser/ParseString.hpp
@@ -115,4 +115,4 @@ class ParseString : public ParseTreeNode {
} // namespace quickstep
-#endif /* QUICKSTEP_PARSER_PARSE_STRING_HPP_ */
+#endif // QUICKSTEP_PARSER_PARSE_STRING_HPP_
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/LIPFilterGenerator.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/LIPFilterGenerator.cpp b/query_optimizer/LIPFilterGenerator.cpp
index 3562974..f87831c 100644
--- a/query_optimizer/LIPFilterGenerator.cpp
+++ b/query_optimizer/LIPFilterGenerator.cpp
@@ -21,6 +21,7 @@
#include <map>
#include <memory>
+#include <unordered_map>
#include <unordered_set>
#include <utility>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/expressions/BinaryExpression.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/expressions/BinaryExpression.cpp b/query_optimizer/expressions/BinaryExpression.cpp
index f49c6a2..07eb5ff 100644
--- a/query_optimizer/expressions/BinaryExpression.cpp
+++ b/query_optimizer/expressions/BinaryExpression.cpp
@@ -23,6 +23,7 @@
#include <cstddef>
#include <string>
#include <unordered_map>
+#include <utility>
#include <vector>
#include "expressions/scalar/ScalarBinaryExpression.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/expressions/Exists.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/expressions/Exists.cpp b/query_optimizer/expressions/Exists.cpp
index a7b0201..bf4cb72 100644
--- a/query_optimizer/expressions/Exists.cpp
+++ b/query_optimizer/expressions/Exists.cpp
@@ -19,8 +19,10 @@
#include "query_optimizer/expressions/Exists.hpp"
-#include <vector>
#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
#include "query_optimizer/OptimizerTree.hpp"
#include "query_optimizer/expressions/ExprId.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/expressions/InTableQuery.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/expressions/InTableQuery.cpp b/query_optimizer/expressions/InTableQuery.cpp
index 7122664..79018e5 100644
--- a/query_optimizer/expressions/InTableQuery.cpp
+++ b/query_optimizer/expressions/InTableQuery.cpp
@@ -20,6 +20,7 @@
#include "query_optimizer/expressions/InTableQuery.hpp"
#include <string>
+#include <unordered_map>
#include <vector>
#include "query_optimizer/OptimizerTree.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/expressions/InValueList.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/expressions/InValueList.cpp b/query_optimizer/expressions/InValueList.cpp
index 0451db7..d968d48 100644
--- a/query_optimizer/expressions/InValueList.cpp
+++ b/query_optimizer/expressions/InValueList.cpp
@@ -19,7 +19,9 @@
#include "query_optimizer/expressions/InValueList.hpp"
+#include <memory>
#include <string>
+#include <unordered_map>
#include <vector>
#include "expressions/predicate/DisjunctionPredicate.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/expressions/LogicalAnd.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/expressions/LogicalAnd.cpp b/query_optimizer/expressions/LogicalAnd.cpp
index 80ee0eb..1497874 100644
--- a/query_optimizer/expressions/LogicalAnd.cpp
+++ b/query_optimizer/expressions/LogicalAnd.cpp
@@ -19,6 +19,7 @@
#include "query_optimizer/expressions/LogicalAnd.hpp"
+#include <memory>
#include <string>
#include <unordered_map>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/expressions/LogicalOr.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/expressions/LogicalOr.cpp b/query_optimizer/expressions/LogicalOr.cpp
index 02028e1..3ae3e5d 100644
--- a/query_optimizer/expressions/LogicalOr.cpp
+++ b/query_optimizer/expressions/LogicalOr.cpp
@@ -19,6 +19,7 @@
#include "query_optimizer/expressions/LogicalOr.hpp"
+#include <memory>
#include <string>
#include <unordered_map>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/expressions/SearchedCase.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/expressions/SearchedCase.cpp b/query_optimizer/expressions/SearchedCase.cpp
index 2de52c9..c53e030 100644
--- a/query_optimizer/expressions/SearchedCase.cpp
+++ b/query_optimizer/expressions/SearchedCase.cpp
@@ -22,6 +22,7 @@
#include <cstddef>
#include <memory>
#include <string>
+#include <unordered_map>
#include <utility>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/expressions/SimpleCase.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/expressions/SimpleCase.cpp b/query_optimizer/expressions/SimpleCase.cpp
index b127d51..f11c8c8 100644
--- a/query_optimizer/expressions/SimpleCase.cpp
+++ b/query_optimizer/expressions/SimpleCase.cpp
@@ -20,7 +20,9 @@
#include "query_optimizer/expressions/SimpleCase.hpp"
#include <cstddef>
+#include <memory>
#include <string>
+#include <unordered_map>
#include <utility>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/expressions/SubqueryExpression.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/expressions/SubqueryExpression.cpp b/query_optimizer/expressions/SubqueryExpression.cpp
index dbcb6d6..bc5a6d3 100644
--- a/query_optimizer/expressions/SubqueryExpression.cpp
+++ b/query_optimizer/expressions/SubqueryExpression.cpp
@@ -20,6 +20,7 @@
#include "query_optimizer/expressions/SubqueryExpression.hpp"
#include <string>
+#include <unordered_map>
#include <vector>
#include "query_optimizer/OptimizerTree.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/logical/SetOperation.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/logical/SetOperation.hpp b/query_optimizer/logical/SetOperation.hpp
index 7e45231..2e706af 100644
--- a/query_optimizer/logical/SetOperation.hpp
+++ b/query_optimizer/logical/SetOperation.hpp
@@ -20,6 +20,7 @@
#ifndef QUICKSTEP_QUERY_OPTIMIZER_LOGICAL_SET_OPERATION_HPP_
#define QUICKSTEP_QUERY_OPTIMIZER_LOGICAL_SET_OPERATION_HPP_
+#include <memory>
#include <string>
#include <type_traits>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/logical/Sort.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/logical/Sort.hpp b/query_optimizer/logical/Sort.hpp
index 894970b..129c6d4 100644
--- a/query_optimizer/logical/Sort.hpp
+++ b/query_optimizer/logical/Sort.hpp
@@ -22,6 +22,7 @@
#include <memory>
#include <string>
+#include <utility>
#include <vector>
#include "query_optimizer/OptimizerTree.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/physical/SharedSubplanReference.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/physical/SharedSubplanReference.hpp b/query_optimizer/physical/SharedSubplanReference.hpp
index 60a2866..849bd3a 100644
--- a/query_optimizer/physical/SharedSubplanReference.hpp
+++ b/query_optimizer/physical/SharedSubplanReference.hpp
@@ -20,6 +20,7 @@
#ifndef QUICKSTEP_QUERY_OPTIMIZER_PHYSICAL_SHARED_SUBPLAN_REFERENCE_HPP_
#define QUICKSTEP_QUERY_OPTIMIZER_PHYSICAL_SHARED_SUBPLAN_REFERENCE_HPP_
+#include <memory>
#include <string>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/physical/Sort.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/physical/Sort.hpp b/query_optimizer/physical/Sort.hpp
index d0c6fe8..4a49aa3 100644
--- a/query_optimizer/physical/Sort.hpp
+++ b/query_optimizer/physical/Sort.hpp
@@ -20,6 +20,7 @@
#ifndef QUICKSTEP_QUERY_OPTIMIZER_PHYSICAL_SORT_HPP_
#define QUICKSTEP_QUERY_OPTIMIZER_PHYSICAL_SORT_HPP_
+#include <memory>
#include <string>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/physical/TableReference.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/physical/TableReference.hpp b/query_optimizer/physical/TableReference.hpp
index 85cb76b..d5b9896 100644
--- a/query_optimizer/physical/TableReference.hpp
+++ b/query_optimizer/physical/TableReference.hpp
@@ -20,6 +20,7 @@
#ifndef QUICKSTEP_QUERY_OPTIMIZER_PHYSICAL_TABLE_REFERENCE_HPP_
#define QUICKSTEP_QUERY_OPTIMIZER_PHYSICAL_TABLE_REFERENCE_HPP_
+#include <memory>
#include <string>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/resolver/NameResolver.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/resolver/NameResolver.cpp b/query_optimizer/resolver/NameResolver.cpp
index 1c6bf6a..65f492f 100644
--- a/query_optimizer/resolver/NameResolver.cpp
+++ b/query_optimizer/resolver/NameResolver.cpp
@@ -20,6 +20,7 @@
#include "query_optimizer/resolver/NameResolver.hpp"
#include <map>
+#include <memory>
#include <string>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/resolver/NameResolver.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/resolver/NameResolver.hpp b/query_optimizer/resolver/NameResolver.hpp
index 88154c7..4771e3e 100644
--- a/query_optimizer/resolver/NameResolver.hpp
+++ b/query_optimizer/resolver/NameResolver.hpp
@@ -21,6 +21,7 @@
#define QUICKSTEP_QUERY_OPTIMIZER_RESOLVER_NAME_RESOLVER_HPP_
#include <map>
+#include <memory>
#include <string>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/rules/AttachLIPFilters.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/AttachLIPFilters.cpp b/query_optimizer/rules/AttachLIPFilters.cpp
index 9a13b48..7914bab 100644
--- a/query_optimizer/rules/AttachLIPFilters.cpp
+++ b/query_optimizer/rules/AttachLIPFilters.cpp
@@ -22,11 +22,12 @@
#include <algorithm>
#include <cstdint>
#include <map>
+#include <memory>
#include <set>
-#include <unordered_set>
#include <unordered_map>
-#include <vector>
+#include <unordered_set>
#include <utility>
+#include <vector>
#include "query_optimizer/cost_model/StarSchemaSimpleCostModel.hpp"
#include "query_optimizer/expressions/AttributeReference.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/rules/StarSchemaHashJoinOrderOptimization.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/StarSchemaHashJoinOrderOptimization.cpp b/query_optimizer/rules/StarSchemaHashJoinOrderOptimization.cpp
index 340875d..1007dd5 100644
--- a/query_optimizer/rules/StarSchemaHashJoinOrderOptimization.cpp
+++ b/query_optimizer/rules/StarSchemaHashJoinOrderOptimization.cpp
@@ -24,6 +24,8 @@
#include <memory>
#include <set>
#include <unordered_map>
+#include <unordered_set>
+#include <utility>
#include <vector>
#include "query_optimizer/cost_model/StarSchemaSimpleCostModel.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/rules/UnnestSubqueries.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/UnnestSubqueries.cpp b/query_optimizer/rules/UnnestSubqueries.cpp
index b376b0b..8fba933 100644
--- a/query_optimizer/rules/UnnestSubqueries.cpp
+++ b/query_optimizer/rules/UnnestSubqueries.cpp
@@ -23,6 +23,7 @@
#include <functional>
#include <memory>
#include <set>
+#include <unordered_map>
#include <utility>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/rules/tests/PushDownFilter_unittest.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/tests/PushDownFilter_unittest.cpp b/query_optimizer/rules/tests/PushDownFilter_unittest.cpp
index 9f26180..6956ac6 100644
--- a/query_optimizer/rules/tests/PushDownFilter_unittest.cpp
+++ b/query_optimizer/rules/tests/PushDownFilter_unittest.cpp
@@ -19,6 +19,8 @@
#include "query_optimizer/rules/PushDownFilter.hpp"
+#include <memory>
+
#include "query_optimizer/expressions/Alias.hpp"
#include "query_optimizer/expressions/AttributeReference.hpp"
#include "query_optimizer/expressions/ComparisonExpression.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/rules/tests/UpdateExpression_unittest.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/tests/UpdateExpression_unittest.cpp b/query_optimizer/rules/tests/UpdateExpression_unittest.cpp
index f13b685..37012d4 100644
--- a/query_optimizer/rules/tests/UpdateExpression_unittest.cpp
+++ b/query_optimizer/rules/tests/UpdateExpression_unittest.cpp
@@ -20,6 +20,8 @@
#include "query_optimizer/rules/UpdateExpression.hpp"
#include <map>
+#include <memory>
+#include <unordered_map>
#include "query_optimizer/expressions/Alias.hpp"
#include "query_optimizer/expressions/AttributeReference.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/strategy/tests/Aggregate_unittest.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/strategy/tests/Aggregate_unittest.cpp b/query_optimizer/strategy/tests/Aggregate_unittest.cpp
index 8eb5e93..ecf94b2 100644
--- a/query_optimizer/strategy/tests/Aggregate_unittest.cpp
+++ b/query_optimizer/strategy/tests/Aggregate_unittest.cpp
@@ -19,6 +19,7 @@
#include "query_optimizer/strategy/Aggregate.hpp"
+#include <memory>
#include <vector>
#include "expressions/aggregation/AggregateFunctionFactory.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/strategy/tests/Join_unittest.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/strategy/tests/Join_unittest.cpp b/query_optimizer/strategy/tests/Join_unittest.cpp
index ad34bec..14025c3 100644
--- a/query_optimizer/strategy/tests/Join_unittest.cpp
+++ b/query_optimizer/strategy/tests/Join_unittest.cpp
@@ -19,6 +19,7 @@
#include "query_optimizer/strategy/Join.hpp"
+#include <memory>
#include <vector>
#include "query_optimizer/OptimizerContext.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/strategy/tests/OneToOne_unittest.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/strategy/tests/OneToOne_unittest.cpp b/query_optimizer/strategy/tests/OneToOne_unittest.cpp
index 9dda602..a07c110 100644
--- a/query_optimizer/strategy/tests/OneToOne_unittest.cpp
+++ b/query_optimizer/strategy/tests/OneToOne_unittest.cpp
@@ -19,6 +19,8 @@
#include "query_optimizer/strategy/OneToOne.hpp"
+#include <memory>
+
#include "query_optimizer/logical/Logical.hpp"
#include "query_optimizer/logical/TableReference.hpp"
#include "query_optimizer/logical/TopLevelPlan.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/strategy/tests/Selection_unittest.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/strategy/tests/Selection_unittest.cpp b/query_optimizer/strategy/tests/Selection_unittest.cpp
index 35b0bd2..58fe379 100644
--- a/query_optimizer/strategy/tests/Selection_unittest.cpp
+++ b/query_optimizer/strategy/tests/Selection_unittest.cpp
@@ -19,6 +19,8 @@
#include "query_optimizer/strategy/Selection.hpp"
+#include <memory>
+
#include "query_optimizer/OptimizerContext.hpp"
#include "query_optimizer/expressions/Alias.hpp"
#include "query_optimizer/expressions/AttributeReference.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/strategy/tests/StrategyTest.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/strategy/tests/StrategyTest.hpp b/query_optimizer/strategy/tests/StrategyTest.hpp
index dcad010..2fcf205 100644
--- a/query_optimizer/strategy/tests/StrategyTest.hpp
+++ b/query_optimizer/strategy/tests/StrategyTest.hpp
@@ -20,6 +20,8 @@
#ifndef QUICKSTEP_QUERY_OPTIMIZER_STRATEGY_TESTS_STRATEGY_TEST_HPP_
#define QUICKSTEP_QUERY_OPTIMIZER_STRATEGY_TESTS_STRATEGY_TEST_HPP_
+#include <memory>
+
#include "query_optimizer/logical/Logical.hpp"
#include "query_optimizer/physical/Physical.hpp"
#include "query_optimizer/strategy/Strategy.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/tests/ExecutionGeneratorTestRunner.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/tests/ExecutionGeneratorTestRunner.cpp b/query_optimizer/tests/ExecutionGeneratorTestRunner.cpp
index a854589..39c0c78 100644
--- a/query_optimizer/tests/ExecutionGeneratorTestRunner.cpp
+++ b/query_optimizer/tests/ExecutionGeneratorTestRunner.cpp
@@ -43,7 +43,7 @@ class CatalogRelation;
namespace optimizer {
-const std::string ExecutionGeneratorTestRunner::kResetOption =
+const char ExecutionGeneratorTestRunner::kResetOption[] =
"reset_before_execution";
void ExecutionGeneratorTestRunner::runTestCase(
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/query_optimizer/tests/ExecutionGeneratorTestRunner.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/tests/ExecutionGeneratorTestRunner.hpp b/query_optimizer/tests/ExecutionGeneratorTestRunner.hpp
index f4e11ea..ff4f9c8 100644
--- a/query_optimizer/tests/ExecutionGeneratorTestRunner.hpp
+++ b/query_optimizer/tests/ExecutionGeneratorTestRunner.hpp
@@ -53,7 +53,7 @@ class ExecutionGeneratorTestRunner : public TextBasedTestRunner {
* @brief If this option is enabled, recreate the entire database and
* repopulate the data before every test.
*/
- static const std::string kResetOption;
+ static const char kResetOption[];
/**
* @brief Constructor.
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/relational_operators/AggregationOperator.hpp
----------------------------------------------------------------------
diff --git a/relational_operators/AggregationOperator.hpp b/relational_operators/AggregationOperator.hpp
index c673ff5..91065b5 100644
--- a/relational_operators/AggregationOperator.hpp
+++ b/relational_operators/AggregationOperator.hpp
@@ -21,6 +21,7 @@
#define QUICKSTEP_RELATIONAL_OPERATORS_AGGREGATION_OPERATOR_HPP_
#include <cstddef>
+#include <memory>
#include <string>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/relational_operators/InsertOperator.cpp
----------------------------------------------------------------------
diff --git a/relational_operators/InsertOperator.cpp b/relational_operators/InsertOperator.cpp
index b8c9f07..e675615 100644
--- a/relational_operators/InsertOperator.cpp
+++ b/relational_operators/InsertOperator.cpp
@@ -20,6 +20,7 @@
#include "relational_operators/InsertOperator.hpp"
#include <memory>
+#include <utility>
#include <vector>
#include "query_execution/QueryContext.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/relational_operators/InsertOperator.hpp
----------------------------------------------------------------------
diff --git a/relational_operators/InsertOperator.hpp b/relational_operators/InsertOperator.hpp
index 3865a7f..b019803 100644
--- a/relational_operators/InsertOperator.hpp
+++ b/relational_operators/InsertOperator.hpp
@@ -23,6 +23,7 @@
#include <cstddef>
#include <string>
#include <memory>
+#include <utility>
#include <vector>
#include "catalog/CatalogRelation.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/relational_operators/WindowAggregationOperator.cpp
----------------------------------------------------------------------
diff --git a/relational_operators/WindowAggregationOperator.cpp b/relational_operators/WindowAggregationOperator.cpp
index 2fd9e32..faa63ea 100644
--- a/relational_operators/WindowAggregationOperator.cpp
+++ b/relational_operators/WindowAggregationOperator.cpp
@@ -19,6 +19,7 @@
#include "relational_operators/WindowAggregationOperator.hpp"
+#include <utility>
#include <vector>
#include "catalog/CatalogRelation.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/relational_operators/WindowAggregationOperator.hpp
----------------------------------------------------------------------
diff --git a/relational_operators/WindowAggregationOperator.hpp b/relational_operators/WindowAggregationOperator.hpp
index beaf1a3..739bae2 100644
--- a/relational_operators/WindowAggregationOperator.hpp
+++ b/relational_operators/WindowAggregationOperator.hpp
@@ -21,6 +21,7 @@
#define QUICKSTEP_RELATIONAL_OPERATORS_WINDOW_AGGREGATION_OPERATOR_HPP_
#include <string>
+#include <utility>
#include <vector>
#include "catalog/CatalogRelation.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/storage/BasicColumnStoreTupleStorageSubBlock.hpp
----------------------------------------------------------------------
diff --git a/storage/BasicColumnStoreTupleStorageSubBlock.hpp b/storage/BasicColumnStoreTupleStorageSubBlock.hpp
index e896a7a..0affc83 100644
--- a/storage/BasicColumnStoreTupleStorageSubBlock.hpp
+++ b/storage/BasicColumnStoreTupleStorageSubBlock.hpp
@@ -131,8 +131,8 @@ class BasicColumnStoreTupleStorageSubBlock : public TupleStorageSubBlock {
return header_->num_tuples - 1;
}
- bool hasTupleWithID(const tuple_id tuple) const override {
- return ((tuple >=0) && (tuple < header_->num_tuples));
+ bool hasTupleWithID(const tuple_id tid) const override {
+ return ((tid >=0) && (tid < header_->num_tuples));
}
InsertResult insertTuple(const Tuple &tuple) override;
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/storage/BasicColumnStoreValueAccessor.hpp
----------------------------------------------------------------------
diff --git a/storage/BasicColumnStoreValueAccessor.hpp b/storage/BasicColumnStoreValueAccessor.hpp
index 7516dc9..8c8ee6a 100644
--- a/storage/BasicColumnStoreValueAccessor.hpp
+++ b/storage/BasicColumnStoreValueAccessor.hpp
@@ -20,6 +20,7 @@
#ifndef QUICKSTEP_STORAGE_BASIC_COLUMN_STORE_VALUE_ACCESSOR_HPP_
#define QUICKSTEP_STORAGE_BASIC_COLUMN_STORE_VALUE_ACCESSOR_HPP_
+#include <memory>
#include <vector>
#include "catalog/CatalogRelationSchema.hpp"
@@ -108,25 +109,25 @@ class BasicColumnStoreValueAccessorHelper {
}
template <bool check_null>
- inline const void* getAttributeValue(const tuple_id tuple,
+ inline const void* getAttributeValue(const tuple_id tid,
const attribute_id attr) const {
- DEBUG_ASSERT(tuple < num_tuples_);
+ DEBUG_ASSERT(tid < num_tuples_);
DEBUG_ASSERT(relation_.hasAttributeWithId(attr));
if (check_null
&& (!column_null_bitmaps_.elementIsNull(attr))
- && column_null_bitmaps_[attr].getBit(tuple)) {
+ && column_null_bitmaps_[attr].getBit(tid)) {
return nullptr;
}
// TODO(chasseur): Consider cacheing the byte lengths of attributes.
return static_cast<const char*>(column_stripes_[attr])
- + (tuple * relation_.getAttributeById(attr)->getType().maximumByteLength());
+ + (tid * relation_.getAttributeById(attr)->getType().maximumByteLength());
}
- inline TypedValue getAttributeValueTyped(const tuple_id tuple,
+ inline TypedValue getAttributeValueTyped(const tuple_id tid,
const attribute_id attr) const {
const Type &attr_type = relation_.getAttributeById(attr)->getType();
- const void *untyped_value = getAttributeValue<true>(tuple, attr);
+ const void *untyped_value = getAttributeValue<true>(tid, attr);
return (untyped_value == nullptr)
? attr_type.makeNullValue()
: attr_type.makeValue(untyped_value, attr_type.maximumByteLength());
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/storage/CollisionFreeVectorTable.hpp
----------------------------------------------------------------------
diff --git a/storage/CollisionFreeVectorTable.hpp b/storage/CollisionFreeVectorTable.hpp
index 8e1342b..2660cc4 100644
--- a/storage/CollisionFreeVectorTable.hpp
+++ b/storage/CollisionFreeVectorTable.hpp
@@ -26,6 +26,7 @@
#include <cstdint>
#include <cstring>
#include <memory>
+#include <utility>
#include <vector>
#include "catalog/CatalogTypedefs.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/storage/CompressedTupleStorageSubBlock.hpp
----------------------------------------------------------------------
diff --git a/storage/CompressedTupleStorageSubBlock.hpp b/storage/CompressedTupleStorageSubBlock.hpp
index 926ef4f..d89a529 100644
--- a/storage/CompressedTupleStorageSubBlock.hpp
+++ b/storage/CompressedTupleStorageSubBlock.hpp
@@ -119,8 +119,8 @@ class CompressedTupleStorageSubBlock : public TupleStorageSubBlock {
return *static_cast<const tuple_id*>(sub_block_memory_) - 1;
}
- bool hasTupleWithID(const tuple_id tuple) const override {
- return tuple < *static_cast<const tuple_id*>(sub_block_memory_);
+ bool hasTupleWithID(const tuple_id tid) const override {
+ return tid < *static_cast<const tuple_id*>(sub_block_memory_);
}
InsertResult insertTuple(const Tuple &tuple) override {
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/storage/LinearOpenAddressingHashTable.hpp
----------------------------------------------------------------------
diff --git a/storage/LinearOpenAddressingHashTable.hpp b/storage/LinearOpenAddressingHashTable.hpp
index 044ec6f..a654b3f 100644
--- a/storage/LinearOpenAddressingHashTable.hpp
+++ b/storage/LinearOpenAddressingHashTable.hpp
@@ -27,6 +27,7 @@
#include <limits>
#include <memory>
#include <type_traits>
+#include <utility>
#include <vector>
#include "storage/HashTable.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/storage/PackedPayloadHashTable.cpp
----------------------------------------------------------------------
diff --git a/storage/PackedPayloadHashTable.cpp b/storage/PackedPayloadHashTable.cpp
index 1df20d0..28935b2 100644
--- a/storage/PackedPayloadHashTable.cpp
+++ b/storage/PackedPayloadHashTable.cpp
@@ -23,6 +23,7 @@
#include <cstddef>
#include <cstdint>
#include <cstdlib>
+#include <utility>
#include <vector>
#include "expressions/aggregation/AggregationHandle.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/storage/SplitRowStoreTupleStorageSubBlock.cpp
----------------------------------------------------------------------
diff --git a/storage/SplitRowStoreTupleStorageSubBlock.cpp b/storage/SplitRowStoreTupleStorageSubBlock.cpp
index 9f5a839..c40ce01 100644
--- a/storage/SplitRowStoreTupleStorageSubBlock.cpp
+++ b/storage/SplitRowStoreTupleStorageSubBlock.cpp
@@ -22,6 +22,7 @@
#include <cstddef>
#include <cstdint>
#include <cstring>
+#include <unordered_map>
#include <utility>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/storage/SplitRowStoreTupleStorageSubBlock.hpp
----------------------------------------------------------------------
diff --git a/storage/SplitRowStoreTupleStorageSubBlock.hpp b/storage/SplitRowStoreTupleStorageSubBlock.hpp
index c5a9528..a00195b 100644
--- a/storage/SplitRowStoreTupleStorageSubBlock.hpp
+++ b/storage/SplitRowStoreTupleStorageSubBlock.hpp
@@ -24,6 +24,7 @@
#include <cstdint>
#include <memory>
#include <unordered_map>
+#include <utility>
#include <vector>
#include "expressions/predicate/PredicateCost.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/storage/StorageManager.cpp
----------------------------------------------------------------------
diff --git a/storage/StorageManager.cpp b/storage/StorageManager.cpp
index 5924607..12a96d1 100644
--- a/storage/StorageManager.cpp
+++ b/storage/StorageManager.cpp
@@ -57,6 +57,7 @@
#include <memory>
#include <string>
#include <unordered_map>
+#include <utility>
#include <vector>
#include "catalog/CatalogTypedefs.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/storage/SubBlockTypeRegistry.cpp
----------------------------------------------------------------------
diff --git a/storage/SubBlockTypeRegistry.cpp b/storage/SubBlockTypeRegistry.cpp
index d35e422..07e8f48 100644
--- a/storage/SubBlockTypeRegistry.cpp
+++ b/storage/SubBlockTypeRegistry.cpp
@@ -20,6 +20,7 @@
#include "storage/SubBlockTypeRegistry.hpp"
#include <cstddef>
+#include <unordered_map>
#include "storage/StorageBlockLayout.pb.h"
#include "utility/Macros.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/storage/ThreadPrivateCompactKeyHashTable.cpp
----------------------------------------------------------------------
diff --git a/storage/ThreadPrivateCompactKeyHashTable.cpp b/storage/ThreadPrivateCompactKeyHashTable.cpp
index fb68940..2b18f3a 100644
--- a/storage/ThreadPrivateCompactKeyHashTable.cpp
+++ b/storage/ThreadPrivateCompactKeyHashTable.cpp
@@ -22,7 +22,9 @@
#include <algorithm>
#include <cstddef>
#include <cstdint>
+#include <memory>
#include <type_traits>
+#include <utility>
#include <vector>
#include "expressions/aggregation/AggregationHandle.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/storage/tests/BloomFilterIndexSubBlock_unittest.cpp
----------------------------------------------------------------------
diff --git a/storage/tests/BloomFilterIndexSubBlock_unittest.cpp b/storage/tests/BloomFilterIndexSubBlock_unittest.cpp
index 4f77c11..0287240 100644
--- a/storage/tests/BloomFilterIndexSubBlock_unittest.cpp
+++ b/storage/tests/BloomFilterIndexSubBlock_unittest.cpp
@@ -24,6 +24,7 @@
#include <memory>
#include <sstream>
#include <string>
+#include <utility>
#include <vector>
#include "catalog/CatalogAttribute.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/storage/tests/FileManager_unittest_common.hpp
----------------------------------------------------------------------
diff --git a/storage/tests/FileManager_unittest_common.hpp b/storage/tests/FileManager_unittest_common.hpp
index 06d64ec..f1172db 100644
--- a/storage/tests/FileManager_unittest_common.hpp
+++ b/storage/tests/FileManager_unittest_common.hpp
@@ -32,13 +32,9 @@
namespace quickstep {
-namespace {
-
static const char kSampleString[kSlotSizeBytes] =
"All animals are equal, but some animals are more equal than others.";
-} // namespace
-
template <typename FileManagerImpl>
class FileManagerTest : public ::testing::Test {
protected:
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d886ddb0/storage/tests/StorageBlockSort_unittest.cpp
----------------------------------------------------------------------
diff --git a/storage/tests/StorageBlockSort_unittest.cpp b/storage/tests/StorageBlockSort_unittest.cpp
index 559f6c3..4fded73 100644
--- a/storage/tests/StorageBlockSort_unittest.cpp
+++ b/storage/tests/StorageBlockSort_unittest.cpp
@@ -22,6 +22,7 @@
#include <limits>
#include <memory>
#include <string>
+#include <utility>
#include <vector>
#include "gtest/gtest.h"