database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[refactor] fix warings when compile with clang (#8069)

Browse Source
This commit is contained in:
Zhengguo Yang
2022-02-19 11:29:02 +08:00
committed by GitHub
parent 8892780091
commit 50864aca7d
200 changed files with 1750 additions and 2617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
be/src/vec/core/block.cpp
View File

@ -99,16 +99,16 @@ inline DataTypePtr create_data_type(const PColumnMeta& pcolumn_meta) {
return std::make_shared<DataTypeDateTime>();
}
case PGenericType::DECIMAL32: {
return std::make_shared<DataTypeDecimal<Decimal32>>(pcolumn_meta.decimal_param().precision(),
pcolumn_meta.decimal_param().scale());
return std::make_shared<DataTypeDecimal<Decimal32>>(
pcolumn_meta.decimal_param().precision(), pcolumn_meta.decimal_param().scale());
}
case PGenericType::DECIMAL64: {
return std::make_shared<DataTypeDecimal<Decimal64>>(pcolumn_meta.decimal_param().precision(),
pcolumn_meta.decimal_param().scale());
return std::make_shared<DataTypeDecimal<Decimal64>>(
pcolumn_meta.decimal_param().precision(), pcolumn_meta.decimal_param().scale());
}
case PGenericType::DECIMAL128: {
return std::make_shared<DataTypeDecimal<Decimal128>>(pcolumn_meta.decimal_param().precision(),
pcolumn_meta.decimal_param().scale());
return std::make_shared<DataTypeDecimal<Decimal128>>(
pcolumn_meta.decimal_param().precision(), pcolumn_meta.decimal_param().scale());
}
case PGenericType::BITMAP: {
return std::make_shared<DataTypeBitMap>();
@ -136,14 +136,16 @@ Block::Block(const PBlock& pblock) {
const char* buf = nullptr;
std::string compression_scratch;
if (pblock.compressed()) {
// Decompress
// Decompress
const char* compressed_data = pblock.column_values().c_str();
size_t compressed_size = pblock.column_values().size();
size_t uncompressed_size = 0;
bool success = snappy::GetUncompressedLength(compressed_data, compressed_size, &uncompressed_size);
bool success =
snappy::GetUncompressedLength(compressed_data, compressed_size, &uncompressed_size);
DCHECK(success) << "snappy::GetUncompressedLength failed";
compression_scratch.resize(uncompressed_size);
success = snappy::RawUncompress(compressed_data, compressed_size, compression_scratch.data());
success =
snappy::RawUncompress(compressed_data, compressed_size, compression_scratch.data());
DCHECK(success) << "snappy::RawUncompress failed";
buf = compression_scratch.data();
} else {
@ -154,14 +156,14 @@ Block::Block(const PBlock& pblock) {
DataTypePtr type = create_data_type(pcol_meta);
MutableColumnPtr data_column;
if (pcol_meta.is_nullable()) {
data_column = ColumnNullable::create(std::move(type->create_column()), ColumnUInt8::create());
data_column = ColumnNullable::create(type->create_column(), ColumnUInt8::create());
type = make_nullable(type);
} else {
data_column = type->create_column();
}
buf = type->deserialize(buf, data_column.get());
data.emplace_back(data_column->get_ptr(), type, pcol_meta.name());
}
}
initialize_index_by_name();
}
@ -704,8 +706,8 @@ Status Block::filter_block(Block* block, int filter_column_id, int column_to_kee
return Status::OK();
}
Status Block::serialize(PBlock* pblock, size_t* uncompressed_bytes,
size_t* compressed_bytes, std::string* allocated_buf) const {
Status Block::serialize(PBlock* pblock, size_t* uncompressed_bytes, size_t* compressed_bytes,
std::string* allocated_buf) const {
// calc uncompressed size for allocation
size_t content_uncompressed_size = 0;
for (const auto& c : *this) {
@ -722,7 +724,8 @@ Status Block::serialize(PBlock* pblock, size_t* uncompressed_bytes,
for (const auto& c : *this) {
buf = c.type->serialize(*(c.column), buf);
}
CHECK(content_uncompressed_size == (buf - start_buf)) << content_uncompressed_size << " vs. " << (buf - start_buf);
CHECK(content_uncompressed_size == (buf - start_buf))
<< content_uncompressed_size << " vs. " << (buf - start_buf);
*uncompressed_bytes = content_uncompressed_size;
// compress
@ -735,7 +738,8 @@ Status Block::serialize(PBlock* pblock, size_t* uncompressed_bytes,
size_t compressed_size = 0;
char* compressed_output = compression_scratch.data();
snappy::RawCompress(allocated_buf->data(), content_uncompressed_size, compressed_output, &compressed_size);
snappy::RawCompress(allocated_buf->data(), content_uncompressed_size, compressed_output,
&compressed_size);
if (LIKELY(compressed_size < content_uncompressed_size)) {
compression_scratch.resize(compressed_size);
@ -746,13 +750,13 @@ Status Block::serialize(PBlock* pblock, size_t* uncompressed_bytes,
*compressed_bytes = content_uncompressed_size;
}
VLOG_ROW << "uncompressed size: " << content_uncompressed_size << ", compressed size: " << compressed_size;
VLOG_ROW << "uncompressed size: " << content_uncompressed_size
<< ", compressed size: " << compressed_size;
}
return Status::OK();
}
void Block::serialize(RowBatch* output_batch, const RowDescriptor& row_desc) {
auto num_rows = rows();
auto mem_pool = output_batch->tuple_data_pool();