Avoid copying ColumnWithTypeAndName [#METR-22173].

ClickHouse · Aug 4, 2016 · fb59818 · fb59818
1 parent 093353d
commit fb59818
Show file tree

Hide file tree

Showing 23 changed files with 39 additions and 66 deletions.
diff --git a/dbms/include/DB/Common/ExternalTable.h b/dbms/include/DB/Common/ExternalTable.h
@@ -50,7 +50,7 @@ class BaseExternalTable
 			column.name = structure[i].first;
 			column.type = data_type_factory.get(structure[i].second);
 			column.column = column.type->createColumn();
-			sample_block.insert(column);
+			sample_block.insert(std::move(column));
 		}
 	}
 

diff --git a/dbms/include/DB/DataStreams/AddingConstColumnBlockInputStream.h b/dbms/include/DB/DataStreams/AddingConstColumnBlockInputStream.h
@@ -39,8 +39,7 @@ class AddingConstColumnBlockInputStream : public IProfilingBlockInputStream
 		if (!res)
 			return res;
 		ColumnPtr column_ptr = ColumnConst<ColumnType>(res.rows(), value, data_type).convertToFullColumn();
-		ColumnWithTypeAndName column(column_ptr, data_type, column_name);
-		res.insert(column);
+		res.insert({column_ptr, data_type, column_name});
 		return res;
 	}
 

diff --git a/dbms/include/DB/Interpreters/InterpreterExistsQuery.h b/dbms/include/DB/Interpreters/InterpreterExistsQuery.h
@@ -37,32 +37,18 @@ class InterpreterExistsQuery : public IInterpreter
 
 	Block getSampleBlock()
 	{
-		ColumnWithTypeAndName col;
-		col.name = "result";
-		col.type = std::make_shared<DataTypeUInt8>();
-		col.column = col.type->createColumn();
-
-		Block block;
-		block.insert(col);
-
-		return block;
+		return {{ std::make_shared<ColumnConstUInt8>(1, 0), std::make_shared<DataTypeUInt8>(), "result" }};
 	}
 
 	BlockInputStreamPtr executeImpl()
 	{
 		const ASTExistsQuery & ast = typeid_cast<const ASTExistsQuery &>(*query_ptr);
-
 		bool res = context.isTableExist(ast.database, ast.table);
 
-		ColumnWithTypeAndName col;
-		col.name = "result";
-		col.type = std::make_shared<DataTypeUInt8>();
-		col.column = std::make_shared<ColumnConstUInt8>(1, res);
-
-		Block block;
-		block.insert(col);
-
-		return std::make_shared<OneBlockInputStream>(block);
+		return std::make_shared<OneBlockInputStream>(Block{{
+			std::make_shared<ColumnConstUInt8>(1, res),
+			std::make_shared<DataTypeUInt8>(),
+			"result" }});
 	}
 };
 

diff --git a/dbms/include/DB/Interpreters/InterpreterShowCreateQuery.h b/dbms/include/DB/Interpreters/InterpreterShowCreateQuery.h
@@ -10,6 +10,7 @@
 #include <DB/DataStreams/copyData.h>
 #include <DB/DataTypes/DataTypesNumberFixed.h>
 #include <DB/DataTypes/DataTypeString.h>
+#include <DB/Columns/ColumnString.h>
 
 
 namespace DB
@@ -39,15 +40,7 @@ class InterpreterShowCreateQuery : public IInterpreter
 
 	Block getSampleBlock()
 	{
-		ColumnWithTypeAndName col;
-		col.name = "statement";
-		col.type = std::make_shared<DataTypeString>();
-		col.column = col.type->createColumn();
-
-		Block block;
-		block.insert(col);
-
-		return block;
+		return {{ std::make_shared<ColumnConstString>(1, String()), std::make_shared<DataTypeString>(), "statement" }};
 	}
 
 	BlockInputStreamPtr executeImpl()
@@ -58,15 +51,10 @@ class InterpreterShowCreateQuery : public IInterpreter
 		formatAST(*context.getCreateQuery(ast.database, ast.table), stream, 0, false, true);
 		String res = stream.str();
 
-		ColumnWithTypeAndName col;
-		col.name = "statement";
-		col.type = std::make_shared<DataTypeString>();
-		col.column = std::make_shared<ColumnConstString>(1, res);
-
-		Block block;
-		block.insert(col);
-
-		return std::make_shared<OneBlockInputStream>(block);
+		return std::make_shared<OneBlockInputStream>(Block{{
+			std::make_shared<ColumnConstString>(1, res),
+			std::make_shared<DataTypeString>(),
+			"statement"}});
 	}
 };
 

diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeReader.h b/dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
@@ -121,7 +121,7 @@ class MergeTreeReader
 				}
 
 				if (!append && column.column->size())
-					res.insert(column);
+					res.insert(std::move(column));
 			}
 		}
 		catch (Exception & e)

