X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=plocate-build.cpp;h=c42bd86113cd2eae8ba53cba7ca9625e573d9465;hb=93d57f8f19e57efbb91e139bfca1064bd9e27bb3;hp=a077ac1944358ecee7e622e9846982d7ba39c064;hpb=6e14b96ad65246e9f61795f444a47ea32e444e44;p=plocate diff --git a/plocate-build.cpp b/plocate-build.cpp index a077ac1..c42bd86 100644 --- a/plocate-build.cpp +++ b/plocate-build.cpp @@ -1,13 +1,15 @@ #include "db.h" +#include "dprintf.h" #include "turbopfor-encode.h" #include #include #include -#include #include +#include #include #include +#include #include #include #include @@ -17,20 +19,20 @@ #include #include #include +#include #include #define P4NENC_BOUND(n) ((n + 127) / 128 + (n + 32) * sizeof(uint32_t)) -#define dprintf(...) -//#define dprintf(...) fprintf(stderr, __VA_ARGS__); #define NUM_TRIGRAMS 16777216 using namespace std; using namespace std::chrono; -string zstd_compress(const string &src, string *tempbuf); +string zstd_compress(const string &src, ZSTD_CDict *cdict, string *tempbuf); constexpr unsigned num_overflow_slots = 16; +bool use_debug = false; static inline uint32_t read_unigram(const string_view s, size_t idx) { @@ -141,22 +143,113 @@ void PostingListBuilder::write_header(uint32_t docid) encoded.append(reinterpret_cast(buf), end - buf); } -class Corpus { +class DatabaseReceiver { +public: + virtual ~DatabaseReceiver() = default; + virtual void add_file(string filename) = 0; + virtual void flush_block() = 0; +}; + +class DictionaryBuilder : public DatabaseReceiver { +public: + DictionaryBuilder(size_t blocks_to_keep, size_t block_size) + : blocks_to_keep(blocks_to_keep), block_size(block_size) {} + void add_file(string filename) override; + void flush_block() override; + string train(size_t buf_size); + +private: + const size_t blocks_to_keep, block_size; + string current_block; + uint64_t block_num = 0; + size_t num_files_in_block = 0; + + std::mt19937 reservoir_rand{ 1234 }; // Fixed seed for reproducibility. + bool keep_current_block = true; + int64_t slot_for_current_block = -1; + + vector sampled_blocks; + vector lengths; +}; + +void DictionaryBuilder::add_file(string filename) +{ + if (keep_current_block) { // Only bother saving the filenames if we're actually keeping the block. + if (!current_block.empty()) { + current_block.push_back('\0'); + } + current_block += filename; + } + if (++num_files_in_block == block_size) { + flush_block(); + } +} + +void DictionaryBuilder::flush_block() +{ + if (keep_current_block) { + if (slot_for_current_block == -1) { + lengths.push_back(current_block.size()); + sampled_blocks.push_back(move(current_block)); + } else { + lengths[slot_for_current_block] = current_block.size(); + sampled_blocks[slot_for_current_block] = move(current_block); + } + } + current_block.clear(); + num_files_in_block = 0; + ++block_num; + + if (block_num < blocks_to_keep) { + keep_current_block = true; + slot_for_current_block = -1; + } else { + // Keep every block with equal probability (reservoir sampling). + uint64_t idx = uniform_int_distribution(0, block_num)(reservoir_rand); + keep_current_block = (idx < blocks_to_keep); + slot_for_current_block = idx; + } +} + +string DictionaryBuilder::train(size_t buf_size) +{ + string dictionary_buf; + sort(sampled_blocks.begin(), sampled_blocks.end()); // Seemingly important for decompression speed. + for (const string &block : sampled_blocks) { + dictionary_buf += block; + } + + string buf; + buf.resize(buf_size); + size_t ret = ZDICT_trainFromBuffer(&buf[0], buf_size, dictionary_buf.data(), lengths.data(), lengths.size()); + if (ret == size_t(-1)) { + return ""; + } + dprintf("Sampled %zu bytes in %zu blocks, built a dictionary of size %zu\n", dictionary_buf.size(), lengths.size(), ret); + buf.resize(ret); + + sampled_blocks.clear(); + lengths.clear(); + + return buf; +} + +class Corpus : public DatabaseReceiver { public: - Corpus(FILE *outfp, size_t block_size) - : invindex(new PostingListBuilder *[NUM_TRIGRAMS]), outfp(outfp), block_size(block_size) + Corpus(FILE *outfp, size_t block_size, ZSTD_CDict *cdict) + : invindex(new PostingListBuilder *[NUM_TRIGRAMS]), outfp(outfp), block_size(block_size), cdict(cdict) { fill(invindex.get(), invindex.get() + NUM_TRIGRAMS, nullptr); } - ~Corpus() + ~Corpus() override { for (unsigned i = 0; i < NUM_TRIGRAMS; ++i) { delete invindex[i]; } } - void add_file(string filename); - void flush_block(); + void add_file(string filename) override; + void flush_block() override; vector filename_blocks; size_t num_files = 0, num_files_in_block = 0, num_blocks = 0; @@ -171,6 +264,7 @@ public: } return *invindex[trgm]; } + size_t num_trigrams() const; private: unique_ptr invindex; @@ -178,6 +272,7 @@ private: string current_block; string tempbuf; const size_t block_size; + ZSTD_CDict *cdict; }; void Corpus::add_file(string filename) @@ -215,7 +310,7 @@ void Corpus::flush_block() // Compress and add the filename block. filename_blocks.push_back(ftell(outfp)); - string compressed = zstd_compress(current_block, &tempbuf); + string compressed = zstd_compress(current_block, cdict, &tempbuf); if (fwrite(compressed.data(), compressed.size(), 1, outfp) != 1) { perror("fwrite()"); exit(1); @@ -226,6 +321,17 @@ void Corpus::flush_block() ++num_blocks; } +size_t Corpus::num_trigrams() const +{ + size_t num = 0; + for (unsigned trgm = 0; trgm < NUM_TRIGRAMS; ++trgm) { + if (invindex[trgm] != nullptr) { + ++num; + } + } + return num; +} + string read_cstr(FILE *fp) { string ret; @@ -242,7 +348,7 @@ string read_cstr(FILE *fp) } } -void handle_directory(FILE *fp, Corpus *corpus) +void handle_directory(FILE *fp, DatabaseReceiver *receiver) { db_directory dummy; if (fread(&dummy, sizeof(dummy), 1, fp) != 1) { @@ -262,21 +368,47 @@ void handle_directory(FILE *fp, Corpus *corpus) int type = getc(fp); if (type == DBE_NORMAL) { string filename = read_cstr(fp); - corpus->add_file(dir_path + "/" + filename); + receiver->add_file(dir_path + "/" + filename); } else if (type == DBE_DIRECTORY) { string dirname = read_cstr(fp); - corpus->add_file(dir_path + "/" + dirname); + receiver->add_file(dir_path + "/" + dirname); } else { return; // Probably end. } } } -void read_mlocate(const char *filename, Corpus *corpus) +void read_plaintext(FILE *fp, DatabaseReceiver *receiver) +{ + if (fseek(fp, 0, SEEK_SET) != 0) { + perror("fseek"); + exit(1); + } + + while (!feof(fp)) { + char buf[1024]; + if (fgets(buf, sizeof(buf), fp) == nullptr) { + break; + } + string s(buf); + assert(!s.empty()); + while (s.back() != '\n' && !feof(fp)) { + // The string was longer than the buffer, so read again. + if (fgets(buf, sizeof(buf), fp) == nullptr) { + break; + } + s += buf; + } + if (!s.empty() && s.back() == '\n') + s.pop_back(); + receiver->add_file(move(s)); + } +} + +void read_mlocate(FILE *fp, DatabaseReceiver *receiver) { - FILE *fp = fopen(filename, "rb"); - if (fp == nullptr) { - perror(filename); + if (fseek(fp, 0, SEEK_SET) != 0) { + perror("fseek"); exit(1); } @@ -289,18 +421,27 @@ void read_mlocate(const char *filename, Corpus *corpus) // TODO: Care about the base path. string path = read_cstr(fp); while (!feof(fp)) { - handle_directory(fp, corpus); + handle_directory(fp, receiver); } - fclose(fp); } -string zstd_compress(const string &src, string *tempbuf) +string zstd_compress(const string &src, ZSTD_CDict *cdict, string *tempbuf) { + static ZSTD_CCtx *ctx = nullptr; + if (ctx == nullptr) { + ctx = ZSTD_createCCtx(); + } + size_t max_size = ZSTD_compressBound(src.size()); if (tempbuf->size() < max_size) { tempbuf->resize(max_size); } - size_t size = ZSTD_compress(&(*tempbuf)[0], max_size, src.data(), src.size(), /*level=*/6); + size_t size; + if (cdict == nullptr) { + size = ZSTD_compressCCtx(ctx, &(*tempbuf)[0], max_size, src.data(), src.size(), /*level=*/6); + } else { + size = ZSTD_compress_usingCDict(ctx, &(*tempbuf)[0], max_size, src.data(), src.size(), cdict); + } return string(tempbuf->data(), size); } @@ -361,12 +502,22 @@ unique_ptr create_hashtable(Corpus &corpus, const vector &a return ht; } -void do_build(const char *infile, const char *outfile, int block_size) +void do_build(const char *infile, const char *outfile, int block_size, bool plaintext) { - steady_clock::time_point start __attribute__((unused)) = steady_clock::now(); + steady_clock::time_point start = steady_clock::now(); + + FILE *infp = fopen(infile, "rb"); + if (infp == nullptr) { + perror(infile); + exit(1); + } umask(0027); FILE *outfp = fopen(outfile, "wb"); + if (outfp == nullptr) { + perror(outfile); + exit(1); + } // Write the header. Header hdr; @@ -376,26 +527,36 @@ void do_build(const char *infile, const char *outfile, int block_size) hdr.extra_ht_slots = num_overflow_slots; hdr.num_docids = 0; hdr.hash_table_offset_bytes = -1; // We don't know these offsets yet. + hdr.max_version = 1; hdr.filename_index_offset_bytes = -1; + hdr.zstd_dictionary_length_bytes = -1; fwrite(&hdr, sizeof(hdr), 1, outfp); - Corpus corpus(outfp, block_size); + // Train the dictionary by sampling real blocks. + // The documentation for ZDICT_trainFromBuffer() claims that a reasonable + // dictionary size is ~100 kB, but 1 kB seems to actually compress better for us, + // and decompress just as fast. + DictionaryBuilder builder(/*blocks_to_keep=*/1000, block_size); + if (plaintext) { + read_plaintext(infp, &builder); + } else { + read_mlocate(infp, &builder); + } + string dictionary = builder.train(1024); + ZSTD_CDict *cdict = ZSTD_createCDict(dictionary.data(), dictionary.size(), /*level=*/6); - read_mlocate(infile, &corpus); - if (false) { // To read a plain text file. - FILE *fp = fopen(infile, "r"); - while (!feof(fp)) { - char buf[1024]; - if (fgets(buf, 1024, fp) == nullptr || feof(fp)) { - break; - } - string s(buf); - if (s.back() == '\n') - s.pop_back(); - corpus.add_file(move(s)); - } - fclose(fp); + hdr.zstd_dictionary_offset_bytes = ftell(outfp); + fwrite(dictionary.data(), dictionary.size(), 1, outfp); + hdr.zstd_dictionary_length_bytes = dictionary.size(); + + Corpus corpus(outfp, block_size, cdict); + if (plaintext) { + read_plaintext(infp, &corpus); + } else { + read_mlocate(infp, &corpus); } + fclose(infp); + corpus.flush_block(); dprintf("Read %zu files from %s\n", corpus.num_files, infile); hdr.num_docids = corpus.filename_blocks.size(); @@ -423,8 +584,9 @@ void do_build(const char *infile, const char *outfile, int block_size) trigrams += pl_builder.num_docids; bytes_for_posting_lists += pl_builder.encoded.size(); } + size_t num_trigrams = corpus.num_trigrams(); dprintf("%zu files, %zu different trigrams, %zu entries, avg len %.2f, longest %zu\n", - corpus.num_files, corpus.invindex.size(), trigrams, double(trigrams) / corpus.invindex.size(), longest_posting_list); + corpus.num_files, num_trigrams, trigrams, double(trigrams) / num_trigrams, longest_posting_list); dprintf("%zu bytes used for posting lists (%.2f bits/entry)\n", bytes_for_posting_lists, 8 * bytes_for_posting_lists / double(trigrams)); dprintf("Building posting lists took %.1f ms.\n\n", 1e3 * duration(steady_clock::now() - start).count()); @@ -479,14 +641,15 @@ void do_build(const char *infile, const char *outfile, int block_size) } // Rewind, and write the updated header. - hdr.version = 0; + hdr.version = 1; fseek(outfp, 0, SEEK_SET); fwrite(&hdr, sizeof(hdr), 1, outfp); fclose(outfp); - size_t total_bytes __attribute__((unused)) = (bytes_for_hashtable + bytes_for_posting_lists + bytes_for_filename_index + bytes_for_filenames); + size_t total_bytes = (bytes_for_hashtable + bytes_for_posting_lists + bytes_for_filename_index + bytes_for_filenames); dprintf("Block size: %7d files\n", block_size); + dprintf("Dictionary: %'7.1f MB\n", dictionary.size() / 1048576.0); dprintf("Hash table: %'7.1f MB\n", bytes_for_hashtable / 1048576.0); dprintf("Posting lists: %'7.1f MB\n", bytes_for_posting_lists / 1048576.0); dprintf("Filename index: %'7.1f MB\n", bytes_for_filename_index / 1048576.0); @@ -504,6 +667,7 @@ void usage() "Normally, the destination should be /var/lib/mlocate/plocate.db.\n" "\n" " -b, --block-size SIZE number of filenames to store in each block (default 32)\n" + " -p, --plaintext input is a plaintext file, not an mlocate database\n" " --help print this help\n" " --version print version information\n"); } @@ -521,17 +685,20 @@ int main(int argc, char **argv) { static const struct option long_options[] = { { "block-size", required_argument, 0, 'b' }, + { "plaintext", no_argument, 0, 'p' }, { "help", no_argument, 0, 'h' }, { "version", no_argument, 0, 'V' }, + { "debug", no_argument, 0, 'D' }, // Not documented. { 0, 0, 0, 0 } }; int block_size = 32; + bool plaintext = false; setlocale(LC_ALL, ""); for (;;) { int option_index = 0; - int c = getopt_long(argc, argv, "b:hV", long_options, &option_index); + int c = getopt_long(argc, argv, "b:hpVD", long_options, &option_index); if (c == -1) { break; } @@ -539,12 +706,18 @@ int main(int argc, char **argv) case 'b': block_size = atoi(optarg); break; + case 'p': + plaintext = true; + break; case 'h': usage(); exit(0); - case 'v': + case 'V': version(); exit(0); + case 'D': + use_debug = true; + break; default: exit(1); } @@ -555,6 +728,6 @@ int main(int argc, char **argv) exit(1); } - do_build(argv[optind], argv[optind + 1], block_size); + do_build(argv[optind], argv[optind + 1], block_size, plaintext); exit(EXIT_SUCCESS); }