Indent fix.

[remoteglot-book] / build-book.sh

diff --git a/build-book.sh b/build-book.sh
index 772f3fb567d5f67e65c0d8593e3d2c65239d2d0e..ef5e43657089bb6dfac4dfd04a7391ce9dea60f1 100755 (executable)
--- a/build-book.sh
+++ b/build-book.sh
@@ -2,10 +2,11 @@
 
 set -e
 
+export MAPPERS=40
+export REDUCERS=40
 export SHARDS=40
-export PARALLEL_MERGES=40
 
-rm -f pgnnames.txt tmp.mtbl* open.mtbl.new open.mtbl.part???? open.mtbl.part????.new 2>/dev/null
+rm -f pgnnames.txt tmp.mtbl* open.mtbl.part????.new 2>/dev/null
 
 for FILE in "$@"; do
        echo "$FILE" >> pgnnames.txt
@@ -13,17 +14,22 @@ done
 
 TS_BEGIN=$( date +%s%3N )
 
-for X in $( seq 0 39 ); do
+for X in $( seq 0 $(( MAPPERS - 1 )) ); do
        (
                (
                        PGNNUM=0
                        for FILE in "$@"; do
-                               START=$( ./find-pgn-split-point.sh "$FILE" $X 40 )
-                               END=$( ./find-pgn-split-point.sh "$FILE" $(( X + 1 )) 40 )
-                               ~/nmu/pgn-extract/pgn-extract --startpos $START --endpos $END --startfilenum $PGNNUM -e -Wsessebin "$FILE" 2>/dev/null
+                               COMP=0
+                               if echo "$FILE" | grep -q ^comp:; then
+                                       COMP=1
+                                       FILE=$( echo "$FILE" | sed s/comp:// )
+                               fi
+                               START=$( ./find-pgn-split-point.sh "$FILE" $X $MAPPERS )
+                               END=$( ./find-pgn-split-point.sh "$FILE" $(( X + 1 )) $MAPPERS )
+                               ~/nmu/pgn-extract/pgn-extract --computerflag $COMP --startpos $START --endpos $END --startfilenum $PGNNUM -e -Wsessebin "$FILE" 2>/dev/null
                                PGNNUM=$(( PGNNUM + 1 ))
                        done
-               ) | ./binloader - tmp.mtbl.mapper$X $SHARDS 500000
+               ) | ./binloader - tmp.mtbl.mapper$X $SHARDS 200000
        ) &
 done
 wait
@@ -33,16 +39,19 @@ MAPOUTPUT=$( du -sch tmp.mtbl.mapper* | tail -n 1 | cut -f1 | sed 's/\([^0-9]\)$
 
 echo "Reducing..."
 
-parallel -i -j ${PARALLEL_MERGES} bash -c 'X={}; ./binmerger tmp.mtbl.mapper*.part$( printf %04d $X ).subshard* open.mtbl.part$( printf %04d $X ).new' -- $( seq 0 $(( SHARDS - 1 )) )
+parallel -i -j $REDUCERS bash -c 'X={}; ./binmerger tmp.mtbl.mapper*.part$( printf %04d $X ).subshard* open.mtbl.part$( printf %04d $X ).new' -- $( seq 0 $(( SHARDS - 1 )) )
 
 TS_REDUCEDONE=$( date +%s%3N )
 REDUCEOUTPUT=$( du -sch open.mtbl.part*.new | tail -n 1 | cut -f1 | sed 's/\([^0-9]\)$/ \1/' )
 
 for X in $( seq 0 $(( SHARDS - 1 )) ); do
        mv open.mtbl.part$( printf %04d $X ).new open.mtbl.part$( printf %04d $X )
+       chmod 0644 open.mtbl.part$( printf %04d $X )
 done
 rm -f tmp.mtbl*
 
+chmod 0644 pgnnames.txt
+
 TS_END=$( date +%s%3N )
 
 printf "\n"