thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-27 01:51:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing dependency on functions from client: preparation [#CLICKHOUSE-2].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-07-11 23:53:09 +03:00 committed by alexey-milovidov
parent 33c6e0b804
commit 8c1a6f5736
2 changed files with 26 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
dbms/src/DataStreams/PrettyBlockOutputStream.cpp
View File

@ -1,8 +1,6 @@
#include <sys/ioctl.h>
#include <unistd.h>
#include <Functions/FunctionFactory.h>
#include <Functions/IFunction.h>
#include <DataTypes/DataTypesNumber.h>
#include <DataTypes/DataTypeString.h>
#include <DataStreams/PrettyBlockOutputStream.h>
@ -10,6 +8,7 @@
#include <Columns/ColumnsNumber.h>
#include <IO/WriteBuffer.h>
#include <IO/WriteHelpers.h>
#include <Common/UTF8Helpers.h>
namespace DB
@ -44,56 +43,41 @@ void PrettyBlockOutputStream::calculateWidths(Block & block, Widths_t & max_widt
max_widths.resize(columns);
name_widths.resize(columns);
FunctionPtr visible_width_func = FunctionFactory::instance().get("visibleWidth", context);
/// Calculate widths of all values.
String serialized_value;
for (size_t i = 0; i < columns; ++i)
{
ColumnWithTypeAndName column;
column.type = std::make_shared<DataTypeUInt64>();
column.name = "visibleWidth(" + block.getByPosition(i).name + ")";
const ColumnWithTypeAndName & elem = block.getByPosition(i);
size_t result_number = block.columns();
block.insert(column);
visible_width_func->execute(block, {i}, result_number);
column.column = block.safeGetByPosition(result_number).column;
if (const ColumnUInt64 * col = typeid_cast<const ColumnUInt64 *>(&*column.column))
if (!elem.column->isConst())
{
const ColumnUInt64::Container_t & res = col->getData();
for (size_t j = 0; j < rows; ++j)
{
if (res[j] > max_widths[i])
max_widths[i] = res[j];
{
WriteBufferFromString out(serialized_value);
elem.type->serializeTextEscaped(*elem.column, i, out);
}
max_widths[i] = std::max(max_widths[i],
UTF8::countCodePoints(reinterpret_cast<const UInt8 *>(serialized_value.data()), serialized_value.size()));
}
}
else if (const ColumnConstUInt64 * col = typeid_cast<const ColumnConstUInt64 *>(&*column.column))
{
UInt64 res = col->getData();
max_widths[i] = res;
}
else
throw Exception("Illegal column " + column.column->getName()
+ " of result of function " + visible_width_func->getName(),
ErrorCodes::ILLEGAL_COLUMN);
{
{
WriteBufferFromString out(serialized_value);
elem.type->serializeTextEscaped(*elem.column->cut(0, 1)->convertToFullColumnIfConst(), 0, out);
max_widths[i] = UTF8::countCodePoints(reinterpret_cast<const UInt8 *>(serialized_value.data()), serialized_value.size());
}
}
/// And also calculate widths for names of columns.
{
const String & name = block.getByPosition(i).name;
const String & name = elem.name;
Block block_with_name
{
{ std::make_shared<ColumnConstString>(1, name), std::make_shared<DataTypeString>(), "name" },
{ nullptr, std::make_shared<DataTypeUInt64>(), "width" }
};
visible_width_func->execute(block_with_name, {0}, 1);
name_widths[i] = typeid_cast<const ColumnConstUInt64 &>(*block_with_name.getByPosition(1).column).getData();
if (name_widths[i] > max_widths[i])
max_widths[i] = name_widths[i];
name_widths[i] = UTF8::countCodePoints(reinterpret_cast<const UInt8 *>(name.data()), name.size());
max_widths[i] = std::max(max_widths[i], name_widths[i]);
}
}
}

19
dbms/src/DataStreams/VerticalRowOutputStream.cpp
View File

@ -1,10 +1,9 @@
#include <Functions/FunctionFactory.h>
#include <Functions/IFunction.h>
#include <Columns/ColumnConst.h>
#include <DataTypes/DataTypeString.h>
#include <DataTypes/DataTypesNumber.h>
#include <IO/WriteHelpers.h>
#include <DataStreams/VerticalRowOutputStream.h>
#include <Common/UTF8Helpers.h>
namespace DB
@ -20,21 +19,11 @@ VerticalRowOutputStream::VerticalRowOutputStream(
Widths_t name_widths(columns);
size_t max_name_width = 0;
FunctionPtr visible_width_func = FunctionFactory::instance().get("visibleWidth", context);
for (size_t i = 0; i < columns; ++i)
{
{
Block block_with_name
{
{ std::make_shared<ColumnConstString>(1, sample.getByPosition(i).name), std::make_shared<DataTypeString>(), "name" },
{ nullptr, std::make_shared<DataTypeUInt64>(), "width" }
};
visible_width_func->execute(block_with_name, {0}, 1);
name_widths[i] = (*block_with_name.getByPosition(1).column)[0].get<UInt64>();
}
/// Note that number of code points is just a rough approximation of visible string width.
const String & name = sample.getByPosition(i).name;
name_widths[i] = UTF8::countCodePoints(reinterpret_cast<const UInt8 *>(name.data()), name.size());
if (name_widths[i] > max_name_width)
max_name_width = name_widths[i];