~pbeaman/akiban-persistit/accelerate-pruning

« back to all changes in this revision

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

Committer: Peter Beaman
Date: 2012-06-05 18:37:45 UTC
mfrom: (308.2.9 stage)
Revision ID: pbeaman@akiban.com-20120605183745-gdlt5zz6uq5vvc8v

Merge from trunk

files added:
doc/BasicAPI.rst

doc/Configuration.rst

doc/GettingStarted.rst

doc/Management.rst

doc/Miscellaneous.rst

doc/PhysicalStorage.rst

doc/ReleaseNotes.rst

doc/Security.rst

doc/Serialization.rst

doc/Transactions.rst

doc/build/build-doc.sh.orig

doc/build/src/SphinxDocPrep.java

doc/conf.py

doc/index.rst

src/test/java/com/persistit/Bug912514Test.java

files removed:
doc/BasicAPI.txt

doc/Configuration.txt

doc/GettingStarted.txt

doc/Management.txt

doc/Miscellaneous.txt

doc/PhysicalStorage.txt

doc/Security.txt

doc/Serialization.txt

doc/TOC.txt

doc/Transactions.txt

doc/overview-summary.txt

files modified:
doc/build/build-doc.sh

examples/FindFile/build.xml

examples/HelloWorld/build.xml

examples/PersistitMapDemo/build.xml

examples/SimpleBench/build.xml

examples/SimpleDemo/build.xml

examples/SimpleTransaction/build.xml

pom.xml

src/etc/run_stress_tests.py

src/main/java/com/persistit/AntiValue.java

src/main/java/com/persistit/Buffer.java

src/main/java/com/persistit/Configuration.java

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

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

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

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

src/main/java/com/persistit/Value.java

src/main/java/com/persistit/VolumeStorage.java

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

src/main/java/com/persistit/VolumeStorageV2.java

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

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

src/main/javadoc/overview.html

src/test/java/com/persistit/Bug706132Test.java

src/test/java/com/persistit/Bug708592Test.java

src/test/java/com/persistit/Bug739533Test.java

src/test/java/com/persistit/Bug777918Test.java

src/test/java/com/persistit/Bug790709Test.java

src/test/java/com/persistit/Bug870352Test.java

src/test/java/com/persistit/Bug877656Test.java

src/test/java/com/persistit/Bug882219Test.java

src/test/java/com/persistit/Bug885477Test.java

src/test/java/com/persistit/Bug889850Test.java

src/test/java/com/persistit/Bug911849Test.java

src/test/java/com/persistit/Bug915594Test.java

src/test/java/com/persistit/Bug918909Test.java

src/test/java/com/persistit/Bug920754Test.java

src/test/java/com/persistit/Bug923790Test.java

src/test/java/com/persistit/Bug932097Test.java

src/test/java/com/persistit/Bug937877Test.java

src/test/java/com/persistit/Bug947182Test.java

src/test/java/com/persistit/Bug980292Test.java

src/test/java/com/persistit/Bug992801Test.java

src/test/java/com/persistit/Bug996241Test.java

src/test/java/com/persistit/ConfigurationTest.java

src/test/java/com/persistit/IOFailureTest.java

src/test/java/com/persistit/JournalManagerTest.java

src/test/java/com/persistit/MVCCConcurrentTest.java

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

src/test/java/com/persistit/PersistitUnitTestCase.java

src/test/java/com/persistit/ValueTest7.java

src/test/java/com/persistit/VolumeTest.java

src/test/java/com/persistit/unit/BufferPoolMemConfigurationTest.java

src/test/java/com/persistit/unit/ConcurrentUtil.java

src/test/java/com/persistit/unit/ExchangeTest.java

Show diffs side-by-side

added added

removed removed

src/main/java/com/persistit/Buffer.java

3079

int tbData = getInt(tail);

3080

3081

int size = (decodeTailBlockSize(tbData) + ~TAILBLOCK_MASK) & TAILBLOCK_MASK;

3082

if (size <= 0) {

3083

_persistit.fatal("Buffer has invalid tailblock length " + size + " at " + tail + " in "

3084

+ this, null);

3085

}

3082

3086

3083

3087

if ((tbData & TAILBLOCK_INUSE_MASK) != 0) {

3084

3088

plan[tail / TAILBLOCK_FACTOR] = (back << 16) | free;

3606

3610

final long copyTimestamp = _persistit.getTimestampAllocator().updateTimestamp();

3607

3611

writePageOnCheckpoint(copyTimestamp);

3608

3612

System.arraycopy(copy._bytes, 0, _bytes, 0, _bufferSize);

3613

_alloc = copy._alloc;

3614

_slack = copy._slack;

3615

_mvvCount = copy._mvvCount;

3616

_keyBlockEnd = copy._keyBlockEnd;

3609

3617

if (copy.getGeneration() > getGeneration()) {

3610

3618

bumpGeneration();

3611

3619

}

3757

3765

// Rewrite the tail block header

3758

3766

putInt(tail, encodeTailBlock(newTailSize, klength));

3759

3767

valueByte = newSize > 0 ? _bytes[offset] & 0xFF : -1;

3768

value.changeLongRecordMode(false);

3760

3769

}

3761

3770

}

3762

boolean prunedAntiValue = pruneAntiValue(valueByte, p, tree);

3763

changed |= prunedAntiValue;

3764

if (prunedAntiValue) {

3771

if (pruneAntiValue(valueByte, p, tree)) {

3765

3772

changed = true;

3766

3773

p -= KEYBLOCK_LENGTH;

3767

3774

if (!bumped) {

Older »