~pbeaman/akiban-persistit/dynamic-volumes

« back to all changes in this revision

Viewing changes to src/main/java/com/persistit/IntegrityCheck.java

Committer: Peter Beaman
Date: 2013-03-14 14:36:37 UTC
mfrom: (374.37.13 stage)
Revision ID: pbeaman@akiban.com-20130314143637-3tn8o0gfb9adqzfg

Merge from trunk with changes for lock pruning fix

files added:
src/main/java/com/persistit/VolumeStorageL2.java

src/test/java/com/persistit/TransactionAbandonedTest.java

files modified:
src/main/java/com/persistit/Buffer.java

src/main/java/com/persistit/BufferPool.java

src/main/java/com/persistit/CLI.java

src/main/java/com/persistit/CheckpointManager.java

src/main/java/com/persistit/CleanupManager.java

src/main/java/com/persistit/Exchange.java

src/main/java/com/persistit/IntegrityCheck.java

src/main/java/com/persistit/JournalManager.java

src/main/java/com/persistit/Management.java

src/main/java/com/persistit/ManagementImpl.java

src/main/java/com/persistit/Persistit.java

src/main/java/com/persistit/RecoveryManager.java

src/main/java/com/persistit/StreamLoader.java

src/main/java/com/persistit/StreamSaver.java

src/main/java/com/persistit/Transaction.java

src/main/java/com/persistit/TransactionIndex.java

src/main/java/com/persistit/TransactionIndexBucket.java

src/main/java/com/persistit/TransactionStatus.java

src/main/java/com/persistit/Tree.java

src/main/java/com/persistit/TreeBuilder.java

src/main/java/com/persistit/Volume.java

src/main/java/com/persistit/VolumeHeader.java

src/main/java/com/persistit/VolumeStorageT2.java

src/main/java/com/persistit/VolumeStructure.java

src/main/java/com/persistit/ui/AdminUISummaryPanel.java

src/main/java/com/persistit/ui/AdminUITreePanel.java

src/main/java/com/persistit/ui/VTComboBoxModel.java

src/main/resources/com/persistit/ui/AdminUI.properties

src/test/java/com/persistit/Bug1041293Test.java

src/test/java/com/persistit/CleanupManagerTest.java

src/test/java/com/persistit/ExchangeLockTest.java

src/test/java/com/persistit/MVCCPruneBufferTest.java

src/test/java/com/persistit/TestShim.java

src/test/java/com/persistit/TreeBuilderTest.java

src/test/java/com/persistit/stress/InsertBigLoad.java

src/test/java/com/persistit/stress/unit/BigLoad.java

Show diffs side-by-side

added added

removed removed

src/main/java/com/persistit/IntegrityCheck.java

1170

_counters._mvvPageCount++;

1171

if (_prune && !_currentVolume.isReadOnly() && _counters._pruningErrorCount < MAX_PRUNING_ERRORS) {

1172

try {

1173

buffer.pruneMvvValues(tree, true);

1173

buffer.pruneMvvValues(tree, true, null);

1174

_counters._prunedPageCount++;

1175

} catch (final PersistitException e) {

1176

_counters._pruningErrorCount++;

Older »