From 0fbeb0dc3287d1869e025509fcf2aee612bd90ce Mon Sep 17 00:00:00 2001 From: Keith Rothman <537074+litghost@users.noreply.github.com> Date: Fri, 18 Jan 2019 10:26:39 -0800 Subject: [PATCH 1/2] Add utility for diffing segbits from two databases. Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com> --- utils/diff_db_bits.sh | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100755 utils/diff_db_bits.sh diff --git a/utils/diff_db_bits.sh b/utils/diff_db_bits.sh new file mode 100755 index 00000000..eafad051 --- /dev/null +++ b/utils/diff_db_bits.sh @@ -0,0 +1,26 @@ +#!/bin/bash -e + +# diff_db_bits.sh +# +# Tool for comparing database segbits outputs from two database's. + +DIR_A=$1 +DIR_B=$2 + +for A_DB_IN in $( ls ${DIR_A}/segbits*.db ); do + A_DB_OUT="$(mktemp)_a_$(basename ${A_DB_IN})" + B_DB_OUT="$(mktemp)_b_$(basename ${A_DB_IN})" + + B_DB_IN="${DIR_B}/$(basename ${A_DB_IN})" + + if [ ! -f "${B_DB_IN}" ]; then + echo "${B_DB_IN} not found!" + continue + fi + + sort ${A_DB_IN} > ${A_DB_OUT} + sort ${B_DB_IN} > ${B_DB_OUT} + + echo "Comparing $(basename ${A_DB_IN})" + diff -U 0 ${A_DB_OUT} ${B_DB_OUT} || true +done From d5f51cc1b2a59dd0412ab1669473e2f6934bbd6e Mon Sep 17 00:00:00 2001 From: Keith Rothman <537074+litghost@users.noreply.github.com> Date: Wed, 23 Jan 2019 13:03:12 -0800 Subject: [PATCH 2/2] Convert shell script to python script. Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com> --- utils/diff_db_bits.py | 44 +++++++++++++++++++++++++++++++++++++++++++ utils/diff_db_bits.sh | 26 ------------------------- 2 files changed, 44 insertions(+), 26 deletions(-) create mode 100755 utils/diff_db_bits.py delete mode 100755 utils/diff_db_bits.sh diff --git a/utils/diff_db_bits.py b/utils/diff_db_bits.py new file mode 100755 index 00000000..083f9258 --- /dev/null +++ b/utils/diff_db_bits.py @@ -0,0 +1,44 @@ +#!/usr/bin/env python3 +import argparse +import subprocess +import tempfile +import os.path +import glob + + +def main(): + parser = argparse.ArgumentParser( + description= + "Tool for comparing database segbits outputs from two database's.") + parser.add_argument('a_db') + parser.add_argument('b_db') + + args = parser.parse_args() + + assert os.path.isdir(args.a_db) + assert os.path.isdir(args.b_db) + + for a_db_in in glob.glob('{}/segbits*.db'.format(args.a_db)): + a_db_base = os.path.basename(a_db_in) + b_db_in = '{}/{}'.format(args.b_db, a_db_base) + + if not os.path.exists(b_db_in): + print('{} not found!'.format(b_db_in)) + continue + + with tempfile.NamedTemporaryFile(suffix="_a_{}".format( + a_db_base)) as a_db_out, tempfile.NamedTemporaryFile( + suffix="_b_{}".format(a_db_base)) as b_db_out: + subprocess.check_call( + "sort {}".format(a_db_in), shell=True, stdout=a_db_out) + subprocess.check_call( + "sort {}".format(b_db_in), shell=True, stdout=b_db_out) + + print("Comparing {}".format(a_db_base)) + subprocess.call( + "diff -U 0 {} {}".format(a_db_out.name, b_db_out.name), + shell=True) + + +if __name__ == "__main__": + main() diff --git a/utils/diff_db_bits.sh b/utils/diff_db_bits.sh deleted file mode 100755 index eafad051..00000000 --- a/utils/diff_db_bits.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -e - -# diff_db_bits.sh -# -# Tool for comparing database segbits outputs from two database's. - -DIR_A=$1 -DIR_B=$2 - -for A_DB_IN in $( ls ${DIR_A}/segbits*.db ); do - A_DB_OUT="$(mktemp)_a_$(basename ${A_DB_IN})" - B_DB_OUT="$(mktemp)_b_$(basename ${A_DB_IN})" - - B_DB_IN="${DIR_B}/$(basename ${A_DB_IN})" - - if [ ! -f "${B_DB_IN}" ]; then - echo "${B_DB_IN} not found!" - continue - fi - - sort ${A_DB_IN} > ${A_DB_OUT} - sort ${B_DB_IN} > ${B_DB_OUT} - - echo "Comparing $(basename ${A_DB_IN})" - diff -U 0 ${A_DB_OUT} ${B_DB_OUT} || true -done