Fix a field ordering messup caused by the memory saving changes.

[remoteglot-book] / binloader.cpp

diff --git a/binloader.cpp b/binloader.cpp
index e472364e47b234e8a3a0ed02f03c47c8d47a7582..44088856081f05eb05e7ddb464a00ccbd4ddb98a 100644 (file)
--- a/binloader.cpp
+++ b/binloader.cpp
@@ -9,21 +9,39 @@
 #include <utility>
 #include <memory>
 #include <string>
+#include <unordered_set>
 #include <string.h>
-#include "count.h"
+#include "count.pb.h"
+#include "arena.h"
 #include "hash.h"
 
+#define DUMMY_TIMESTAMP 32503680000
+
 using namespace std;
 
+Arena arena;
+
 enum Result { WHITE = 0, DRAW, BLACK };
 struct Element {
-       string bpfen_and_move;
+       char *bpfen;
+       int bpfen_len;
+       char move[8];   // Na1xc3+
        Result result;
        int opening_num, white_elo, black_elo;
+       int file_num;
        time_t timestamp;
+       long start_position;
 
        bool operator< (const Element& other) const {
-               return bpfen_and_move < other.bpfen_and_move;
+               int shared_len = min(bpfen_len, other.bpfen_len);
+               int s = memcmp(bpfen, other.bpfen, shared_len);
+               if (s < 0) {
+                       return true;
+               } else if (s > 0) {
+                       return false;
+               } else {
+                       return bpfen_len < other.bpfen_len;
+               }
        }
 };
 
@@ -42,14 +60,13 @@ int main(int argc, char **argv)
                        exit(1);
                }
                for ( ;; ) {
-                       int l = getc(fp);
-                       if (l == -1) {
+                       int bpfen_len = getc(fp);
+                       if (bpfen_len == -1) {
                                break;
                        }
                
-                       string bpfen_and_move;
-                       bpfen_and_move.resize(l);
-                       if (fread(&bpfen_and_move[0], l, 1, fp) != 1) {
+                       char *bpfen = arena.alloc(bpfen_len);
+                       if (fread(bpfen, bpfen_len, 1, fp) != 1) {
                                perror("fread()");
                //              exit(1);
                                break;
@@ -62,8 +79,9 @@ int main(int argc, char **argv)
                                break;
                        }
 
-                       int opening_num, white_elo, black_elo;
+                       int opening_num, white_elo, black_elo, file_num;
                        time_t timestamp;
+                       long start_position;
                        if (fread(&white_elo, sizeof(white_elo), 1, fp) != 1) {
                                perror("fread()");
                                //exit(1);
@@ -84,9 +102,48 @@ int main(int argc, char **argv)
                                //exit(1);
                                break;
                        }
+                       if (fread(&file_num, sizeof(file_num), 1, fp) != 1) {
+                               perror("fread()");
+                               //exit(1);
+                               break;
+                       }
+                       if (fread(&start_position, sizeof(start_position), 1, fp) != 1) {
+                               perror("fread()");
+                               //exit(1);
+                               break;
+                       }
+
 
-                       int bucket = hash_key_to_bucket(bpfen_and_move.data(), bpfen_and_move.size(), num_buckets);
-                       elems[bucket].emplace_back(Element {move(bpfen_and_move), Result(r), opening_num, white_elo, black_elo, timestamp});
+                       char move[8];
+                       int l = getc(fp);
+                       if (l == -1) {
+                               break;
+                       }
+                       if (l >= int(sizeof(move))) {
+                               fprintf(stderr, "Overlong move (%d bytes)\n", l);
+               //              exit(1);
+                               break;
+                       }
+                       if (fread(&move[0], l, 1, fp) != 1) {
+                               perror("fread()");
+               //              exit(1);
+                               break;
+                       }
+                       move[l] = 0;
+
+                       int bucket = hash_key_to_bucket(bpfen, bpfen_len, num_buckets);
+                       Element e;
+                       e.bpfen = bpfen;
+                       e.bpfen_len = bpfen_len;
+                       strcpy(e.move, move);
+                       e.result = Result(r);
+                       e.opening_num = opening_num;
+                       e.white_elo = white_elo;
+                       e.black_elo = black_elo;
+                       e.file_num = file_num;
+                       e.timestamp = timestamp;
+                       e.start_position = start_position;
+                       elems[bucket].push_back(e);
                        ++num_elems;
                }
                fclose(fp);
@@ -100,6 +157,7 @@ int main(int argc, char **argv)
        }
 
        printf("Writing SSTables...\n");
+       string buf;  // Keep allocated.
        for (int i = 0; i < num_buckets; ++i) {
                char filename[256];
                snprintf(filename, sizeof(filename), "%s.part%04d", argv[argc - 2], i);
@@ -108,30 +166,42 @@ int main(int argc, char **argv)
                mtbl_writer_options_set_compression(wopt, MTBL_COMPRESSION_SNAPPY);
                mtbl_writer* mtbl = mtbl_writer_init(filename, wopt);
                Count c;
+               unordered_set<string> moves;
                for (size_t j = 0; j < elems[i].size(); ++j) {
                        const Element &e = elems[i][j];
                        if (e.result == WHITE) {
-                               ++c.white;
+                               c.set_white(c.white() + 1);
                        } else if (e.result == DRAW) {
-                               ++c.draw;
+                               c.set_draw(c.draw() + 1);
                        } else if (e.result == BLACK) {
-                               ++c.black;
+                               c.set_black(c.black() + 1);
                        }
                        if (e.white_elo >= 100 && e.black_elo >= 100) {
-                               c.sum_white_elo += e.white_elo;
-                               c.sum_black_elo += e.black_elo;
-                               ++c.num_elo;
+                               c.set_sum_white_elo(c.sum_white_elo() + e.white_elo);
+                               c.set_sum_black_elo(c.sum_black_elo() + e.black_elo);
+                               c.set_num_elo(c.num_elo() + 1);
+                       }
+                       if (!c.has_first_timestamp() || e.timestamp < c.first_timestamp()) {
+                               if (e.timestamp != DUMMY_TIMESTAMP) {
+                                       c.set_first_timestamp(e.timestamp);
+                               }
+                               c.set_opening_num(e.opening_num);
+                               c.set_pgn_file_num(e.file_num);
+                               c.set_pgn_start_position(e.start_position);
                        }
-                       if (c.first_timestamp == DUMMY_TIMESTAMP ||
-                           e.timestamp < c.first_timestamp) {
-                               c.first_timestamp = e.timestamp;
-                               c.opening_num = e.opening_num;
+                       if (!moves.count(e.move)) {
+                               moves.insert(e.move);
+                               c.add_move(e.move);
                        }
-                       if (j == elems[i].size() - 1 || e.bpfen_and_move != elems[i][j + 1].bpfen_and_move) {
+                       if (j == elems[i].size() - 1 ||
+                           e.bpfen_len != elems[i][j + 1].bpfen_len ||
+                           memcmp(e.bpfen, elems[i][j + 1].bpfen, e.bpfen_len) != 0) {
+                               c.SerializeToString(&buf);
                                mtbl_writer_add(mtbl,
-                                       (const uint8_t *)e.bpfen_and_move.data(), e.bpfen_and_move.size(),
-                                       (const uint8_t *)&c, sizeof(c));
+                                       (const uint8_t *)e.bpfen, e.bpfen_len,
+                                       (const uint8_t *)buf.data(), buf.size());
                                c = Count();
+                               moves.clear();
                        }
                }
                mtbl_writer_destroy(&mtbl);