Store and merge the file number information. Still unused in the UI.

[remoteglot-book] / build-book.sh

diff --git a/build-book.sh b/build-book.sh
index 1ed0b7771c2d8341737c78163b47486ff7977610..e6e8c09afa4def12b1b1a07cb01868b634d215c7 100755 (executable)
--- a/build-book.sh
+++ b/build-book.sh
@@ -2,28 +2,27 @@
 
 set -e
 
-SHARDS=40
+export SHARDS=40
+export PARALLEL_LOADS=20  # Reduce if you have problems with OOM
 
-rm -f part-*.bin part-*.mtbl part-*.mtbl.part???? open.mtbl.new open.mtbl.part???? open.mtbl.part????.new 2>/dev/null
+rm -f pgnnames.txt part-*.bin part-*.mtbl part-*.mtbl.part???? open.mtbl.new open.mtbl.part???? open.mtbl.part????.new 2>/dev/null
 
-for FILE in $@; do
+PGNNUM=0
+for FILE in "$@"; do
        date | tr -d "\n"
        echo "  $FILE"
-       ./parallel-parse-pgn.sh $FILE
+       ./parallel-parse-pgn.sh "$FILE" "$PGNNUM"
+       echo "$FILE" >> pgnnames.txt
+       PGNNUM=$(( PGNNUM + 1 ))
 done
 date 
 
-for FILE in part-*.bin; do
-       ( ./binloader $FILE ${FILE/bin/mtbl} $SHARDS ) &
-done
-wait
+echo "Loading..."
+parallel -i -j ${PARALLEL_LOADS} bash -c 'FILE="{}"; set -x; ./binloader "$FILE" "${FILE/bin/mtbl}" $SHARDS' -- part-*.bin
 
 rm -f part-*.bin
 
-for X in $( seq 0 $(( SHARDS - 1 )) ); do
-       ( ./binmerger part-*.mtbl.part$( printf %04d $X ) open.mtbl.part$( printf %04d $X ).new ) &
-done
-wait
+parallel -i -j ${PARALLEL_LOADS} bash -c 'X={}; set -x; ./binmerger part-*.mtbl.part$( printf %04d $X ) open.mtbl.part$( printf %04d $X ).new' -- $( seq 0 $(( SHARDS - 1 )) )
 
 for X in $( seq 0 $(( SHARDS - 1 )) ); do
        mv open.mtbl.part$( printf %04d $X ).new open.mtbl.part$( printf %04d $X )