Increased the default annex.bloomaccuracy from 1000 to 10000000

This makes git annex unused use around 48 mb more memory than it did before,
but the massive increase in accuracy makes this worthwhile for all but the
smallest systems.

Also, I want to use the bloom filter for sync --all --content, to avoid
dropping files that the preferred content doesn't want, and 1/1000
false positives would be far too many in that use case, even if it were
acceptable for unused.

Actual memory use numbers:

1000: 21.06user 3.42system 0:26.40elapsed 92%CPU (0avgtext+0avgdata 501552maxresident)k
1000000: 21.41user 3.55system 0:26.84elapsed 93%CPU (0avgtext+0avgdata 549496maxresident)k
10000000: 21.84user 3.52system 0:27.89elapsed 90%CPU (0avgtext+0avgdata 549920maxresident)k

Based on these numbers, 10 million seemed a better pick than 1 million.

This commit is contained in:

Joey Hess

2015-06-16 17:58:15 -04:00

parent f7350b7c33

commit 8b74aec3ea

6 changed files with 76 additions and 56 deletions

									
										1

Command/Sync.hs
									
										View file
										
				@ -45,6 +45,7 @@ import Annex.UUID

				import Logs.UUID

				import Annex.AutoMerge

				import Annex.Ssh

				import Utility.Bloom

				import Control.Concurrent.MVar

				import qualified Data.Map as M

Rows
Columns

Increased the default annex.bloomaccuracy from 1000 to 10000000

1 Command/Sync.hs Unescape Escape View file

1

Command/Sync.hs

View file