Renamed querydbn to querydbs

Author: calccrypto

contrib/make/src

@@ -8,7 +8,7 @@ LIB_A = lib$(LIB).a
 
 # executables
 DFW       = dfw
-BFW       = bfti bfwreaddirplus2db gufi_dir2trace gufi_dir2index gufi_stat gufi_trace2index gufi_query querydbn
+BFW       = bfti bfwreaddirplus2db gufi_dir2trace gufi_dir2index gufi_stat gufi_trace2index gufi_query querydbs
 BFW_MYSQL = bfmi.mysql
 ifneq ("$(CXX)", "false")
 CXX_TOOLS =

contrib/make/test

@@ -6,7 +6,7 @@ TESTDST  = $(TESTDIR).gufi
 
 SUBDIRECTORIES = regression unit
 
-FILES    = bfwi bfti bfq bfwreaddirplus2db querydbn dfw listschemadb listtablesdb groupfilespacehogusesummary userfilespacehogusesummary groupfilespacehog userfilespacehog oldbigfiles
+FILES    = bfwi bfti bfq bfwreaddirplus2db querydbs dfw listschemadb listtablesdb groupfilespacehogusesummary userfilespacehogusesummary groupfilespacehog userfilespacehog oldbigfiles
 
 # these are trashable files and dirs produced by the test/run* tests
 TEST_PRODUCTS = testout.* outdb* outq.* core.* bfwreaddirplusdb* $(TESTDIR) $(TESTDST) testbwrpdb

examples/groupfilespacehog

@@ -63,12 +63,12 @@
 SCRIPT="$BASH_SOURCE" # Must be at the top
 DIR=`dirname $SCRIPT`
 BFQ=$DIR/../src/gufi_query
-QUERYDBN=$DIR/../src/querydbn
+QUERYDBS=$DIR/../src/querydbs
 
-#echo "running groupfilespacehog bfq is $BFQ and querydbn is $QUERYDBN"
+#echo "running groupfilespacehog bfq is $BFQ and querydbs is $QUERYDBS"
 echo "query to create db insert recs from entry query into out db group file space hog"
 rm -f outdb*
 $BFQ -E "insert into sument select gidtogroup(gid, 0), count(*), sum(size) from entries where type='f' group by gid;" -n $2 -O outdb -I "create table sument (groupname text, totfiles int64, totsize int64);" $1
 #ls -l
-#$EPATH/querydbn outdb "select groupname, totfiles, totsize from vsument group by groupname;" 0 1 1 $2 sument
-$QUERYDBN -NV outdb sument "select groupname, sum(totfiles), sum(totsize) from vsument group by groupname;" outdb.*
+#$EPATH/querydbs outdb "select groupname, totfiles, totsize from vsument group by groupname;" 0 1 1 $2 sument
+$QUERYDBS -NV outdb sument "select groupname, sum(totfiles), sum(totsize) from vsument group by groupname;" outdb.*

examples/groupfilespacehogusesummary

@@ -63,9 +63,9 @@
 SCRIPT="$BASH_SOURCE" # Must be at the top
 DIR=`dirname $SCRIPT`
 BFQ=$DIR/../src/gufi_query
-QUERYDBN=$DIR/../src/querydbn
+QUERYDBS=$DIR/../src/querydbs
 
 echo "query to create db insert recs from entry query into out db group file space hog use group summary"
 rm -f outdb*
 $BFQ -E "insert into sumsum select gidtogroup(gid, 0), totfiles, totsize from vsummarygroup;" -n $2 -O outdb -I "create table sumsum (groupname text, totfiles int64, totsize int64);" $1
-$QUERYDBN -NV outdb sumsum "select groupname, sum(totfiles), sum(totsize) from vsumsum group by groupname;" outdb.*
+$QUERYDBS -NV outdb sumsum "select groupname, sum(totfiles), sum(totsize) from vsumsum group by groupname;" outdb.*

examples/oldbigfiles

@@ -64,10 +64,10 @@ SCRIPT="$BASH_SOURCE" # Must be at the top
 DIR=`dirname $SCRIPT`
 SCR=$DIR/../examples
 BFQ=$DIR/../src/gufi_query