diff --git a/dbms/src/DataStreams/NativeBlockInputStream.cpp b/dbms/src/DataStreams/NativeBlockInputStream.cpp
@@ -137,7 +137,7 @@ Block NativeBlockInputStream::readImpl()
 		if (rows)	/// If no rows, nothing to read.
 			readData(*column.type, *column.column, istr, rows);
 
-		res.insert(column);
+		res.insert(std::move(column));
 
 		if (use_index)
 			++index_column_it;

diff --git a/dbms/src/DataStreams/tests/aggregating_stream.cpp b/dbms/src/DataStreams/tests/aggregating_stream.cpp
@@ -86,7 +86,7 @@ int main(int argc, char ** argv)
 		{
 			ColumnWithTypeAndName col;
 			col.type = *it;
-			sample.insert(col);
+			sample.insert(std::move(col));
 		}
 
 		Aggregator::Params params(key_column_names, aggregate_descriptions, false);

diff --git a/dbms/src/DataStreams/tests/sorting_stream.cpp b/dbms/src/DataStreams/tests/sorting_stream.cpp
@@ -132,7 +132,7 @@ try
 	{
 		ColumnWithTypeAndName col;
 		col.type = type;
-		sample.insert(col);
+		sample.insert(std::move(col));
 	}
 
 	SortDescription sort_columns;

diff --git a/dbms/src/DataStreams/tests/tab_separated_streams.cpp b/dbms/src/DataStreams/tests/tab_separated_streams.cpp
@@ -23,12 +23,12 @@ try
 	{
 		ColumnWithTypeAndName col;
 		col.type = std::make_shared<DataTypeUInt64>();
-		sample.insert(col);
+		sample.insert(std::move(col));
 	}
 	{
 		ColumnWithTypeAndName col;
 		col.type = std::make_shared<DataTypeString>();
-		sample.insert(col);
+		sample.insert(std::move(col));
 	}
 
 	ReadBufferFromFile in_buf("test_in");

diff --git a/dbms/src/DataTypes/DataTypeTuple.cpp b/dbms/src/DataTypes/DataTypeTuple.cpp
@@ -238,7 +238,7 @@ ColumnPtr DataTypeTuple::createColumn() const
 		ColumnWithTypeAndName col;
 		col.column = elems[i]->createColumn();
 		col.type = elems[i]->clone();
-		tuple_block.insert(col);
+		tuple_block.insert(std::move(col));
 	}
 	return std::make_shared<ColumnTuple>(tuple_block);
 }

diff --git a/dbms/src/Interpreters/Aggregator.cpp b/dbms/src/Interpreters/Aggregator.cpp
@@ -157,7 +157,7 @@ void Aggregator::initialize(const Block & block)
 			col.type = std::make_shared<DataTypeAggregateFunction>(params.aggregates[i].function, argument_types, params.aggregates[i].parameters);
 			col.column = col.type->createColumn();
 
-			sample.insert(col);
+			sample.insert(std::move(col));
 		}
 	}
 }

diff --git a/dbms/src/Interpreters/ExpressionActions.cpp b/dbms/src/Interpreters/ExpressionActions.cpp
@@ -191,7 +191,7 @@ void ExpressionAction::prepare(Block & sample_block)
 				ColumnWithTypeAndName column = sample_block.getByName(name);
 				if (alias != "")
 					column.name = alias;
-				new_block.insert(column);
+				new_block.insert(std::move(column));
 			}
 
 			sample_block.swap(new_block);
@@ -348,7 +348,7 @@ void ExpressionAction::execute(Block & block) const
 				ColumnWithTypeAndName column = block.getByName(name);
 				if (alias != "")
 					column.name = alias;
-				new_block.insert(column);
+				new_block.insert(std::move(column));
 			}
 
 			block.swap(new_block);

diff --git a/dbms/src/Interpreters/InterpreterInsertQuery.cpp b/dbms/src/Interpreters/InterpreterInsertQuery.cpp
@@ -63,7 +63,7 @@ Block InterpreterInsertQuery::getSampleBlock()
 		col.name = current_name;
 		col.type = table_sample.getByName(current_name).type;
 		col.column = col.type->createColumn();
-		res.insert(col);
+		res.insert(std::move(col));
 	}
 
 	return res;

diff --git a/dbms/src/Interpreters/Join.cpp b/dbms/src/Interpreters/Join.cpp
@@ -446,7 +446,7 @@ bool Join::insertFromBlock(const Block & block)
 			size_t pos = stored_block->getPositionByName(name);
 			ColumnWithTypeAndName col = stored_block->getByPosition(pos);
 			stored_block->erase(pos);
-			stored_block->insert(key_num, col);
+			stored_block->insert(key_num, std::move(col));
 			++key_num;
 		}
 	}

diff --git a/dbms/src/Interpreters/Set.cpp b/dbms/src/Interpreters/Set.cpp
@@ -291,7 +291,7 @@ void Set::createFromAST(DataTypes & types, ASTPtr node, const Context & context,
 		col.column = data_types[i]->createColumn();
 		col.name = "_" + toString(i);
 
-		block.insert(col);
+		block.insert(std::move(col));
 	}
 
 	Row tuple_values;

