Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions dbms/src/IO/Checksum/ChecksumBuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,11 @@ class FramedChecksumReadBuffer : public ReadBufferFromFileDescriptor
if (unlikely(frame.checksum != digest.checksum()))
{
throw TiFlashException(
"checksum mismatch for " + in->getFileName(),
Errors::Checksum::DataCorruption);
Errors::Checksum::DataCorruption,
"checksum mismatch, file={} expect={:x} actual={:x}",
in->getFileName(),
frame.checksum,
digest.checksum());
}
}

Expand Down Expand Up @@ -376,7 +379,12 @@ class FramedChecksumReadBuffer : public ReadBufferFromFileDescriptor
digest.update(frame.data, frame.bytes);
if (unlikely(frame.checksum != digest.checksum()))
{
throw TiFlashException("checksum mismatch for " + in->getFileName(), Errors::Checksum::DataCorruption);
throw TiFlashException(
Errors::Checksum::DataCorruption,
"checksum mismatch, file={} expect={:x} actual={:x}",
in->getFileName(),
frame.checksum,
digest.checksum());
}
}

Expand Down
3 changes: 1 addition & 2 deletions dbms/src/IO/FileProvider/ChecksumReadBufferBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,11 @@ std::unique_ptr<ReadBufferFromFileBase> ChecksumReadBufferBuilder::build(
std::unique_ptr<ReadBufferFromFileBase> ChecksumReadBufferBuilder::build(
String && data,
const String & file_name,
size_t estimated_size,
ChecksumAlgo checksum_algorithm,
size_t checksum_frame_size)
{
auto allocation_size = std::min(data.size(), checksum_frame_size);
auto file = std::make_shared<MemoryRandomAccessFile>(file_name, std::forward<String>(data));
auto allocation_size = std::min(estimated_size, checksum_frame_size);
switch (checksum_algorithm)
{
case ChecksumAlgo::None:
Expand Down
1 change: 0 additions & 1 deletion dbms/src/IO/FileProvider/ChecksumReadBufferBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ class ChecksumReadBufferBuilder
static std::unique_ptr<ReadBufferFromFileBase> build(
String && data,
const String & file_name,
size_t estimated_size,
ChecksumAlgo checksum_algorithm,
size_t checksum_frame_size);
};
Expand Down
11 changes: 3 additions & 8 deletions dbms/src/IO/FileProvider/CompressedReadBufferFromFileBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,11 @@ std::unique_ptr<LegacyCompressedReadBufferFromFile> CompressedReadBufferFromFile
std::unique_ptr<CompressedReadBufferFromFile> CompressedReadBufferFromFileBuilder::build(
String && data,
const String & file_name,
size_t estimated_size,
ChecksumAlgo checksum_algorithm,
size_t checksum_frame_size)
{
auto file_in = ChecksumReadBufferBuilder::build(
std::move(data),
file_name,
estimated_size,
checksum_algorithm,
checksum_frame_size);
auto file_in
= ChecksumReadBufferBuilder::build(std::move(data), file_name, checksum_algorithm, checksum_frame_size);
return std::make_unique<CompressedReadBufferFromFileImpl<false>>(std::move(file_in));
}

Expand All @@ -73,4 +68,4 @@ std::unique_ptr<CompressedReadBufferFromFile> CompressedReadBufferFromFileBuilde
return std::make_unique<CompressedReadBufferFromFileImpl<false>>(std::move(file_in));
}

} // namespace DB
} // namespace DB
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class CompressedReadBufferFromFileBuilder
static std::unique_ptr<CompressedReadBufferFromFile> build(
String && data,
const String & file_name,
size_t estimated_size,
ChecksumAlgo checksum_algorithm,
size_t checksum_frame_size);

Expand Down
13 changes: 11 additions & 2 deletions dbms/src/Server/DTTool/DTTool.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,11 @@ struct InspectArgs
bool check;
bool dump_columns;
bool dump_all_columns;
bool dump_minmax;
bool dump_merged_files;
size_t file_id;
std::string workdir;
std::vector<DB::ColumnID> col_ids;
};
int inspectEntry(const std::vector<std::string> & opts, RaftStoreFFIFunc ffi_function);
} // namespace DTTool::Inspect
Expand Down Expand Up @@ -127,10 +130,16 @@ class ImitativeEnv
static void setupLogger()
{
Poco::AutoPtr<Poco::ConsoleChannel> channel = new Poco::ConsoleChannel(std::cout);
Poco::AutoPtr<Poco::Formatter> formatter(new UnifiedLogFormatter<true>());
// only enable colors when the output is a terminal
bool enable_colors = isatty(STDOUT_FILENO) && isatty(STDERR_FILENO);
Poco::AutoPtr<Poco::Formatter> formatter;
if (enable_colors)
formatter = new UnifiedLogFormatter<true>();
else
formatter = new UnifiedLogFormatter<false>();
Poco::AutoPtr<Poco::FormattingChannel> formatting_channel(new Poco::FormattingChannel(formatter, channel));
Poco::Logger::root().setChannel(formatting_channel);
Poco::Logger::root().setLevel("trace");
Poco::Logger::root().setLevel("debug");
}

ContextPtr global_context{};
Expand Down
Loading