-QUERYDBN=$DIR/../src/querydbn
+QUERYDBS=$DIR/../src/querydbs
 
 echo "query to create db insert recs from entry query into out db old big files"
 rm -f outdb*
 # if you want to be fancy then use date functions to provide this in user readable date/time
-$BFQ -E "insert into sument select uidtouser(uid, 0), path(''), name, size, mtime from entries where type='f'and size>4;" -n $2 -O outdb -I "create table sument (username text, pathname text, name text, size int64, mtime int64);" $1
-$QUERYDBN -NV outdb sument "select username, pathname,name,size,mtime from vsument order by size;" outdb.*
+$BFQ -E "insert into sument select uidtouser(uid, 0), path(), name, size, mtime from entries where type='f'and size>4;" -n $2 -O outdb -I "create table sument (username text, pathname text, name text, size int64, mtime int64);" $1
+$QUERYDBS -NV outdb sument "select username, pathname,name,size,mtime from vsument order by size;" outdb.*

examples/userfilespacehog

@@ -63,11 +63,11 @@
 SCRIPT="$BASH_SOURCE" # Must be at the top
 DIR=`dirname $SCRIPT`
 BFQ=$DIR/../src/gufi_query
-QUERYDBN=$DIR/../src/querydbn
+QUERYDBS=$DIR/../src/querydbs
 
 EPATH=..
 echo "query to create db insert recs from entry query into out db user file space hog"
 rm -f outdb*
 $BFQ -E "insert into sument select uidtouser(uid, 0), count(*), sum(size) from entries where type='f' group by uid;" -n $2 -O outdb -I "create table sument (username text, totfiles int64, totsize int64);" $1
-#$EPATH/querydbn outdb "select username, totfiles, totsize from vsument group by username;" 0 1 1 $2 sument
-$QUERYDBN -NV outdb sument "select username, sum(totfiles), sum(totsize) from vsument group by username;" outdb.*
+#$EPATH/querydbs outdb "select username, totfiles, totsize from vsument group by username;" 0 1 1 $2 sument
+$QUERYDBS -NV outdb sument "select username, sum(totfiles), sum(totsize) from vsument group by username;" outdb.*

examples/userfilespacehogusesummary

@@ -63,9 +63,9 @@
 SCRIPT="$BASH_SOURCE" # Must be at the top
 DIR=`dirname $SCRIPT`
 BFQ=$DIR/../src/gufi_query
-QUERYDBN=$DIR/../src/querydbn
+QUERYDBS=$DIR/../src/querydbs
 
 echo "query to create db insert recs from entry query into out db user file space hog use user summary"
 rm -f outdb*
 $BFQ -E "insert into sumsum select uidtouser(uid, 0), totfiles, totsize from vsummaryuser;" -n $2 -O outdb -I "create table sumsum (username text, totfiles int64, totsize int64);" $1
-$QUERYDBN -NV outdb sumsum "select username, sum(totfiles), sum(totsize) from vsumsum group by username;" outdb.*
+$QUERYDBS -NV outdb sumsum "select username, sum(totfiles), sum(totsize) from vsumsum group by username;" outdb.*

src/CMakeLists.txt

@@ -199,7 +199,7 @@ set(C_SOURCES
   gufi_query.c
   gufi_stat.c
   parallel_rmr.c
-  querydbn.c
+  querydbs.c
   rollup.c
   unrollup.c
 )

src/querydbn.c src/querydbs.c

