-#!/usr/bin/env python
-import sys, glob, tempfile
-from bup import options, git
-from bup.helpers import *
+#!/bin/sh
+"""": # -*-python-*-
+bup_python="$(dirname "$0")/bup-python" || exit $?
+exec "$bup_python" "$0" ${1+"$@"}
+"""
+# end of bup preamble
+
+from __future__ import absolute_import
+import glob, os, sys, tempfile
+
+from bup import options, git, bloom
+from bup.compat import argv_bytes, hexstr
+from bup.helpers import (add_error, debug1, handle_ctrl_c, log, progress, qprogress,
+ saved_errors)
+from bup.io import path_msg
+
optspec = """
bup bloom [options...]
--
+ruin ruin the specified bloom file (clearing the bitfield)
+f,force ignore existing bloom file and regenerate it from scratch
o,output= output bloom filename (default: auto)
d,dir= input directory to look for idx files (default: auto)
k,hashes= number of hash functions to use (4 or 5) (default: auto)
+c,check= check the given .idx file against the bloom filter
"""
+
+def ruin_bloom(bloomfilename):
+ rbloomfilename = git.repo_rel(bloomfilename)
+ if not os.path.exists(bloomfilename):
+ log(path_msg(bloomfilename) + '\n')
+ add_error('bloom: %s not found to ruin\n' % path_msg(rbloomfilename))
+ return
+ b = bloom.ShaBloom(bloomfilename, readwrite=True, expected=1)
+ b.map[16 : 16 + 2**b.bits] = b'\0' * 2**b.bits
+
+
+def check_bloom(path, bloomfilename, idx):
+ rbloomfilename = git.repo_rel(bloomfilename)
+ ridx = git.repo_rel(idx)
+ if not os.path.exists(bloomfilename):
+ log('bloom: %s: does not exist.\n' % path_msg(rbloomfilename))
+ return
+ b = bloom.ShaBloom(bloomfilename)
+ if not b.valid():
+ add_error('bloom: %r is invalid.\n' % path_msg(rbloomfilename))
+ return
+ base = os.path.basename(idx)
+ if base not in b.idxnames:
+ log('bloom: %s does not contain the idx.\n' % path_msg(rbloomfilename))
+ return
+ if base == idx:
+ idx = os.path.join(path, idx)
+ log('bloom: bloom file: %s\n' % path_msg(rbloomfilename))
+ log('bloom: checking %s\n' % path_msg(ridx))
+ for objsha in git.open_idx(idx):
+ if not b.exists(objsha):
+ add_error('bloom: ERROR: object %s missing' % hexstr(objsha))
+
+
_first = None
-def do_bloom(path, outfilename):
+def do_bloom(path, outfilename, k):
global _first
- if not outfilename:
- assert(path)
- outfilename = os.path.join(path, 'bup.bloom')
-
+ assert k in (None, 4, 5)
b = None
- if os.path.exists(outfilename):
- b = git.ShaBloom(outfilename)
+ if os.path.exists(outfilename) and not opt.force:
+ b = bloom.ShaBloom(outfilename)
if not b.valid():
debug1("bloom: Existing invalid bloom found, regenerating.\n")
b = None
rest = []
add_count = 0
rest_count = 0
- for i,name in enumerate(glob.glob('%s/*.idx' % path)):
+ for i, name in enumerate(glob.glob(b'%s/*.idx' % path)):
progress('bloom: counting: %d\r' % i)
ix = git.open_idx(name)
ixbase = os.path.basename(name)
else:
add.append(name)
add_count += len(ix)
- total = add_count + rest_count
if not add:
debug1("bloom: nothing to do.\n")
if b:
if len(b) != rest_count:
- log("bloom: size %d != idx total %d, regenerating\n"
- % (len(b), rest_count))
+ debug1("bloom: size %d != idx total %d, regenerating\n"
+ % (len(b), rest_count))
+ b = None
+ elif k is not None and k != b.k:
+ debug1("bloom: new k %d != existing k %d, regenerating\n"
+ % (k, b.k))
b = None
- elif (b.bits < git.MAX_BLOOM_BITS and
- b.pfalse_positive(add_count) > git.MAX_PFALSE_POSITIVE):
- log("bloom: regenerating: adding %d entries gives "
- "%.2f%% false positives.\n"
- % (add_count, b.pfalse_positive(add_count)))
+ elif (b.bits < bloom.MAX_BLOOM_BITS[b.k] and
+ b.pfalse_positive(add_count) > bloom.MAX_PFALSE_POSITIVE):
+ debug1("bloom: regenerating: adding %d entries gives "
+ "%.2f%% false positives.\n"
+ % (add_count, b.pfalse_positive(add_count)))
b = None
else:
- b = git.ShaBloom(outfilename, readwrite=True, expected=add_count)
+ b = bloom.ShaBloom(outfilename, readwrite=True, expected=add_count)
if not b: # Need all idxs to build from scratch
add += rest
add_count += rest_count
msg = b is None and 'creating from' or 'adding'
if not _first: _first = path
- dirprefix = (_first != path) and git.repo_rel(path)+': ' or ''
- log('bloom: %s%s %d file%s (%d object%s).\n'
- % (dirprefix, msg,
+ dirprefix = (_first != path) and git.repo_rel(path) + b': ' or b''
+ progress('bloom: %s%s %d file%s (%d object%s).\r'
+ % (path_msg(dirprefix), msg,
len(add), len(add)!=1 and 's' or '',
add_count, add_count!=1 and 's' or ''))
tfname = None
if b is None:
- tfname = os.path.join(path, 'bup.tmp.bloom')
- tf = open(tfname, 'w+')
- b = git.ShaBloom.create(tfname, f=tf, expected=add_count, k=opt.k)
+ tfname = os.path.join(path, b'bup.tmp.bloom')
+ b = bloom.create(tfname, expected=add_count, k=k)
count = 0
icount = 0
for name in add:
count += 1
icount += len(ix)
+ # Currently, there's an open file object for tfname inside b.
+ # Make sure it's closed before rename.
+ b.close()
+
if tfname:
os.rename(tfname, outfilename)
if extra:
o.fatal('no positional parameters expected')
-if opt.k and opt.k not in (4,5):
+if not opt.check and opt.k and opt.k not in (4,5):
o.fatal('only k values of 4 and 5 are supported')
+if opt.check:
+ opt.check = argv_bytes(opt.check)
+
git.check_repo_or_die()
-paths = opt.dir and [opt.dir] or git.all_packdirs()
+output = argv_bytes(opt.output) if opt.output else None
+paths = opt.dir and [argv_bytes(opt.dir)] or git.all_packdirs()
for path in paths:
- debug1('bloom: scanning %s\n' % path)
- do_bloom(path, opt.output)
+ debug1('bloom: scanning %s\n' % path_msg(path))
+ outfilename = output or os.path.join(path, b'bup.bloom')
+ if opt.check:
+ check_bloom(path, outfilename, opt.check)
+ elif opt.ruin:
+ ruin_bloom(outfilename)
+ else:
+ do_bloom(path, outfilename, opt.k)
+
+if saved_errors:
+ log('WARNING: %d errors encountered during bloom.\n' % len(saved_errors))
+ sys.exit(1)
+elif opt.check:
+ log('All tests passed.\n')
projects / bup.git / blobdiff