You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2020/08/26 02:51:59 UTC
[incubator-doris] branch master updated: [Code Cleanup] Template
nest convert to c++11 syntax and style (#4442)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 97d9634 [Code Cleanup] Template nest convert to c++11 syntax and style (#4442)
97d9634 is described below
commit 97d963468a6486b61037e3089ae60d4bd163f657
Author: ZhangYu0123 <67...@users.noreply.github.com>
AuthorDate: Wed Aug 26 10:51:52 2020 +0800
[Code Cleanup] Template nest convert to c++11 syntax and style (#4442)
---
be/src/exec/analytic_eval_node.cpp | 4 ++--
be/src/exec/analytic_eval_node.h | 4 ++--
be/src/exec/es_scan_node.cpp | 2 +-
be/src/exec/merge_node.cpp | 4 ++--
be/src/exec/merge_node.h | 4 ++--
be/src/exec/olap_common.h | 2 +-
be/src/exec/olap_scan_node.h | 2 +-
be/src/exec/topn_node.h | 2 +-
be/src/exprs/json_functions.cpp | 8 +++----
be/src/gutil/gscoped_ptr.h | 4 ++--
be/src/gutil/hash/hash.h | 12 +++++-----
be/src/gutil/ref_counted.h | 6 ++---
be/src/gutil/stl_util.h | 2 +-
be/src/gutil/strings/join.cc | 2 +-
be/src/gutil/strings/join.h | 2 +-
be/src/gutil/strings/split.cc | 12 +++++-----
be/src/gutil/strings/split.h | 2 +-
be/src/gutil/strings/split_internal.h | 2 +-
be/src/gutil/type_traits.h | 8 +++----
be/src/olap/rowset/segment_group.cpp | 2 +-
be/src/olap/rowset/segment_group.h | 2 +-
be/src/runtime/buffered_block_mgr2.h | 2 +-
be/src/runtime/buffered_tuple_stream2.h | 4 ++--
be/src/runtime/client_cache.h | 2 +-
be/src/runtime/data_stream_mgr.h | 2 +-
be/src/runtime/data_stream_recvr.cc | 2 +-
be/src/runtime/disk_io_mgr.h | 2 +-
be/src/runtime/plan_fragment_executor.h | 2 +-
be/src/runtime/result_buffer_mgr.cpp | 2 +-
be/src/runtime/result_buffer_mgr.h | 2 +-
be/src/runtime/spill_sorter.cc | 2 +-
be/src/runtime/test_env.h | 2 +-
be/src/util/perf_counters.h | 2 +-
be/src/util/runtime_profile.h | 4 ++--
be/src/util/thrift_server.h | 2 +-
.../rowset/segment_v2/bitshuffle_page_test.cpp | 26 +++++++++++-----------
.../segment_v2/frame_of_reference_page_test.cpp | 18 +++++++--------
be/test/olap/rowset/segment_v2/plain_page_test.cpp | 26 +++++++++++-----------
be/test/olap/rowset/segment_v2/rle_page_test.cpp | 8 +++----
be/test/runtime/buffered_block_mgr2_test.cpp | 8 +++----
be/test/util/blocking_queue_test.cpp | 2 +-
be/test/util/internal_queue_test.cpp | 2 +-
42 files changed, 105 insertions(+), 105 deletions(-)
diff --git a/be/src/exec/analytic_eval_node.cpp b/be/src/exec/analytic_eval_node.cpp
index b4e97e5..2ff8c22 100644
--- a/be/src/exec/analytic_eval_node.cpp
+++ b/be/src/exec/analytic_eval_node.cpp
@@ -330,7 +330,7 @@ std::string AnalyticEvalNode::debug_state_string(bool detailed) const {
if (detailed) {
ss << " result_tuples idx: [";
- for (std::list<std::pair<int64_t, Tuple*> >::const_iterator it = _result_tuples.begin();
+ for (std::list<std::pair<int64_t, Tuple*>>::const_iterator it = _result_tuples.begin();
it != _result_tuples.end(); ++it) {
ss << it->first;
@@ -344,7 +344,7 @@ std::string AnalyticEvalNode::debug_state_string(bool detailed) const {
if (_fn_scope == ROWS && _window.__isset.window_start) {
ss << " window_tuples idx: [";
- for (std::list<std::pair<int64_t, Tuple*> >::const_iterator it = _window_tuples.begin();
+ for (std::list<std::pair<int64_t, Tuple*>>::const_iterator it = _window_tuples.begin();
it != _window_tuples.end(); ++it) {
ss << it->first;
diff --git a/be/src/exec/analytic_eval_node.h b/be/src/exec/analytic_eval_node.h
index f15c84f..5e95ce3 100644
--- a/be/src/exec/analytic_eval_node.h
+++ b/be/src/exec/analytic_eval_node.h
@@ -246,7 +246,7 @@ private:
// may be a single result tuple per output row and _result_tuples.size() may be one
// less than the row batch size, in which case we will process another input row batch
// (inserting one result tuple per input row) before returning a row batch.
- std::list<std::pair<int64_t, Tuple*> > _result_tuples;
+ std::list<std::pair<int64_t, Tuple*>> _result_tuples;
// Index in _input_stream of the most recently added result tuple.
int64_t _last_result_idx;
@@ -256,7 +256,7 @@ private:
// window start bound is PRECEDING or FOLLOWING. Tuples in this list are deep copied
// and owned by curr_window_tuple_pool_.
// TODO: Remove and use BufferedTupleStream (needs support for multiple readers).
- std::list<std::pair<int64_t, Tuple*> > _window_tuples;
+ std::list<std::pair<int64_t, Tuple*>> _window_tuples;
TupleDescriptor* _child_tuple_desc;
// Pools used to allocate result tuples (added to _result_tuples and later returned)
diff --git a/be/src/exec/es_scan_node.cpp b/be/src/exec/es_scan_node.cpp
index c3e426c..1acfefb 100644
--- a/be/src/exec/es_scan_node.cpp
+++ b/be/src/exec/es_scan_node.cpp
@@ -99,7 +99,7 @@ Status EsScanNode::open(RuntimeState* state) {
row_schema.__isset.cols = true;
// TExtOpenParams.predicates
- vector<vector<TExtPredicate> > predicates;
+ vector<vector<TExtPredicate>> predicates;
vector<int> predicate_to_conjunct;
for (int i = 0; i < _conjunct_ctxs.size(); ++i) {
VLOG(1) << "conjunct: " << _conjunct_ctxs[i]->root()->debug_string();
diff --git a/be/src/exec/merge_node.cpp b/be/src/exec/merge_node.cpp
index dabde59..a979d95 100644
--- a/be/src/exec/merge_node.cpp
+++ b/be/src/exec/merge_node.cpp
@@ -42,14 +42,14 @@ Status MergeNode::init(const TPlanNode& tnode, RuntimeState* state) {
RETURN_IF_ERROR(ExecNode::init(tnode, state));
DCHECK(tnode.__isset.merge_node);
// Create _const_expr_lists from thrift exprs.
- const vector<vector<TExpr> >& const_texpr_lists = tnode.merge_node.const_expr_lists;
+ const vector<vector<TExpr>>& const_texpr_lists = tnode.merge_node.const_expr_lists;
for (int i = 0; i < const_texpr_lists.size(); ++i) {
vector<ExprContext*> ctxs;
RETURN_IF_ERROR(Expr::create_expr_trees(_pool, const_texpr_lists[i], &ctxs));
_const_result_expr_ctx_lists.push_back(ctxs);
}
// Create _result_expr__ctx_lists from thrift exprs.
- const vector<vector<TExpr> >& result_texpr_lists = tnode.merge_node.result_expr_lists;
+ const vector<vector<TExpr>>& result_texpr_lists = tnode.merge_node.result_expr_lists;
for (int i = 0; i < result_texpr_lists.size(); ++i) {
vector<ExprContext*> ctxs;
RETURN_IF_ERROR(Expr::create_expr_trees(_pool, result_texpr_lists[i], &ctxs));
diff --git a/be/src/exec/merge_node.h b/be/src/exec/merge_node.h
index f5bc559..3d5214c 100644
--- a/be/src/exec/merge_node.h
+++ b/be/src/exec/merge_node.h
@@ -58,10 +58,10 @@ private:
std::vector<SlotDescriptor*> _materialized_slots;
// Const exprs materialized by this node. These exprs don't refer to any children.
- std::vector<std::vector<ExprContext*> > _const_result_expr_ctx_lists;
+ std::vector<std::vector<ExprContext*>> _const_result_expr_ctx_lists;
// Exprs materialized by this node. The i-th result expr list refers to the i-th child.
- std::vector<std::vector<ExprContext*> > _result_expr_ctx_lists;
+ std::vector<std::vector<ExprContext*>> _result_expr_ctx_lists;
// Index of current const result expr list.
int _const_result_expr_idx;
diff --git a/be/src/exec/olap_common.h b/be/src/exec/olap_common.h
index 1a52603..6cba3ef 100644
--- a/be/src/exec/olap_common.h
+++ b/be/src/exec/olap_common.h
@@ -258,7 +258,7 @@ typedef boost::variant <
ColumnValueRange<DateTimeValue>,
ColumnValueRange<DecimalValue>,
ColumnValueRange<DecimalV2Value>,
- ColumnValueRange<bool> > ColumnValueRangeType;
+ ColumnValueRange<bool>> ColumnValueRangeType;
template<class T>
ColumnValueRange<T>::ColumnValueRange() : _column_type(INVALID_TYPE) {
diff --git a/be/src/exec/olap_scan_node.h b/be/src/exec/olap_scan_node.h
index aa0127d..ca3a49f 100644
--- a/be/src/exec/olap_scan_node.h
+++ b/be/src/exec/olap_scan_node.h
@@ -182,7 +182,7 @@ private:
OlapScanKeys _scan_keys;
- std::vector<std::unique_ptr<TPaloScanRange> > _scan_ranges;
+ std::vector<std::unique_ptr<TPaloScanRange>> _scan_ranges;
std::vector<TCondition> _olap_filter;
diff --git a/be/src/exec/topn_node.h b/be/src/exec/topn_node.h
index 1d5ad30..cf37f97 100644
--- a/be/src/exec/topn_node.h
+++ b/be/src/exec/topn_node.h
@@ -108,7 +108,7 @@ private:
// of the queue is the last sorted element.
boost::scoped_ptr<
std::priority_queue<
- Tuple*, std::vector<Tuple*>, TupleRowComparator> > _priority_queue;
+ Tuple*, std::vector<Tuple*>, TupleRowComparator>> _priority_queue;
// END: Members that must be Reset()
/////////////////////////////////////////
diff --git a/be/src/exprs/json_functions.cpp b/be/src/exprs/json_functions.cpp
index 8deead4..2d9985a 100644
--- a/be/src/exprs/json_functions.cpp
+++ b/be/src/exprs/json_functions.cpp
@@ -229,13 +229,13 @@ rapidjson::Value* JsonFunctions::get_json_object(
#ifndef BE_TEST
parsed_paths = reinterpret_cast<std::vector<JsonPath>*>(context->get_function_state(FunctionContext::FRAGMENT_LOCAL));
if (parsed_paths == nullptr) {
- boost::tokenizer<boost::escaped_list_separator<char> > tok(path_string, boost::escaped_list_separator<char>("\\", ".", "\""));
+ boost::tokenizer<boost::escaped_list_separator<char>> tok(path_string, boost::escaped_list_separator<char>("\\", ".", "\""));
std::vector<std::string> paths(tok.begin(), tok.end());
get_parsed_paths(paths, &tmp_parsed_paths);
parsed_paths = &tmp_parsed_paths;
}
#else
- boost::tokenizer<boost::escaped_list_separator<char> > tok(path_string, boost::escaped_list_separator<char>("\\", ".", "\""));
+ boost::tokenizer<boost::escaped_list_separator<char>> tok(path_string, boost::escaped_list_separator<char>("\\", ".", "\""));
std::vector<std::string> paths(tok.begin(), tok.end());
get_parsed_paths(paths, &tmp_parsed_paths);
parsed_paths = &tmp_parsed_paths;
@@ -332,7 +332,7 @@ void JsonFunctions::json_path_prepare(
}
std::string path_str(reinterpret_cast<char*>(path->ptr), path->len);
- boost::tokenizer<boost::escaped_list_separator<char> > tok(path_str,
+ boost::tokenizer<boost::escaped_list_separator<char>> tok(path_str,
boost::escaped_list_separator<char>("\\", ".", "\""));
std::vector<std::string> path_exprs(tok.begin(), tok.end());
std::vector<JsonPath>* parsed_paths = new std::vector<JsonPath>();
@@ -363,7 +363,7 @@ void JsonFunctions::parse_json_paths(
// '$.text#abc.xyz' -> [$, text#abc, xyz]
// '$."text.abc".xyz' -> [$, text.abc, xyz]
// '$."text.abc"[1].xyz' -> [$, text.abc[1], xyz]
- boost::tokenizer<boost::escaped_list_separator<char> > tok(path_string, boost::escaped_list_separator<char>("\\", ".", "\""));
+ boost::tokenizer<boost::escaped_list_separator<char>> tok(path_string, boost::escaped_list_separator<char>("\\", ".", "\""));
std::vector<std::string> paths(tok.begin(), tok.end());
get_parsed_paths(paths, parsed_paths);
}
diff --git a/be/src/gutil/gscoped_ptr.h b/be/src/gutil/gscoped_ptr.h
index 21d8b1a..5472e67 100644
--- a/be/src/gutil/gscoped_ptr.h
+++ b/be/src/gutil/gscoped_ptr.h
@@ -314,7 +314,7 @@ class gscoped_ptr_impl {
// unique_ptr<> features. Known deficiencies include not supporting move-only
// deleteres, function pointers as deleters, and deleters with reference
// types.
-template <class T, class D = doris::DefaultDeleter<T> >
+template <class T, class D = doris::DefaultDeleter<T>>
class gscoped_ptr {
MOVE_ONLY_TYPE_FOR_CPP_03(gscoped_ptr, RValue)
@@ -821,7 +821,7 @@ bool operator!=(C* p, const gscoped_ptr_malloc<C, FP>& b) {
// A function to convert T* into gscoped_ptr<T>
// Doing e.g. make_gscoped_ptr(new FooBarBaz<type>(arg)) is a shorter notation
-// for gscoped_ptr<FooBarBaz<type> >(new FooBarBaz<type>(arg))
+// for gscoped_ptr<FooBarBaz<type>>(new FooBarBaz<type>(arg))
template <typename T>
gscoped_ptr<T> make_gscoped_ptr(T* ptr) {
return gscoped_ptr<T>(ptr);
diff --git a/be/src/gutil/hash/hash.h b/be/src/gutil/hash/hash.h
index f6a8b0a..5bf76e8 100644
--- a/be/src/gutil/hash/hash.h
+++ b/be/src/gutil/hash/hash.h
@@ -20,8 +20,8 @@
// RECOMMENDED HASH FOR STRINGS: GoodFastHash
//
// It is a functor, so you can use it like this:
-// hash_map<string, xxx, GoodFastHash<string> >
-// hash_set<char *, GoodFastHash<char*> >
+// hash_map<string, xxx, GoodFastHash<string>>
+// hash_set<char *, GoodFastHash<char*>>
//
// RECOMMENDED HASH FOR NUMBERS: hash<>
//
@@ -259,7 +259,7 @@ template<class T> struct hash<T*> {
#if defined(__GNUC__)
// Use our nice hash function for strings
template<class _CharT, class _Traits, class _Alloc>
-struct hash<std::basic_string<_CharT, _Traits, _Alloc> > {
+struct hash<std::basic_string<_CharT, _Traits, _Alloc>> {
size_t operator()(const std::basic_string<_CharT, _Traits, _Alloc>& k) const {
return HashTo32(k.data(), static_cast<uint32>(k.length()));
}
@@ -306,7 +306,7 @@ template<> struct hash<std::string> {
// Hasher for STL pairs. Requires hashers for both members to be defined
template<class First, class Second>
-struct hash<pair<First, Second> > {
+struct hash<pair<First, Second>> {
size_t operator()(const pair<First, Second>& p) const {
size_t h1 = hash<First>()(p.first);
size_t h2 = hash<Second>()(p.second);
@@ -369,7 +369,7 @@ template<> struct GoodFastHash<const char*> {
// This intended to be a "good" hash function. It may change from time to time.
template<class _CharT, class _Traits, class _Alloc>
-struct GoodFastHash<std::basic_string<_CharT, _Traits, _Alloc> > {
+struct GoodFastHash<std::basic_string<_CharT, _Traits, _Alloc>> {
size_t operator()(const std::basic_string<_CharT, _Traits, _Alloc>& k) const {
return HashStringThoroughly(k.data(), k.length() * sizeof(k[0]));
}
@@ -384,7 +384,7 @@ struct GoodFastHash<std::basic_string<_CharT, _Traits, _Alloc> > {
// This intended to be a "good" hash function. It may change from time to time.
template<class _CharT, class _Traits, class _Alloc>
-struct GoodFastHash<const std::basic_string<_CharT, _Traits, _Alloc> > {
+struct GoodFastHash<const std::basic_string<_CharT, _Traits, _Alloc>> {
size_t operator()(const std::basic_string<_CharT, _Traits, _Alloc>& k) const {
return HashStringThoroughly(k.data(), k.length() * sizeof(k[0]));
}
diff --git a/be/src/gutil/ref_counted.h b/be/src/gutil/ref_counted.h
index 5cd73b2..ca99381 100644
--- a/be/src/gutil/ref_counted.h
+++ b/be/src/gutil/ref_counted.h
@@ -130,7 +130,7 @@ struct DefaultRefCountedThreadSafeTraits {
// private:
// friend class RefCountedThreadSafe<MyFoo>;
// ~MyFoo();
-template <class T, typename Traits = DefaultRefCountedThreadSafeTraits<T> >
+template <class T, typename Traits = DefaultRefCountedThreadSafeTraits<T>>
class RefCountedThreadSafe : public subtle::RefCountedThreadSafeBase {
public:
RefCountedThreadSafe() {}
@@ -161,7 +161,7 @@ class RefCountedThreadSafe : public subtle::RefCountedThreadSafeBase {
//
template<typename T>
class RefCountedData
- : public doris::RefCountedThreadSafe< doris::RefCountedData<T> > {
+ : public doris::RefCountedThreadSafe< doris::RefCountedData<T>> {
public:
RefCountedData() : data() {}
RefCountedData(const T& in_value) : data(in_value) {}
@@ -169,7 +169,7 @@ class RefCountedData
T data;
private:
- friend class doris::RefCountedThreadSafe<doris::RefCountedData<T> >;
+ friend class doris::RefCountedThreadSafe<doris::RefCountedData<T>>;
~RefCountedData() {}
};
diff --git a/be/src/gutil/stl_util.h b/be/src/gutil/stl_util.h
index 7e72b25..d841ca8 100644
--- a/be/src/gutil/stl_util.h
+++ b/be/src/gutil/stl_util.h
@@ -836,7 +836,7 @@ BinaryComposeBinary<F, G1, G2> BinaryCompose2(F f, G1 g1, G2 g2) {
// THREAD SAFE. This should only be used in situations where you can
// ensure that only a single thread performs allocation and
// deallocation.
-template <typename T, typename Alloc = std::allocator<T> >
+template <typename T, typename Alloc = std::allocator<T>>
class STLCountingAllocator : public Alloc {
public:
typedef typename Alloc::pointer pointer;
diff --git a/be/src/gutil/strings/join.cc b/be/src/gutil/strings/join.cc
index 29201ab..21b706b 100644
--- a/be/src/gutil/strings/join.cc
+++ b/be/src/gutil/strings/join.cc
@@ -133,7 +133,7 @@ void JoinMapKeysAndValues(const map<string, string>& components,
result);
}
-void JoinVectorKeysAndValues(const vector< pair<string, string> >& components,
+void JoinVectorKeysAndValues(const vector< pair<string, string>>& components,
const StringPiece& intra_delim,
const StringPiece& inter_delim,
string* result) {
diff --git a/be/src/gutil/strings/join.h b/be/src/gutil/strings/join.h
index bd34c39..d6f2b54 100644
--- a/be/src/gutil/strings/join.h
+++ b/be/src/gutil/strings/join.h
@@ -283,7 +283,7 @@ void JoinMapKeysAndValues(const map<string, string>& components,
const StringPiece& intra_delim,
const StringPiece& inter_delim,
string* result);
-void JoinVectorKeysAndValues(const vector< pair<string, string> >& components,
+void JoinVectorKeysAndValues(const vector< pair<string, string>>& components,
const StringPiece& intra_delim,
const StringPiece& inter_delim,
string* result);
diff --git a/be/src/gutil/strings/split.cc b/be/src/gutil/strings/split.cc
index 3439004..904a4ae 100644
--- a/be/src/gutil/strings/split.cc
+++ b/be/src/gutil/strings/split.cc
@@ -418,7 +418,7 @@ void SplitStringUsing(const string& full,
const char* delim,
vector<string>* result) {
result->reserve(result->size() + CalculateReserveForVector(full, delim));
- std::back_insert_iterator< vector<string> > it(*result);
+ std::back_insert_iterator< vector<string>> it(*result);
SplitStringToIteratorUsing(full, delim, it);
}
@@ -571,28 +571,28 @@ void SplitStringWithEscapingToIterator(const string& src,
void SplitStringWithEscaping(const string &full,
const strings::CharSet& delimiters,
vector<string> *result) {
- std::back_insert_iterator< vector<string> > it(*result);
+ std::back_insert_iterator< vector<string>> it(*result);
SplitStringWithEscapingToIterator(full, delimiters, false, &it);
}
void SplitStringWithEscapingAllowEmpty(const string &full,
const strings::CharSet& delimiters,
vector<string> *result) {
- std::back_insert_iterator< vector<string> > it(*result);
+ std::back_insert_iterator< vector<string>> it(*result);
SplitStringWithEscapingToIterator(full, delimiters, true, &it);
}
void SplitStringWithEscapingToSet(const string &full,
const strings::CharSet& delimiters,
set<string> *result) {
- std::insert_iterator< set<string> > it(*result, result->end());
+ std::insert_iterator< set<string>> it(*result, result->end());
SplitStringWithEscapingToIterator(full, delimiters, false, &it);
}
void SplitStringWithEscapingToHashset(const string &full,
const strings::CharSet& delimiters,
unordered_set<string> *result) {
- std::insert_iterator< unordered_set<string> > it(*result, result->end());
+ std::insert_iterator< unordered_set<string>> it(*result, result->end());
SplitStringWithEscapingToIterator(full, delimiters, false, &it);
}
@@ -1000,7 +1000,7 @@ bool SplitStringIntoKeyValues(const string& line,
bool SplitStringIntoKeyValuePairs(const string& line,
const string& key_value_delimiters,
const string& key_value_pair_delimiters,
- vector<pair<string, string> >* kv_pairs) {
+ vector<pair<string, string>>* kv_pairs) {
kv_pairs->clear();
vector<string> pairs;
diff --git a/be/src/gutil/strings/split.h b/be/src/gutil/strings/split.h
index 6e48db7..ab4afb9 100644
--- a/be/src/gutil/strings/split.h
+++ b/be/src/gutil/strings/split.h
@@ -1032,7 +1032,7 @@ bool SplitStringIntoKeyValues(const string& line,
bool SplitStringIntoKeyValuePairs(const string& line,
const string& key_value_delimiters,
const string& key_value_pair_delimiters,
- vector<pair<string, string> >* kv_pairs);
+ vector<pair<string, string>>* kv_pairs);
// ----------------------------------------------------------------------
diff --git a/be/src/gutil/strings/split_internal.h b/be/src/gutil/strings/split_internal.h
index 38e3d01..f044990 100644
--- a/be/src/gutil/strings/split_internal.h
+++ b/be/src/gutil/strings/split_internal.h
@@ -187,7 +187,7 @@ struct IsNotInitializerList {
typedef void type;
};
template <typename T>
-struct IsNotInitializerList<std::initializer_list<T> > {};
+struct IsNotInitializerList<std::initializer_list<T>> {};
#endif // LANG_CXX11
// This class implements the behavior of the split API by giving callers access
diff --git a/be/src/gutil/type_traits.h b/be/src/gutil/type_traits.h
index db03e54..b0810d3 100644
--- a/be/src/gutil/type_traits.h
+++ b/be/src/gutil/type_traits.h
@@ -238,7 +238,7 @@ template <class T> struct is_pod<const volatile T> : is_pod<T> { };
// constructors. (3) array of a type with a trivial constructor.
// (4) const versions thereof.
template <class T> struct has_trivial_constructor : is_pod<T> { };
-template <class T, class U> struct has_trivial_constructor<std::pair<T, U> >
+template <class T, class U> struct has_trivial_constructor<std::pair<T, U>>
: integral_constant<bool,
(has_trivial_constructor<T>::value &&
has_trivial_constructor<U>::value)> { };
@@ -253,7 +253,7 @@ template <class T> struct has_trivial_constructor<const T>
// constructors. (3) array of a type with a trivial copy constructor.
// (4) const versions thereof.
template <class T> struct has_trivial_copy : is_pod<T> { };
-template <class T, class U> struct has_trivial_copy<std::pair<T, U> >
+template <class T, class U> struct has_trivial_copy<std::pair<T, U>>
: integral_constant<bool,
(has_trivial_copy<T>::value &&
has_trivial_copy<U>::value)> { };
@@ -266,7 +266,7 @@ template <class T> struct has_trivial_copy<const T> : has_trivial_copy<T> { };
// for which is_pod is true. (2) std::pair of types with trivial copy
// constructors. (3) array of a type with a trivial assign constructor.
template <class T> struct has_trivial_assign : is_pod<T> { };
-template <class T, class U> struct has_trivial_assign<std::pair<T, U> >
+template <class T, class U> struct has_trivial_assign<std::pair<T, U>>
: integral_constant<bool,
(has_trivial_assign<T>::value &&
has_trivial_assign<U>::value)> { };
@@ -279,7 +279,7 @@ template <class A, int N> struct has_trivial_assign<A[N]>
// destructors. (3) array of a type with a trivial destructor.
// (4) const versions thereof.
template <class T> struct has_trivial_destructor : is_pod<T> { };
-template <class T, class U> struct has_trivial_destructor<std::pair<T, U> >
+template <class T, class U> struct has_trivial_destructor<std::pair<T, U>>
: integral_constant<bool,
(has_trivial_destructor<T>::value &&
has_trivial_destructor<U>::value)> { };
diff --git a/be/src/olap/rowset/segment_group.cpp b/be/src/olap/rowset/segment_group.cpp
index b0d3f6f..7829488 100644
--- a/be/src/olap/rowset/segment_group.cpp
+++ b/be/src/olap/rowset/segment_group.cpp
@@ -311,7 +311,7 @@ OLAPStatus SegmentGroup::add_zone_maps(
}
OLAPStatus SegmentGroup::add_zone_maps(
- std::vector<std::pair<std::string, std::string> > &zone_map_strings,
+ std::vector<std::pair<std::string, std::string>> &zone_map_strings,
std::vector<bool> &null_vec) {
DCHECK(_empty || zone_map_strings.size() <= get_num_zone_map_columns());
for (size_t i = 0; i < zone_map_strings.size(); ++i) {
diff --git a/be/src/olap/rowset/segment_group.h b/be/src/olap/rowset/segment_group.h
index 7bf8523..7f79a48 100644
--- a/be/src/olap/rowset/segment_group.h
+++ b/be/src/olap/rowset/segment_group.h
@@ -326,7 +326,7 @@ private:
size_t _current_num_rows_per_row_block;
std::vector<std::pair<WrapperField*, WrapperField*>> _zone_maps;
- std::unordered_map<uint32_t, FileHeader<ColumnDataHeaderMessage> > _seg_pb_map;
+ std::unordered_map<uint32_t, FileHeader<ColumnDataHeaderMessage>> _seg_pb_map;
};
diff --git a/be/src/runtime/buffered_block_mgr2.h b/be/src/runtime/buffered_block_mgr2.h
index a69383d..49a27aa 100644
--- a/be/src/runtime/buffered_block_mgr2.h
+++ b/be/src/runtime/buffered_block_mgr2.h
@@ -637,7 +637,7 @@ private:
// map contains only weak ptrs. BufferedBlockMgr2s that are handed out are shared ptrs.
// When all the shared ptrs are no longer referenced, the BufferedBlockMgr2
// d'tor will be called at which point the weak ptr will be removed from the map.
- typedef boost::unordered_map<TUniqueId, boost::weak_ptr<BufferedBlockMgr2> > BlockMgrsMap;
+ typedef boost::unordered_map<TUniqueId, boost::weak_ptr<BufferedBlockMgr2>> BlockMgrsMap;
static BlockMgrsMap _s_query_to_block_mgrs;
// Unowned.
diff --git a/be/src/runtime/buffered_tuple_stream2.h b/be/src/runtime/buffered_tuple_stream2.h
index 2577d45..48f2e0a 100644
--- a/be/src/runtime/buffered_tuple_stream2.h
+++ b/be/src/runtime/buffered_tuple_stream2.h
@@ -295,10 +295,10 @@ private:
uint32_t _null_indicators_write_block;
// Vector of all the strings slots grouped by tuple_idx.
- std::vector<std::pair<int, std::vector<SlotDescriptor*> > > _string_slots;
+ std::vector<std::pair<int, std::vector<SlotDescriptor*>>> _string_slots;
// Vector of all the collection slots grouped by tuple_idx.
- // std::vector<std::pair<int, std::vector<SlotDescriptor*> > > _collection_slots;
+ // std::vector<std::pair<int, std::vector<SlotDescriptor*>>> _collection_slots;
// Block manager and client used to allocate, pin and release blocks. Not owned.
BufferedBlockMgr2* _block_mgr;
diff --git a/be/src/runtime/client_cache.h b/be/src/runtime/client_cache.h
index 1a57c2c..0af2ae5 100644
--- a/be/src/runtime/client_cache.h
+++ b/be/src/runtime/client_cache.h
@@ -102,7 +102,7 @@ private:
// map from (host, port) to list of client keys for that address
typedef boost::unordered_map <
- TNetworkAddress, std::list<void*> > ClientCacheMap;
+ TNetworkAddress, std::list<void*>> ClientCacheMap;
ClientCacheMap _client_cache;
// Map from client key back to its associated ThriftClientImpl transport
diff --git a/be/src/runtime/data_stream_mgr.h b/be/src/runtime/data_stream_mgr.h
index dbe0904..6ace382 100644
--- a/be/src/runtime/data_stream_mgr.h
+++ b/be/src/runtime/data_stream_mgr.h
@@ -98,7 +98,7 @@ private:
// we don't want to create a map<pair<TUniqueId, PlanNodeId>, DataStreamRecvr*>,
// because that requires a bunch of copying of ids for lookup
typedef boost::unordered_multimap<uint32_t,
- boost::shared_ptr<DataStreamRecvr> > StreamMap;
+ boost::shared_ptr<DataStreamRecvr>> StreamMap;
StreamMap _receiver_map;
// less-than ordering for pair<TUniqueId, PlanNodeId>
diff --git a/be/src/runtime/data_stream_recvr.cc b/be/src/runtime/data_stream_recvr.cc
index 78dd50c..9fc643d 100644
--- a/be/src/runtime/data_stream_recvr.cc
+++ b/be/src/runtime/data_stream_recvr.cc
@@ -114,7 +114,7 @@ private:
// queue of (batch length, batch) pairs. The SenderQueue block owns memory to
// these batches. They are handed off to the caller via get_batch.
- typedef list<pair<int, RowBatch*> > RowBatchQueue;
+ typedef list<pair<int, RowBatch*>> RowBatchQueue;
RowBatchQueue _batch_queue;
// The batch that was most recently returned via get_batch(), i.e. the current batch
diff --git a/be/src/runtime/disk_io_mgr.h b/be/src/runtime/disk_io_mgr.h
index 9b66e18..2636581 100644
--- a/be/src/runtime/disk_io_mgr.h
+++ b/be/src/runtime/disk_io_mgr.h
@@ -748,7 +748,7 @@ private:
// _free_buffers[10] => list of free buffers with size 1 MB
// _free_buffers[13] => list of free buffers with size 8 MB
// _free_buffers[n] => list of free buffers with size 2^n * 1024 B
- std::vector<std::list<char*> > _free_buffers;
+ std::vector<std::list<char*>> _free_buffers;
// List of free buffer desc objects that can be handed out to clients
std::list<BufferDescriptor*> _free_buffer_descs;
diff --git a/be/src/runtime/plan_fragment_executor.h b/be/src/runtime/plan_fragment_executor.h
index 3d36c70..9e56866 100644
--- a/be/src/runtime/plan_fragment_executor.h
+++ b/be/src/runtime/plan_fragment_executor.h
@@ -230,7 +230,7 @@ private:
}
// typedef for TPlanFragmentExecParams.per_node_scan_ranges
- typedef std::map<TPlanNodeId, std::vector<TScanRangeParams> > PerNodeScanRanges;
+ typedef std::map<TPlanNodeId, std::vector<TScanRangeParams>> PerNodeScanRanges;
// Main loop of profile reporting thread.
// Exits when notified on _done_cv.
diff --git a/be/src/runtime/result_buffer_mgr.cpp b/be/src/runtime/result_buffer_mgr.cpp
index 35f00b5..2d9c84a 100644
--- a/be/src/runtime/result_buffer_mgr.cpp
+++ b/be/src/runtime/result_buffer_mgr.cpp
@@ -132,7 +132,7 @@ Status ResultBufferMgr::cancel_at_time(time_t cancel_time, const TUniqueId& quer
TimeoutMap::iterator iter = _timeout_map.find(cancel_time);
if (_timeout_map.end() == iter) {
- _timeout_map.insert(std::pair<time_t, std::vector<TUniqueId> >(
+ _timeout_map.insert(std::pair<time_t, std::vector<TUniqueId>>(
cancel_time, std::vector<TUniqueId>()));
iter = _timeout_map.find(cancel_time);
}
diff --git a/be/src/runtime/result_buffer_mgr.h b/be/src/runtime/result_buffer_mgr.h
index b0c974b..c38476a 100644
--- a/be/src/runtime/result_buffer_mgr.h
+++ b/be/src/runtime/result_buffer_mgr.h
@@ -61,7 +61,7 @@ public:
private:
typedef boost::unordered_map<TUniqueId, boost::shared_ptr<BufferControlBlock>> BufferMap;
- typedef std::map<time_t, std::vector<TUniqueId> > TimeoutMap;
+ typedef std::map<time_t, std::vector<TUniqueId>> TimeoutMap;
boost::shared_ptr<BufferControlBlock> find_control_block(const TUniqueId& query_id);
diff --git a/be/src/runtime/spill_sorter.cc b/be/src/runtime/spill_sorter.cc
index 80d1b30..a658aaf 100644
--- a/be/src/runtime/spill_sorter.cc
+++ b/be/src/runtime/spill_sorter.cc
@@ -1318,7 +1318,7 @@ Status SpillSorter::create_merger(int num_runs) {
_merger.reset(
new SortedRunMerger(_compare_less_than, _output_row_desc, _profile, true));
- vector<function<Status (RowBatch**)> > merge_runs;
+ vector<function<Status (RowBatch**)>> merge_runs;
merge_runs.reserve(num_runs);
for (int i = 0; i < num_runs; ++i) {
Run* run = _sorted_runs.front();
diff --git a/be/src/runtime/test_env.h b/be/src/runtime/test_env.h
index 59f834c..7fe446f 100644
--- a/be/src/runtime/test_env.h
+++ b/be/src/runtime/test_env.h
@@ -81,7 +81,7 @@ private:
boost::scoped_ptr<TmpFileMgr> _tmp_file_mgr;
// Per-query states with associated block managers.
- std::vector<boost::shared_ptr<RuntimeState> > _query_states;
+ std::vector<boost::shared_ptr<RuntimeState>> _query_states;
};
} // end namespace doris
diff --git a/be/src/util/perf_counters.h b/be/src/util/perf_counters.h
index 6512118..03382c5 100644
--- a/be/src/util/perf_counters.h
+++ b/be/src/util/perf_counters.h
@@ -133,7 +133,7 @@ private:
std::vector<CounterData> _counters;
std::vector<std::string> _counter_names;
std::vector<std::string> _snapshot_names;
- std::vector<std::vector<int64_t> > _snapshots;
+ std::vector<std::vector<int64_t>> _snapshots;
// System perf counters can be grouped together. The OS will update all grouped counters
// at the same time. This is useful to better correlate counter values.
int _group_fd;
diff --git a/be/src/util/runtime_profile.h b/be/src/util/runtime_profile.h
index ee126dc..b4c1dfb 100644
--- a/be/src/util/runtime_profile.h
+++ b/be/src/util/runtime_profile.h
@@ -508,7 +508,7 @@ private:
// Map from parent counter name to a set of child counter name.
// All top level counters are the child of "" (root).
- typedef std::map<std::string, std::set<std::string> > ChildCounterMap;
+ typedef std::map<std::string, std::set<std::string>> ChildCounterMap;
ChildCounterMap _child_counter_map;
// A set of bucket counters registered in this runtime profile.
@@ -523,7 +523,7 @@ private:
typedef std::map<std::string, RuntimeProfile*> ChildMap;
ChildMap _child_map;
// vector of (profile, indentation flag)
- typedef std::vector<std::pair<RuntimeProfile*, bool> > ChildVector;
+ typedef std::vector<std::pair<RuntimeProfile*, bool>> ChildVector;
ChildVector _children;
mutable boost::mutex _children_lock; // protects _child_map and _children
diff --git a/be/src/util/thrift_server.h b/be/src/util/thrift_server.h
index 6b59eac..779857b 100644
--- a/be/src/util/thrift_server.h
+++ b/be/src/util/thrift_server.h
@@ -137,7 +137,7 @@ private:
// Map of active session keys to shared_ptr containing that key; when a key is
// removed it is automatically freed.
- typedef boost::unordered_map<SessionKey*, boost::shared_ptr<SessionKey> > SessionKeySet;
+ typedef boost::unordered_map<SessionKey*, boost::shared_ptr<SessionKey>> SessionKeySet;
SessionKeySet _session_keys;
// Helper class which monitors starting servers. Needs access to internal members, and
diff --git a/be/test/olap/rowset/segment_v2/bitshuffle_page_test.cpp b/be/test/olap/rowset/segment_v2/bitshuffle_page_test.cpp
index 1a99644..4860f2d 100644
--- a/be/test/olap/rowset/segment_v2/bitshuffle_page_test.cpp
+++ b/be/test/olap/rowset/segment_v2/bitshuffle_page_test.cpp
@@ -161,7 +161,7 @@ TEST_F(BitShufflePageTest, TestBitShuffleInt32BlockEncoderRandom) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_INT, segment_v2::BitshufflePageBuilder<OLAP_FIELD_TYPE_INT>,
- segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_INT> >(ints.get(), size);
+ segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_INT>>(ints.get(), size);
}
TEST_F(BitShufflePageTest, TestBitShuffleInt64BlockEncoderRandom) {
@@ -173,7 +173,7 @@ TEST_F(BitShufflePageTest, TestBitShuffleInt64BlockEncoderRandom) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_BIGINT, segment_v2::BitshufflePageBuilder<OLAP_FIELD_TYPE_BIGINT>,
- segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_BIGINT> >(ints.get(), size);
+ segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_BIGINT>>(ints.get(), size);
}
TEST_F(BitShufflePageTest, TestBitShuffleFloatBlockEncoderRandom) {
@@ -185,7 +185,7 @@ TEST_F(BitShufflePageTest, TestBitShuffleFloatBlockEncoderRandom) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_FLOAT, segment_v2::BitshufflePageBuilder<OLAP_FIELD_TYPE_FLOAT>,
- segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_FLOAT> >(floats.get(), size);
+ segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_FLOAT>>(floats.get(), size);
}
TEST_F(BitShufflePageTest, TestBitShuffleDoubleBlockEncoderRandom) {
@@ -197,7 +197,7 @@ TEST_F(BitShufflePageTest, TestBitShuffleDoubleBlockEncoderRandom) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_DOUBLE, segment_v2::BitshufflePageBuilder<OLAP_FIELD_TYPE_DOUBLE>,
- segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_DOUBLE> >(doubles.get(), size);
+ segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_DOUBLE>>(doubles.get(), size);
}
TEST_F(BitShufflePageTest, TestBitShuffleDoubleBlockEncoderEqual) {
@@ -209,7 +209,7 @@ TEST_F(BitShufflePageTest, TestBitShuffleDoubleBlockEncoderEqual) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_DOUBLE, segment_v2::BitshufflePageBuilder<OLAP_FIELD_TYPE_DOUBLE>,
- segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_DOUBLE> >(doubles.get(), size);
+ segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_DOUBLE>>(doubles.get(), size);
}
TEST_F(BitShufflePageTest, TestBitShuffleDoubleBlockEncoderSequence) {
@@ -224,7 +224,7 @@ TEST_F(BitShufflePageTest, TestBitShuffleDoubleBlockEncoderSequence) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_DOUBLE, segment_v2::BitshufflePageBuilder<OLAP_FIELD_TYPE_DOUBLE>,
- segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_DOUBLE> >(doubles.get(), size);
+ segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_DOUBLE>>(doubles.get(), size);
}
TEST_F(BitShufflePageTest, TestBitShuffleInt32BlockEncoderEqual) {
@@ -236,7 +236,7 @@ TEST_F(BitShufflePageTest, TestBitShuffleInt32BlockEncoderEqual) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_INT, segment_v2::BitshufflePageBuilder<OLAP_FIELD_TYPE_INT>,
- segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_INT> >(ints.get(), size);
+ segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_INT>>(ints.get(), size);
}
TEST_F(BitShufflePageTest, TestBitShuffleInt32BlockEncoderMaxNumberEqual) {
@@ -248,7 +248,7 @@ TEST_F(BitShufflePageTest, TestBitShuffleInt32BlockEncoderMaxNumberEqual) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_INT, segment_v2::BitshufflePageBuilder<OLAP_FIELD_TYPE_INT>,
- segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_INT> >(ints.get(), size);
+ segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_INT>>(ints.get(), size);
}
TEST_F(BitShufflePageTest, TestBitShuffleInt32BlockEncoderSequence) {
@@ -261,7 +261,7 @@ TEST_F(BitShufflePageTest, TestBitShuffleInt32BlockEncoderSequence) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_INT, segment_v2::BitshufflePageBuilder<OLAP_FIELD_TYPE_INT>,
- segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_INT> >(ints.get(), size);
+ segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_INT>>(ints.get(), size);
}
TEST_F(BitShufflePageTest, TestBitShuffleInt32BlockEncoderMaxNumberSequence) {
@@ -275,7 +275,7 @@ TEST_F(BitShufflePageTest, TestBitShuffleInt32BlockEncoderMaxNumberSequence) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_INT, segment_v2::BitshufflePageBuilder<OLAP_FIELD_TYPE_INT>,
- segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_INT> >(ints.get(), size);
+ segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_INT>>(ints.get(), size);
}
TEST_F(BitShufflePageTest, TestBitShuffleFloatBlockEncoderSeekValue) {
@@ -288,7 +288,7 @@ TEST_F(BitShufflePageTest, TestBitShuffleFloatBlockEncoderSeekValue) {
float small_than_smallest = 99.9;
float bigger_than_biggest = 1111.1;
test_seek_at_or_after_value_template<OLAP_FIELD_TYPE_FLOAT, segment_v2::BitshufflePageBuilder<OLAP_FIELD_TYPE_FLOAT>,
- segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_FLOAT> >(floats.get(), size, &small_than_smallest,
+ segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_FLOAT>>(floats.get(), size, &small_than_smallest,
&bigger_than_biggest);
}
@@ -302,7 +302,7 @@ TEST_F(BitShufflePageTest, TestBitShuffleDoubleBlockEncoderSeekValue) {
double small_than_smallest = 99.9;
double bigger_than_biggest = 1111.1;
test_seek_at_or_after_value_template<OLAP_FIELD_TYPE_DOUBLE, segment_v2::BitshufflePageBuilder<OLAP_FIELD_TYPE_DOUBLE>,
- segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_DOUBLE> >(doubles.get(),size, &small_than_smallest,
+ segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_DOUBLE>>(doubles.get(),size, &small_than_smallest,
&bigger_than_biggest);
}
@@ -316,7 +316,7 @@ TEST_F(BitShufflePageTest, TestBitShuffleDecimal12BlockEncoderSeekValue) {
decimal12_t small_than_smallest = decimal12_t(99, 9);
decimal12_t bigger_than_biggest = decimal12_t(1111, 1);
test_seek_at_or_after_value_template<OLAP_FIELD_TYPE_DECIMAL, segment_v2::BitshufflePageBuilder<OLAP_FIELD_TYPE_DECIMAL>,
- segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_DECIMAL> >(decimals.get(),size, &small_than_smallest,
+ segment_v2::BitShufflePageDecoder<OLAP_FIELD_TYPE_DECIMAL>>(decimals.get(),size, &small_than_smallest,
&bigger_than_biggest);
}
diff --git a/be/test/olap/rowset/segment_v2/frame_of_reference_page_test.cpp b/be/test/olap/rowset/segment_v2/frame_of_reference_page_test.cpp
index a40a98f..cc5c904 100644
--- a/be/test/olap/rowset/segment_v2/frame_of_reference_page_test.cpp
+++ b/be/test/olap/rowset/segment_v2/frame_of_reference_page_test.cpp
@@ -105,7 +105,7 @@ TEST_F(FrameOfReferencePageTest, TestInt32BlockEncoderRandom) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_INT, segment_v2::FrameOfReferencePageBuilder<OLAP_FIELD_TYPE_INT>,
- segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_INT> >(ints.get(), size);
+ segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_INT>>(ints.get(), size);
}
TEST_F(FrameOfReferencePageTest, TestInt32BlockEncoderEqual) {
@@ -117,7 +117,7 @@ TEST_F(FrameOfReferencePageTest, TestInt32BlockEncoderEqual) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_INT, segment_v2::FrameOfReferencePageBuilder<OLAP_FIELD_TYPE_INT>,
- segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_INT> >(ints.get(), size);
+ segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_INT>>(ints.get(), size);
}
TEST_F(FrameOfReferencePageTest, TestInt32BlockEncoderSequence) {
@@ -129,7 +129,7 @@ TEST_F(FrameOfReferencePageTest, TestInt32BlockEncoderSequence) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_INT, segment_v2::FrameOfReferencePageBuilder<OLAP_FIELD_TYPE_INT>,
- segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_INT> >(ints.get(), size);
+ segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_INT>>(ints.get(), size);
}
TEST_F(FrameOfReferencePageTest, TestInt64BlockEncoderSequence) {
@@ -141,10 +141,10 @@ TEST_F(FrameOfReferencePageTest, TestInt64BlockEncoderSequence) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_BIGINT, segment_v2::FrameOfReferencePageBuilder<OLAP_FIELD_TYPE_BIGINT>,
- segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_BIGINT> >(ints.get(), size);
+ segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_BIGINT>>(ints.get(), size);
test_encode_decode_page_template<OLAP_FIELD_TYPE_DATETIME, segment_v2::FrameOfReferencePageBuilder<OLAP_FIELD_TYPE_DATETIME>,
- segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_DATETIME> >(ints.get(), size);
+ segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_DATETIME>>(ints.get(), size);
}
TEST_F(FrameOfReferencePageTest, TestInt24BlockEncoderSequence) {
@@ -158,7 +158,7 @@ TEST_F(FrameOfReferencePageTest, TestInt24BlockEncoderSequence) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_DATE, segment_v2::FrameOfReferencePageBuilder<OLAP_FIELD_TYPE_DATE>,
- segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_DATE> >(ints.get(), size);
+ segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_DATE>>(ints.get(), size);
}
TEST_F(FrameOfReferencePageTest, TestInt128BlockEncoderSequence) {
@@ -172,7 +172,7 @@ TEST_F(FrameOfReferencePageTest, TestInt128BlockEncoderSequence) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_LARGEINT, segment_v2::FrameOfReferencePageBuilder<OLAP_FIELD_TYPE_LARGEINT>,
- segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_LARGEINT> >(ints.get(), size);
+ segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_LARGEINT>>(ints.get(), size);
}
TEST_F(FrameOfReferencePageTest, TestInt24BlockEncoderMinMax) {
@@ -182,7 +182,7 @@ TEST_F(FrameOfReferencePageTest, TestInt24BlockEncoderMinMax) {
ints.get()[1] = 0xFFFFFF;
test_encode_decode_page_template<OLAP_FIELD_TYPE_DATE, segment_v2::FrameOfReferencePageBuilder<OLAP_FIELD_TYPE_DATE>,
- segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_DATE> >(ints.get(), 2);
+ segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_DATE>>(ints.get(), 2);
}
TEST_F(FrameOfReferencePageTest, TestInt128BlockEncoderMinMax) {
@@ -192,7 +192,7 @@ TEST_F(FrameOfReferencePageTest, TestInt128BlockEncoderMinMax) {
ints.get()[1] = numeric_limits<int128_t>::max();
test_encode_decode_page_template<OLAP_FIELD_TYPE_LARGEINT, segment_v2::FrameOfReferencePageBuilder<OLAP_FIELD_TYPE_LARGEINT>,
- segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_LARGEINT> >(ints.get(), 2);
+ segment_v2::FrameOfReferencePageDecoder<OLAP_FIELD_TYPE_LARGEINT>>(ints.get(), 2);
}
TEST_F(FrameOfReferencePageTest, TestInt32SequenceBlockEncoderSize) {
diff --git a/be/test/olap/rowset/segment_v2/plain_page_test.cpp b/be/test/olap/rowset/segment_v2/plain_page_test.cpp
index a755dcb..1f0e164 100644
--- a/be/test/olap/rowset/segment_v2/plain_page_test.cpp
+++ b/be/test/olap/rowset/segment_v2/plain_page_test.cpp
@@ -175,7 +175,7 @@ TEST_F(PlainPageTest, TestInt32PlainPageRandom) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_INT, segment_v2::PlainPageBuilder<OLAP_FIELD_TYPE_INT>,
- segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_INT> >(ints.get(), size);
+ segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_INT>>(ints.get(), size);
}
TEST_F(PlainPageTest, TestInt32PlainPageSeekValue) {
@@ -188,7 +188,7 @@ TEST_F(PlainPageTest, TestInt32PlainPageSeekValue) {
int32_t bigger_than_biggest = 1111;
test_seek_at_or_after_value_template<OLAP_FIELD_TYPE_INT, segment_v2::PlainPageBuilder<OLAP_FIELD_TYPE_INT>,
- segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_INT> >(ints.get(), size, &small_than_smallest, &bigger_than_biggest);
+ segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_INT>>(ints.get(), size, &small_than_smallest, &bigger_than_biggest);
}
TEST_F(PlainPageTest, TestInt64PlainPageRandom) {
@@ -199,7 +199,7 @@ TEST_F(PlainPageTest, TestInt64PlainPageRandom) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_BIGINT, segment_v2::PlainPageBuilder<OLAP_FIELD_TYPE_BIGINT>,
- segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_BIGINT> >(ints.get(), size);
+ segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_BIGINT>>(ints.get(), size);
}
TEST_F(PlainPageTest, TestInt64PlainPageSeekValue) {
@@ -212,7 +212,7 @@ TEST_F(PlainPageTest, TestInt64PlainPageSeekValue) {
int64_t bigger_than_biggest = 1111;
test_seek_at_or_after_value_template<OLAP_FIELD_TYPE_BIGINT, segment_v2::PlainPageBuilder<OLAP_FIELD_TYPE_BIGINT>,
- segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_BIGINT> >(ints.get(), size, &small_than_smallest, &bigger_than_biggest);
+ segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_BIGINT>>(ints.get(), size, &small_than_smallest, &bigger_than_biggest);
}
TEST_F(PlainPageTest, TestPlainFloatBlockEncoderRandom) {
@@ -224,7 +224,7 @@ TEST_F(PlainPageTest, TestPlainFloatBlockEncoderRandom) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_FLOAT, segment_v2::PlainPageBuilder<OLAP_FIELD_TYPE_FLOAT>,
- segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_FLOAT> >(floats.get(), size);
+ segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_FLOAT>>(floats.get(), size);
}
TEST_F(PlainPageTest, TestDoublePageEncoderRandom) {
@@ -234,7 +234,7 @@ TEST_F(PlainPageTest, TestDoublePageEncoderRandom) {
doubles.get()[i] = random() + static_cast<double>(random())/INT_MAX;
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_DOUBLE, segment_v2::PlainPageBuilder<OLAP_FIELD_TYPE_DOUBLE>,
- segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_DOUBLE> >(doubles.get(), size);
+ segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_DOUBLE>>(doubles.get(), size);
}
TEST_F(PlainPageTest, TestDoublePageEncoderEqual) {
@@ -246,7 +246,7 @@ TEST_F(PlainPageTest, TestDoublePageEncoderEqual) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_DOUBLE, segment_v2::PlainPageBuilder<OLAP_FIELD_TYPE_DOUBLE>,
- segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_DOUBLE> >(doubles.get(), size);
+ segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_DOUBLE>>(doubles.get(), size);
}
TEST_F(PlainPageTest, TestDoublePageEncoderSequence) {
@@ -261,7 +261,7 @@ TEST_F(PlainPageTest, TestDoublePageEncoderSequence) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_DOUBLE, segment_v2::PlainPageBuilder<OLAP_FIELD_TYPE_DOUBLE>,
- segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_DOUBLE> >(doubles.get(), size);
+ segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_DOUBLE>>(doubles.get(), size);
}
TEST_F(PlainPageTest, TestPlainInt32PageEncoderEqual) {
@@ -273,7 +273,7 @@ TEST_F(PlainPageTest, TestPlainInt32PageEncoderEqual) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_INT, segment_v2::PlainPageBuilder<OLAP_FIELD_TYPE_INT>,
- segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_INT> >(ints.get(), size);
+ segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_INT>>(ints.get(), size);
}
TEST_F(PlainPageTest, TestInt32PageEncoderSequence) {
@@ -286,7 +286,7 @@ TEST_F(PlainPageTest, TestInt32PageEncoderSequence) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_INT, segment_v2::PlainPageBuilder<OLAP_FIELD_TYPE_INT>,
- segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_INT> >(ints.get(), size);
+ segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_INT>>(ints.get(), size);
}
TEST_F(PlainPageTest, TestBoolPlainPageSeekValue) {
@@ -295,15 +295,15 @@ TEST_F(PlainPageTest, TestBoolPlainPageSeekValue) {
bools.get()[1] = true;
test_seek_at_or_after_value_template<OLAP_FIELD_TYPE_BOOL, segment_v2::PlainPageBuilder<OLAP_FIELD_TYPE_BOOL>,
- segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_BOOL> >(bools.get(), 2, nullptr, nullptr);
+ segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_BOOL>>(bools.get(), 2, nullptr, nullptr);
bool t = true;
test_seek_at_or_after_value_template<OLAP_FIELD_TYPE_BOOL, segment_v2::PlainPageBuilder<OLAP_FIELD_TYPE_BOOL>,
- segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_BOOL> >(bools.get(), 1, nullptr, &t);
+ segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_BOOL>>(bools.get(), 1, nullptr, &t);
t = false;
test_seek_at_or_after_value_template<OLAP_FIELD_TYPE_BOOL, segment_v2::PlainPageBuilder<OLAP_FIELD_TYPE_BOOL>,
- segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_BOOL> >(&bools.get()[1], 1, &t, nullptr);
+ segment_v2::PlainPageDecoder<OLAP_FIELD_TYPE_BOOL>>(&bools.get()[1], 1, &t, nullptr);
}
}
diff --git a/be/test/olap/rowset/segment_v2/rle_page_test.cpp b/be/test/olap/rowset/segment_v2/rle_page_test.cpp
index 13122d4..e8c35cc 100644
--- a/be/test/olap/rowset/segment_v2/rle_page_test.cpp
+++ b/be/test/olap/rowset/segment_v2/rle_page_test.cpp
@@ -114,7 +114,7 @@ TEST_F(RlePageTest, TestRleInt32BlockEncoderRandom) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_INT, segment_v2::RlePageBuilder<OLAP_FIELD_TYPE_INT>,
- segment_v2::RlePageDecoder<OLAP_FIELD_TYPE_INT> >(ints.get(), size);
+ segment_v2::RlePageDecoder<OLAP_FIELD_TYPE_INT>>(ints.get(), size);
}
TEST_F(RlePageTest, TestRleInt32BlockEncoderEqual) {
@@ -126,7 +126,7 @@ TEST_F(RlePageTest, TestRleInt32BlockEncoderEqual) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_INT, segment_v2::RlePageBuilder<OLAP_FIELD_TYPE_INT>,
- segment_v2::RlePageDecoder<OLAP_FIELD_TYPE_INT> >(ints.get(), size);
+ segment_v2::RlePageDecoder<OLAP_FIELD_TYPE_INT>>(ints.get(), size);
}
TEST_F(RlePageTest, TestRleInt32BlockEncoderSequence) {
@@ -138,7 +138,7 @@ TEST_F(RlePageTest, TestRleInt32BlockEncoderSequence) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_INT, segment_v2::RlePageBuilder<OLAP_FIELD_TYPE_INT>,
- segment_v2::RlePageDecoder<OLAP_FIELD_TYPE_INT> >(ints.get(), size);
+ segment_v2::RlePageDecoder<OLAP_FIELD_TYPE_INT>>(ints.get(), size);
}
TEST_F(RlePageTest, TestRleInt32BlockEncoderSize) {
@@ -172,7 +172,7 @@ TEST_F(RlePageTest, TestRleBoolBlockEncoderRandom) {
}
test_encode_decode_page_template<OLAP_FIELD_TYPE_BOOL, segment_v2::RlePageBuilder<OLAP_FIELD_TYPE_BOOL>,
- segment_v2::RlePageDecoder<OLAP_FIELD_TYPE_BOOL> >(bools.get(), size);
+ segment_v2::RlePageDecoder<OLAP_FIELD_TYPE_BOOL>>(bools.get(), size);
}
TEST_F(RlePageTest, TestRleBoolBlockEncoderSize) {
diff --git a/be/test/runtime/buffered_block_mgr2_test.cpp b/be/test/runtime/buffered_block_mgr2_test.cpp
index dc0e8b0..31cae39 100644
--- a/be/test/runtime/buffered_block_mgr2_test.cpp
+++ b/be/test/runtime/buffered_block_mgr2_test.cpp
@@ -385,9 +385,9 @@ protected:
const int iters_before_close = num_iterations - 5000;
bool close_called = false;
unordered_map<BufferedBlockMgr2::Block*, int> pinned_block_map;
- vector<std::pair<BufferedBlockMgr2::Block*, int32_t> > pinned_blocks;
+ vector<std::pair<BufferedBlockMgr2::Block*, int32_t>> pinned_blocks;
unordered_map<BufferedBlockMgr2::Block*, int> unpinned_block_map;
- vector<std::pair<BufferedBlockMgr2::Block*, int32_t> > unpinned_blocks;
+ vector<std::pair<BufferedBlockMgr2::Block*, int32_t>> unpinned_blocks;
typedef enum { Pin, New, Unpin, Delete, Close } ApiFunction;
ApiFunction api_function;
@@ -900,7 +900,7 @@ TEST_F(BufferedBlockMgrTest, DISABLED_WriteErrorBlacklist) {
&block_mgrs, &clients);
// Allocate files for all 2x2 combinations by unpinning blocks.
- vector<vector<BufferedBlockMgr2::Block*> > blocks;
+ vector<vector<BufferedBlockMgr2::Block*>> blocks;
vector<BufferedBlockMgr2::Block*> all_blocks;
for (int i = 0; i < NUM_BLOCK_MGRS; ++i) {
vector<BufferedBlockMgr2::Block*> mgr_blocks;
@@ -983,7 +983,7 @@ TEST_F(BufferedBlockMgrTest, AllocationErrorHandling) {
&block_mgrs, &clients);
// Allocate files for all 2x2 combinations by unpinning blocks.
- vector<vector<BufferedBlockMgr2::Block*> > blocks;
+ vector<vector<BufferedBlockMgr2::Block*>> blocks;
for (int i = 0; i < num_block_mgrs; ++i) {
vector<BufferedBlockMgr2::Block*> mgr_blocks;
LOG(INFO) << "Iter " << i;
diff --git a/be/test/util/blocking_queue_test.cpp b/be/test/util/blocking_queue_test.cpp
index b0cae06..d08f5bf 100644
--- a/be/test/util/blocking_queue_test.cpp
+++ b/be/test/util/blocking_queue_test.cpp
@@ -120,7 +120,7 @@ public:
}
private:
- typedef std::vector<boost::shared_ptr<boost::thread> > ThreadVector;
+ typedef std::vector<boost::shared_ptr<boost::thread>> ThreadVector;
int _iterations;
int _nthreads;
diff --git a/be/test/util/internal_queue_test.cpp b/be/test/util/internal_queue_test.cpp
index ec82655..6cb8176 100644
--- a/be/test/util/internal_queue_test.cpp
+++ b/be/test/util/internal_queue_test.cpp
@@ -264,7 +264,7 @@ TEST(InternalQueue, TestMultiProducerMultiConsumer) {
const int num_per_consumer = nodes.size() / NUM_CONSUMERS;
const int num_per_producer = nodes.size() / num_producers;
- vector<vector<int> > results;
+ vector<vector<int>> results;
results.resize(NUM_CONSUMERS);
int expected_delta = -1;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org