diff --git a/dbms/src/Storages/StorageLog.cpp b/dbms/src/Storages/StorageLog.cpp
@@ -248,7 +248,7 @@ Block LogBlockInputStream::readImpl()
 		}
 
 		if (column.column->size())
-			res.insert(column);
+			res.insert(std::move(column));
 	}
 
 	/// Отдельно обрабатываем виртуальный столбец
@@ -260,8 +260,7 @@ Block LogBlockInputStream::readImpl()
 		if (rows > 0)
 		{
 			ColumnPtr column_ptr = ColumnConst<String>(rows, current_table.first, std::make_shared<DataTypeString>()).convertToFullColumn();
-			ColumnWithTypeAndName column(column_ptr, std::make_shared<DataTypeString>(), storage._table_column_name);
-			res.insert(column);
+			res.insert({column_ptr, std::make_shared<DataTypeString>(), storage._table_column_name});
 		}
 	}
 

diff --git a/dbms/src/Storages/StorageTinyLog.cpp b/dbms/src/Storages/StorageTinyLog.cpp
@@ -213,7 +213,7 @@ Block TinyLogBlockInputStream::readImpl()
 		}
 
 		if (column.column->size())
-			res.insert(column);
+			res.insert(std::move(column));
 	}
 
 	if (!res || streams.begin()->second->compressed.eof())

diff --git a/dbms/src/Storages/System/StorageSystemNumbers.cpp b/dbms/src/Storages/System/StorageSystemNumbers.cpp
@@ -36,7 +36,7 @@ class NumbersBlockInputStream : public IProfilingBlockInputStream
 		while (pos < end)
 			*pos++ = curr++;
 
-		res.insert(column_with_type_and_name);
+		res.insert(std::move(column_with_type_and_name));
 
 		next += step;
 		return res;

diff --git a/dbms/src/Storages/System/StorageSystemOne.cpp b/dbms/src/Storages/System/StorageSystemOne.cpp
@@ -38,7 +38,7 @@ BlockInputStreams StorageSystemOne::read(
 	col.name = "dummy";
 	col.type = std::make_shared<DataTypeUInt8>();
 	col.column = ColumnConstUInt8(1, 0).convertToFullColumn();
-	block.insert(col);
+	block.insert(std::move(col));
 
 	return BlockInputStreams(1, std::make_shared<OneBlockInputStream>(block));
 }

diff --git a/dbms/src/Storages/System/StorageSystemTables.cpp b/dbms/src/Storages/System/StorageSystemTables.cpp
@@ -39,11 +39,12 @@ static ColumnWithTypeAndName getFilteredDatabases(ASTPtr query, const Context &
 	column.type = std::make_shared<DataTypeString>();
 	column.column = std::make_shared<ColumnString>();
 
-	Block block;
-	block.insert(column);
 	for (const auto & db : context.getDatabases())
 		column.column->insert(db.first);
 
+	Block block;
+	block.insert(std::move(column));
+
 	VirtualColumnUtils::filterBlockWithQuery(query, block, context);
 
 	return block.getByPosition(0);

diff --git a/dbms/src/Storages/tests/merge_tree.cpp b/dbms/src/Storages/tests/merge_tree.cpp
@@ -103,12 +103,12 @@ try
 		{
 			ColumnWithTypeAndName col;
 			col.type = names_and_types->front().type;
-			sample.insert(col);
+			sample.insert(std::move(col));
 		}
 		{
 			ColumnWithTypeAndName col;
 			col.type = names_and_types->back().type;
-			sample.insert(col);
+			sample.insert(std::move(col));
 		}
 
 		WriteBufferFromFileDescriptor out_buf(STDOUT_FILENO);

diff --git a/dbms/src/Storages/tests/storage_log.cpp b/dbms/src/Storages/tests/storage_log.cpp
@@ -72,12 +72,12 @@ try
 		{
 			ColumnWithTypeAndName col;
 			col.type = std::make_shared<DataTypeUInt64>();
-			sample.insert(col);
+			sample.insert(std::move(col));
 		}
 		{
 			ColumnWithTypeAndName col;
 			col.type = std::make_shared<DataTypeUInt8>();
-			sample.insert(col);
+			sample.insert(std::move(col));
 		}
 
 		WriteBufferFromOStream out_buf(std::cout);

diff --git a/dbms/src/Storages/tests/system_numbers.cpp b/dbms/src/Storages/tests/system_numbers.cpp
@@ -23,7 +23,7 @@ try
 	Block sample;
 	ColumnWithTypeAndName col;
 	col.type = std::make_shared<DataTypeUInt64>();
-	sample.insert(col);
+	sample.insert(std::move(col));
 
 	WriteBufferFromOStream out_buf(std::cout);