~pbeaman/akiban-persistit/dynamic-volumes

« back to all changes in this revision

Viewing changes to src/main/java/com/persistit/BufferPool.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/BufferPool.java

659

}

660

}

661

buffer.clearValid();

662

if (buffer.isDirty()) {

663

_dirtyPageCount.decrementAndGet();

664

buffer.clearDirty();

665

}

662

buffer.clearDirty();

666

663

buffer.setPageAddressAndVolume(0, null);

667

664

}

668

665

792

789

// page will find it.

793

790

794

791

buffer.setValid();

795

if (vol.isTemporary()) {

792

if (vol.isTemporary() || vol.isLockVolume()) {

796

793

buffer.setTemporary();

797

794

} else {

798

795

buffer.clearTemporary();

1471

1468

}

1472

1469

Util.spinSleep();

1473

1470

}

1474

if (volume1 != null && !volume1.isTemporary()) {

1471

if (volume1 != null && !volume1.isTemporary() && !volume1.isLockVolume()) {

1475

1472

value.clear().setStreamMode(true);

1476

1473

value.put(volume1.getHandle());

1477

1474

value.put(page1);

Older »