@@ -91,7 +91,7 @@ foreach(TEST
     runlistschemadb
     runlisttablesdb
     runoldbigfiles
-    runquerydbn
+    runquerydbs
     runuidgidsummary
     runuidgidummary
     runuserfilespacehog

test/CMakeLists.txt

@@ -65,9 +65,9 @@
 SCRIPT="$BASH_SOURCE" # Must be at the top
 DIR=`dirname $SCRIPT`
 BFQ=$DIR/../bfq
-QUERYDBN=$DIR/../querydbn
+QUERYDBS=$DIR/../querydbs
 
 echo "query to create db insert recs from entry query into out db group file space hog use group summary"
 rm -f outdb*
 $BFQ -E "insert into sumsum select gidtogroup(gid), totfiles, totsize from vsummarygroup;" -n $2 -O outdb -I "create table sumsum (groupname text, totfiles int64, totsize int64);" $1
-$QUERYDBN -NV outdb $2 "select groupname, sum(totfiles), sum(totsize) from vsumsum group by groupname;" sumsum
+$QUERYDBS -NV outdb $2 "select groupname, sum(totfiles), sum(totsize) from vsumsum group by groupname;" sumsum

test/groupfilespacehogusesummary

@@ -608,8 +608,8 @@ def cflatloadbfwi():
  if (exit_code!=0):
    exit(exit_code)
 ################################### test cflatloadbfwi end ############################################
-################################### test cbfqbftiquerydbn ############################################
-def cbfqbftiquerydbn():
+################################### test cbfqbftiquerydbs ############################################
+def cbfqbftiquerydbs():
  global dcnt
  global fcnt
  global fsz
@@ -637,10 +637,10 @@ def cbfqbftiquerydbn():
  ############################
  # do some bfq tests now
  print "testing bfq tot dirs %d tot files %d tot bytes %d tot files with xattrs %d tot links %d" % (dcnt,fcnt,fsz,xcnt,lcnt)
- of="%s/cbfqbftiquerydbnout" % (top)
- of1="%s/cbfqbftiquerydbnout1" % (top)
- oft="%s/cbfqbftiquerydbnout.0" % (top)
- oft1="%s/cbfqbftiquerydbnout1.0" % (top)
+ of="%s/cbfqbftiquerydbsout" % (top)
+ of1="%s/cbfqbftiquerydbsout1" % (top)
+ oft="%s/cbfqbftiquerydbsout.0" % (top)
+ oft1="%s/cbfqbftiquerydbsout1.0" % (top)
  ###### num file test #####
  print "+++++++++ test to see if gufi agrees totfiles=%d" % (fcnt)
  os.system('%s/%s/bfq -n1 -p -E "select name from entries where type=\'f\';" -o %s %s'  % (tdir,gdir,of,'gt/d0'))
@@ -682,23 +682,23 @@ def cbfqbftiquerydbn():
   else:
    print "xattr count match xcnt %d numl %d" % (xcnt,numl)
  ###### end num dir test #####
- ###### sum of file sizes test uses querydbn #####/os
- print "+++++++++ test to see if bfq creating output db per thread and use querydbn to aggregate total size=%d" % (fsz)
+ ###### sum of file sizes test uses querydbs #####/os
+ print "+++++++++ test to see if bfq creating output db per thread and use querydbs to aggregate total size=%d" % (fsz)
  os.system('%s/%s/bfq -n 2 -p -E "insert into sument select size from entries where type=\'f\'and size>0;" -I "create table sument (sz int64);" -O outdb %s'  % (tdir,gdir,'gt/d0'))
  #os.system('%s/%s/bfq -n 1 -p -E "insert into sument select size from entries where type=\'f\'and size>0;" -I "create table sument (sz int64);" -O outdb %s'  % (tdir,gdir,'gt/d0'))
- os.system('%s/%s/querydbn -V  outdb 2 "select sum(sz) from vsument" sument > querydbnout' % (tdir,gdir))
- #os.system('%s/%s/querydbn -V  outdb 1 "select sum(sz) from vsument" sument > querydbnout' % (tdir,gdir))
- os.system('cat querydbnout');
- proc=subprocess.Popen('head -1 querydbnout',stdout=subprocess.PIPE,shell=True)
+ os.system('%s/%s/querydbs -V  outdb 2 "select sum(sz) from vsument" sument > querydbsout' % (tdir,gdir))
+ #os.system('%s/%s/querydbs -V  outdb 1 "select sum(sz) from vsument" sument > querydbsout' % (tdir,gdir))
+ os.system('cat querydbsout');
+ proc=subprocess.Popen('head -1 querydbsout',stdout=subprocess.PIPE,shell=True)
  for line in proc.stdout:
   csz=line.split('|')[0]
   sz=string.atoi(csz)
  if (sz!=fsz):
-  print "error: file size total from querydbn %d real file size total %d" % (sz,fsz)
+  print "error: file size total from querydbs %d real file size total %d" % (sz,fsz)
   exit()
  else:
-  print "good news: file size total from querydbn %d real file size total %d" % (sz,fsz)
- ###### end sum of file sizes test uses querydbn #####
+  print "good news: file size total from querydbs %d real file size total %d" % (sz,fsz)
+ ###### end sum of file sizes test uses querydbs #####
  ######  tree directory use test #####
  ####?????????????????????? need to fix bfq so that it doesnt print an error if a dir doesnt have a tree summary
  #### select name from sqlite_master where type='table' and name='treesummary'; should do the trick
@@ -713,7 +713,7 @@ def cbfqbftiquerydbn():
  else:
    print "good news: using tree summary examined %d directories and not using tree summary examined %d directories" % (numl,numl1)
  ######  end tree directory use test #####
-################################## test cbfqbftiquerydbn end ############################################
+################################## test cbfqbftiquerydbs end ############################################
 ################################### test cincr3modf ############################################
 def cbfwiinsrc():
  testn="correctness bfwi in src tree"
@@ -881,16 +881,16 @@ def fbfwreaddirplus2db():
  os.system('%s/runbfwreaddirplus2db %s > %s' % (tdir,'d0',testfull))
  outlines=flines(testfull,normlines,1,1)
 ################################### func fquerydb end ############################################
-################################### func fquerydbn ############################################
-def fquerydbn():
- testf='fquerydbn'
+################################### func fquerydbs ############################################
+def fquerydbs():
+ testf='fquerydbs'
  normlines=5
  testfull='%s/%s' % (funcout,testf)
- testn="functional querydbn"
+ testn="functional querydbs"
  cleanstart(testn,1)
- os.system('%s/runquerydbn %s %s > %s' % (tdir,'gt/d0','2',testfull))
+ os.system('%s/runquerydbs %s %s > %s' % (tdir,'gt/d0','2',testfull))
  outlines=flines(testfull,normlines,1,1)
-################################### func fquerydbn end ############################################
+################################### func fquerydbs end ############################################
 ################################### func fgroupfilespacehog ############################################
 def fgroupfilespacehog():
  testf='fgroupfilespacehog'
@@ -1015,7 +1015,7 @@ def runallc():
  cflatloaddfw()
  cflatloadfinddfw()
  cflatloadbfwi()
- cbfqbftiquerydbn()
+ cbfqbftiquerydbs()
  cbfwiinsrc()
  cbfwrp2dbfullinsrc()
  cbfwrdp2dbincrinsrc()
@@ -1028,7 +1028,7 @@ def runallf():
  fdfw()
  fquerydb()
  fbfwreaddirplus2db()
- fquerydbn()
+ fquerydbs()
  fgroupfilespacehog()
  fgroupfilespacehogusesummary()
  fuserfilespacehog()
@@ -1053,7 +1053,7 @@ def usage():
  print "cflatloaddfw                      - correctness flat load using bfwi -u from dfw"
  print "cflatloadfinddfw                  - correctness flat load using bfwi -u from find dfw"
  print "cflatloadbfwi                     - correctness flat load using bfwi -u from bfwi"
- print "cbfqbftiquerydbn                  - correctness bfq and bfti and querydnb"
+ print "cbfqbftiquerydbs                  - correctness bfq and bfti and querydnb"
  print "cbfwiinsrc                        - correctness bfwi putting index in src tree"
  print "cbfwrp2dbfullinsrc                - correctness bfwreaddirplus2db full gufi tree build in src tree"
  print "cbfwrdp2dbincrinsrc               - correctness bfwreaddirplus2db incr gufi tree update in src tree"
@@ -1063,7 +1063,7 @@ def usage():
  print "fdfw                              - functional dfw"
  print "fquerydb                          - functional querydb"
  print "freaddirplus2db                   - functional readdirplus2db"
- print "fquerydbn                         - functional querydbn"
+ print "fquerydbs                         - functional querydbs"
  print "fgroupfilespacehog                - functional groupfilespacehog"
  print "fgroupfilespacehogusesummary      - functional groupfilespacehogusesummary"
  print "fuserfilespacehog                 - functional userfilespacehog"
@@ -1123,8 +1123,8 @@ def usage():
   cflatloadbfwi()
   print "+_+_+_+_+_+_+_+_+_ end test %s +_+_+_+_+_+_+_+_+" % (sys.argv[1])
   exit(0)
- elif (sys.argv[1] == 'cbfqbftiquerydbn'):
-  cbfqbftiquerydbn()
+ elif (sys.argv[1] == 'cbfqbftiquerydbs'):
+  cbfqbftiquerydbs()
   print "+_+_+_+_+_+_+_+_+_ end test %s +_+_+_+_+_+_+_+_+" % (sys.argv[1])
   exit(0)
  elif (sys.argv[1] == 'cbfwiinsrc'):
@@ -1169,9 +1169,9 @@ def usage():
   fbfwreaddirplus2db()
   print "+_+_+_+_+_+_+_+_+_ end test %s +_+_+_+_+_+_+_+_+" % (sys.argv[1])
   exit(0)
- elif (sys.argv[1] == 'fquerydbn'):
+ elif (sys.argv[1] == 'fquerydbs'):
   os.system('mkdir %s' % (funcout))
-  fquerydbn()
+  fquerydbs()
   print "+_+_+_+_+_+_+_+_+_ end test %s +_+_+_+_+_+_+_+_+" % (sys.argv[1])
   exit(0)
  elif (sys.argv[1] == 'fgroupfilespacehog'):

test/gufitest.py

@@ -76,7 +76,7 @@ set(SH_AND_EXPECTED
   gufi_dir2trace
   gufi_trace2index
   gufi_query
-  querydbn
+  querydbs
 )
 
 # .sh, .py, and .expected

test/regression/CMakeLists.txt

@@ -2,7 +2,7 @@
 gufi_query -n 2 -O outdb -I "CREATE TABLE out(name TEXT, size INT64)" -E "INSERT INTO out SELECT path(summary.name) || '/' || pentries.name, pentries.size FROM summary, pentries WHERE (pentires.type=='f') AND (summary.inode == pentries.pinode)" .
 
 # Query all per-thread result databse files at once
-querydbn -NV outdb "out" "SELECT name, size FROM vout ORDER BY size ASC, name ASC" outdb.*
+querydbs -NV outdb "out" "SELECT name, size FROM vout ORDER BY size ASC, name ASC" outdb.*
 name|size|
 empty_file|0|
 .hidden|1|

test/regression/querydbn.expected test/regression/querydbs.expected

@@ -69,7 +69,7 @@ ROOT="$(dirname ${ROOT})"
 ROOT="$(dirname ${ROOT})"
 
 BFQ="${ROOT}/src/gufi_query"
-QUERYDBN="${ROOT}/src/querydbn"
+QUERYDBS="${ROOT}/src/querydbs"
 OUTDB="outdb"
 TABLE="out"
 THREADS="2"
@@ -88,10 +88,10 @@ trap cleanup EXIT
 
 cleanup
 
-OUTPUT="querydbn.out"
+OUTPUT="querydbs.out"
 
 function replace() {
-    echo "$@" | sed "s/${BFQ//\//\\/}/gufi_query/g; s/${QUERYDBN//\//\\/}/querydbn/g; s/${INDEXROOT//\//\\/}\\///g; s/${INDEXROOT//\//\\/}/./g; s/[[:space:]]*$//g"
+    echo "$@" | sed "s/${BFQ//\//\\/}/gufi_query/g; s/${QUERYDBS//\//\\/}/querydbs/g; s/${INDEXROOT//\//\\/}\\///g; s/${INDEXROOT//\//\\/}/./g; s/[[:space:]]*$//g"
 }
 
 (
@@ -101,12 +101,12 @@ output=$(${BFQ} -n ${THREADS} -O "${OUTDB}" -I "CREATE TABLE ${TABLE}(name TEXT,
 echo "${output}"
 
 replace "# Query all per-thread result databse files at once"
-replace  "${QUERYDBN} -NV outdb \"${TABLE}\" \"SELECT name, size FROM v${TABLE} ORDER BY size ASC, name ASC\" outdb.*"
-output=$(${QUERYDBN} -NV outdb "${TABLE}" "SELECT name, size FROM v${TABLE} ORDER BY size ASC, name ASC" outdb.*)
+replace  "${QUERYDBS} -NV outdb \"${TABLE}\" \"SELECT name, size FROM v${TABLE} ORDER BY size ASC, name ASC\" outdb.*"
+output=$(${QUERYDBS} -NV outdb "${TABLE}" "SELECT name, size FROM v${TABLE} ORDER BY size ASC, name ASC" outdb.*)
 replace "${output}"
 echo
 
 ) | tee "${OUTPUT}"
 
-diff ${ROOT}/test/regression/querydbn.expected "${OUTPUT}"
+diff -b ${ROOT}/test/regression/querydbs.expected "${OUTPUT}"
 rm "${OUTPUT}"

test/regression/querydbn.sh test/regression/querydbs.sh

@@ -65,7 +65,7 @@
 SCRIPT="$BASH_SOURCE" # Must be at the top
 DIR=`dirname $SCRIPT`
 BFWREADDIRPLUS2DB=$DIR/../src/bfwreaddirplus2db
-QUERYDBN=$DIR/../src/querydbn
+QUERYDBS=$DIR/../src/querydbs
 
 
 # NOTE: The destination GUFI-tree is optional
@@ -182,10 +182,10 @@ echo ""
 sqlite3 -line bfwreaddirplusdb.1 'select * from readdirplus;'
 echo ""
 
-# run querydbn to union all the db's together into one table
-echo " run querydbn to union all the db's together into one table"
+# run querydbs to union all the db's together into one table
+echo " run querydbs to union all the db's together into one table"
 echo ""
-$QUERYDBN -N -V -p bfwreaddirplusdb 2 "select * from vreaddirplus" readdirplus
+$QUERYDBS -N -V -p bfwreaddirplusdb 2 "select * from vreaddirplus" readdirplus
 
 # run to create output db
 echo

test/runbfwreaddirplus2db

@@ -65,7 +65,7 @@
 SCRIPT="$BASH_SOURCE" # Must be at the top
 DIR=`dirname $SCRIPT`
 BFWREADDIRPLUS2DB=$DIR/../bfwreaddirplus2db
-QUERYDBN=$DIR/../querydbn
+QUERYDBS=$DIR/../querydbs
 
 
 # NOTE: The destination GUFI-tree is optional
@@ -183,10 +183,10 @@ echo ""
 sqlite3 -line bfwreaddirplusdb.1 'select * from readdirplus;'
 echo ""
 
-# run querydbn to union all the db's together into one table
-echo " run querydbn to union all the db's together into one table"
+# run querydbs to union all the db's together into one table
+echo " run querydbs to union all the db's together into one table"
 echo ""
-$QUERYDBN -N -V -p bfwreaddirplusdb 2 "select * from vreaddirplus" readdirplus
+$QUERYDBS -N -V -p bfwreaddirplusdb 2 "select * from vreaddirplus" readdirplus
 
 # run to create output db
 echo

test/runbfwreaddirplus2db.orig

@@ -67,10 +67,10 @@
 SCRIPT="$BASH_SOURCE" # Must be at the top
 DIR=`dirname $SCRIPT`
 BFQ=$DIR/../src/gufi_query
-QUERYDBN=$DIR/../src/querydbn
+QUERYDBS=$DIR/../src/querydbs
 
-echo "query to create db insert recs from entry query into out db big files and run querydbn"
+echo "query to create db insert recs from entry query into out db big files and run querydbs"
 rm -f outdb*
 # if you want to be fancy then use date functions to provide this in user readable date/time
-$BFQ -E "insert into sument select uidtouser(uid, 5), path(''), name, size, mtime from entries where type='f'and size>4;" -n $2 -O outdb -I "create table sument (username text, pathname text, name text, size int64, mtime int64);" $1
-$QUERYDBN -NV outdb sument "select username, pathname, name, size, mtime from vsument order by size;" outdb.*
+$BFQ -E "insert into sument select uidtouser(uid, 5), path(), name, size, mtime from entries where type='f'and size>4;" -n $2 -O outdb -I "create table sument (username text, pathname text, name text, size int64, mtime int64);" $1
+$QUERYDBS -NV outdb sument "select username, pathname, name, size, mtime from vsument order by size;" outdb.*

test/runquerydbn test/runquerydbs

@@ -93,7 +93,7 @@ tar -xf ${TAR} -C ${TREE}
 ${TESTS}/runbfwi                ${TREE} ${INDEX}
 ${TESTS}/runbfti                        ${INDEX}
 ${TESTS}/runbfq                         ${INDEX}
-${TESTS}/runquerydbn                    ${INDEX} 2
+${TESTS}/runquerydbs                    ${INDEX} 2
 ${TESTS}/runbfwreaddirplus2db           ${INDEX}
 ${TESTS}/rundfw                         ${INDEX}