From 12c11f1d48cc23de9366b4b8001cbb21c9ac603a Mon Sep 17 00:00:00 2001 From: Pepijn Schoen Date: Sat, 8 Apr 2017 14:18:20 +0200 Subject: [PATCH] Fingerprint .names --- src/extractor/extraction_containers.cpp | 4 ++++ src/storage/storage.cpp | 4 ++-- src/util/name_table.cpp | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/extractor/extraction_containers.cpp b/src/extractor/extraction_containers.cpp index f94867471..d8c17020c 100644 --- a/src/extractor/extraction_containers.cpp +++ b/src/extractor/extraction_containers.cpp @@ -175,6 +175,10 @@ void ExtractionContainers::WriteCharData(const std::string &file_name) TIMER_START(write_index); boost::filesystem::ofstream file(file_name, std::ios::binary); + // TODO wrap this in a FileWriter + const auto fingerprint = util::FingerPrint::GetValid(); + file.write(reinterpret_cast(&fingerprint), sizeof(util::FingerPrint)); + const util::NameTable::IndexedData indexed_data; indexed_data.write(file, name_offsets.begin(), name_offsets.end(), name_char_data.begin()); diff --git a/src/storage/storage.cpp b/src/storage/storage.cpp index e6090ab0d..df5a0f709 100644 --- a/src/storage/storage.cpp +++ b/src/storage/storage.cpp @@ -213,7 +213,7 @@ void Storage::PopulateLayout(DataLayout &layout) { util::Log() << "load names from: " << config.names_data_path; // number of entries in name index - io::FileReader name_file(config.names_data_path, io::FileReader::HasNoFingerprint); + io::FileReader name_file(config.names_data_path, io::FileReader::VerifyFingerprint); layout.SetBlockSize(DataLayout::NAME_CHAR_DATA, name_file.GetSize()); } @@ -529,7 +529,7 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr) // Name data { - io::FileReader name_file(config.names_data_path, io::FileReader::HasNoFingerprint); + io::FileReader name_file(config.names_data_path, io::FileReader::VerifyFingerprint); std::size_t name_file_size = name_file.GetSize(); BOOST_ASSERT(name_file_size == layout.GetBlockSize(DataLayout::NAME_CHAR_DATA)); diff --git a/src/util/name_table.cpp b/src/util/name_table.cpp index 6d080c2d7..47101c228 100644 --- a/src/util/name_table.cpp +++ b/src/util/name_table.cpp @@ -11,7 +11,7 @@ NameTable::NameTable(const std::string &file_name) { using FileReader = storage::io::FileReader; - FileReader name_stream_file_reader(file_name, FileReader::HasNoFingerprint); + FileReader name_stream_file_reader(file_name, FileReader::VerifyFingerprint); const auto file_size = name_stream_file_reader.GetSize(); m_buffer = BufferType(static_cast(::operator new(file_size)),