Browse Source
We no longer need an ObjectLoader to be lazy and try to delay the materialization of the object content. That was done only to support PackWriter searching for a good reuse candidate. Instead, simplify the code base by doing the materialization immediately when the loader asks for it, because any caller asking for the loader is going to need the content. Change-Id: Id867b1004529744f234ab8f9cfab3d2c52ca3bd0 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>stable-0.9
Shawn O. Pearce
15 years ago
11 changed files with 98 additions and 439 deletions
@ -1,65 +0,0 @@
|
||||
/* |
||||
* Copyright (C) 2009, Google Inc. |
||||
* Copyright (C) 2008, Marek Zawirski <marek.zawirski@gmail.com> |
||||
* Copyright (C) 2007, Robin Rosenberg <robin.rosenberg@dewire.com> |
||||
* Copyright (C) 2006-2008, Shawn O. Pearce <spearce@spearce.org> |
||||
* and other copyright owners as documented in the project's IP log. |
||||
* |
||||
* This program and the accompanying materials are made available |
||||
* under the terms of the Eclipse Distribution License v1.0 which |
||||
* accompanies this distribution, is reproduced below, and is |
||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||
* |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or |
||||
* without modification, are permitted provided that the following |
||||
* conditions are met: |
||||
* |
||||
* - Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* |
||||
* - Redistributions in binary form must reproduce the above |
||||
* copyright notice, this list of conditions and the following |
||||
* disclaimer in the documentation and/or other materials provided |
||||
* with the distribution. |
||||
* |
||||
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||
* names of its contributors may be used to endorse or promote |
||||
* products derived from this software without specific prior |
||||
* written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
*/ |
||||
|
||||
package org.eclipse.jgit.storage.file; |
||||
|
||||
import java.io.IOException; |
||||
|
||||
/** Reads a deltified object which uses an offset to find its base. */ |
||||
class DeltaOfsPackedObjectLoader extends DeltaPackedObjectLoader { |
||||
private final long deltaBase; |
||||
|
||||
DeltaOfsPackedObjectLoader(final PackFile pr, final long objectOffset, |
||||
final int headerSz, final int deltaSz, final long base) { |
||||
super(pr, objectOffset, headerSz, deltaSz); |
||||
deltaBase = base; |
||||
} |
||||
|
||||
protected PackedObjectLoader getBaseLoader(final WindowCursor curs) |
||||
throws IOException { |
||||
return pack.resolveBase(curs, deltaBase); |
||||
} |
||||
} |
||||
@ -1,115 +0,0 @@
|
||||
/* |
||||
* Copyright (C) 2008-2009, Google Inc. |
||||
* Copyright (C) 2008, Marek Zawirski <marek.zawirski@gmail.com> |
||||
* Copyright (C) 2007, Robin Rosenberg <robin.rosenberg@dewire.com> |
||||
* Copyright (C) 2006-2008, Shawn O. Pearce <spearce@spearce.org> |
||||
* and other copyright owners as documented in the project's IP log. |
||||
* |
||||
* This program and the accompanying materials are made available |
||||
* under the terms of the Eclipse Distribution License v1.0 which |
||||
* accompanies this distribution, is reproduced below, and is |
||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||
* |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or |
||||
* without modification, are permitted provided that the following |
||||
* conditions are met: |
||||
* |
||||
* - Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* |
||||
* - Redistributions in binary form must reproduce the above |
||||
* copyright notice, this list of conditions and the following |
||||
* disclaimer in the documentation and/or other materials provided |
||||
* with the distribution. |
||||
* |
||||
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||
* names of its contributors may be used to endorse or promote |
||||
* products derived from this software without specific prior |
||||
* written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
*/ |
||||
|
||||
package org.eclipse.jgit.storage.file; |
||||
|
||||
import java.io.IOException; |
||||
import java.text.MessageFormat; |
||||
import java.util.zip.DataFormatException; |
||||
|
||||
import org.eclipse.jgit.JGitText; |
||||
import org.eclipse.jgit.errors.CorruptObjectException; |
||||
import org.eclipse.jgit.lib.BinaryDelta; |
||||
import org.eclipse.jgit.lib.Constants; |
||||
|
||||
/** Reader for a deltified object stored in a pack file. */ |
||||
abstract class DeltaPackedObjectLoader extends PackedObjectLoader { |
||||
private static final int OBJ_COMMIT = Constants.OBJ_COMMIT; |
||||
|
||||
private final int deltaSize; |
||||
|
||||
DeltaPackedObjectLoader(final PackFile pr, final long objectOffset, |
||||
final int headerSize, final int deltaSz) { |
||||
super(pr, objectOffset, headerSize); |
||||
objectType = -1; |
||||
deltaSize = deltaSz; |
||||
} |
||||
|
||||
@Override |
||||
void materialize(final WindowCursor curs) throws IOException { |
||||
if (cachedBytes != null) { |
||||
return; |
||||
} |
||||
|
||||
if (objectType != OBJ_COMMIT) { |
||||
UnpackedObjectCache.Entry cache = pack.readCache(objectOffset); |
||||
if (cache != null) { |
||||
curs.release(); |
||||
objectType = cache.type; |
||||
objectSize = cache.data.length; |
||||
cachedBytes = cache.data; |
||||
return; |
||||
} |
||||
} |
||||
|
||||
try { |
||||
final PackedObjectLoader baseLoader = getBaseLoader(curs); |
||||
baseLoader.materialize(curs); |
||||
cachedBytes = BinaryDelta.apply(baseLoader.getCachedBytes(), pack |
||||
.decompress(objectOffset + headerSize, deltaSize, curs)); |
||||
curs.release(); |
||||
objectType = baseLoader.getType(); |
||||
objectSize = cachedBytes.length; |
||||
if (objectType != OBJ_COMMIT) |
||||
pack.saveCache(objectOffset, cachedBytes, objectType); |
||||
} catch (DataFormatException dfe) { |
||||
final CorruptObjectException coe; |
||||
coe = new CorruptObjectException(MessageFormat.format(JGitText.get().objectAtHasBadZlibStream, |
||||
objectOffset, pack.getPackFile())); |
||||
coe.initCause(dfe); |
||||
throw coe; |
||||
} |
||||
} |
||||
|
||||
/** |
||||
* @param curs |
||||
* temporary thread storage during data access. |
||||
* @return the object loader for the base object |
||||
* @throws IOException |
||||
*/ |
||||
protected abstract PackedObjectLoader getBaseLoader(WindowCursor curs) |
||||
throws IOException; |
||||
} |
||||
@ -1,71 +0,0 @@
|
||||
/* |
||||
* Copyright (C) 2008-2009, Google Inc. |
||||
* Copyright (C) 2008, Marek Zawirski <marek.zawirski@gmail.com> |
||||
* Copyright (C) 2007, Robin Rosenberg <robin.rosenberg@dewire.com> |
||||
* Copyright (C) 2006-2008, Shawn O. Pearce <spearce@spearce.org> |
||||
* and other copyright owners as documented in the project's IP log. |
||||
* |
||||
* This program and the accompanying materials are made available |
||||
* under the terms of the Eclipse Distribution License v1.0 which |
||||
* accompanies this distribution, is reproduced below, and is |
||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||
* |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or |
||||
* without modification, are permitted provided that the following |
||||
* conditions are met: |
||||
* |
||||
* - Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* |
||||
* - Redistributions in binary form must reproduce the above |
||||
* copyright notice, this list of conditions and the following |
||||
* disclaimer in the documentation and/or other materials provided |
||||
* with the distribution. |
||||
* |
||||
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||
* names of its contributors may be used to endorse or promote |
||||
* products derived from this software without specific prior |
||||
* written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
*/ |
||||
|
||||
package org.eclipse.jgit.storage.file; |
||||
|
||||
import java.io.IOException; |
||||
|
||||
import org.eclipse.jgit.errors.MissingObjectException; |
||||
import org.eclipse.jgit.lib.ObjectId; |
||||
|
||||
/** Reads a deltified object which uses an {@link ObjectId} to find its base. */ |
||||
class DeltaRefPackedObjectLoader extends DeltaPackedObjectLoader { |
||||
private final ObjectId deltaBase; |
||||
|
||||
DeltaRefPackedObjectLoader(final PackFile pr, final long objectOffset, |
||||
final int headerSz, final int deltaSz, final ObjectId base) { |
||||
super(pr, objectOffset, headerSz, deltaSz); |
||||
deltaBase = base; |
||||
} |
||||
|
||||
protected PackedObjectLoader getBaseLoader(final WindowCursor curs) |
||||
throws IOException { |
||||
final PackedObjectLoader or = pack.get(curs, deltaBase); |
||||
if (or == null) |
||||
throw new MissingObjectException(deltaBase, "delta base"); |
||||
return or; |
||||
} |
||||
} |
||||
@ -1,96 +0,0 @@
|
||||
/* |
||||
* Copyright (C) 2008-2009, Google Inc. |
||||
* Copyright (C) 2008, Marek Zawirski <marek.zawirski@gmail.com> |
||||
* Copyright (C) 2006-2008, Shawn O. Pearce <spearce@spearce.org> |
||||
* and other copyright owners as documented in the project's IP log. |
||||
* |
||||
* This program and the accompanying materials are made available |
||||
* under the terms of the Eclipse Distribution License v1.0 which |
||||
* accompanies this distribution, is reproduced below, and is |
||||
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||
* |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or |
||||
* without modification, are permitted provided that the following |
||||
* conditions are met: |
||||
* |
||||
* - Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* |
||||
* - Redistributions in binary form must reproduce the above |
||||
* copyright notice, this list of conditions and the following |
||||
* disclaimer in the documentation and/or other materials provided |
||||
* with the distribution. |
||||
* |
||||
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||
* names of its contributors may be used to endorse or promote |
||||
* products derived from this software without specific prior |
||||
* written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
*/ |
||||
|
||||
package org.eclipse.jgit.storage.file; |
||||
|
||||
import java.io.IOException; |
||||
import java.text.MessageFormat; |
||||
import java.util.zip.DataFormatException; |
||||
|
||||
import org.eclipse.jgit.JGitText; |
||||
import org.eclipse.jgit.errors.CorruptObjectException; |
||||
import org.eclipse.jgit.lib.Constants; |
||||
|
||||
/** Reader for a non-delta (just deflated) object in a pack file. */ |
||||
class WholePackedObjectLoader extends PackedObjectLoader { |
||||
private static final int OBJ_COMMIT = Constants.OBJ_COMMIT; |
||||
|
||||
WholePackedObjectLoader(final PackFile pr, final long objectOffset, |
||||
final int headerSize, final int type, final int size) { |
||||
super(pr, objectOffset, headerSize); |
||||
objectType = type; |
||||
objectSize = size; |
||||
} |
||||
|
||||
@Override |
||||
void materialize(final WindowCursor curs) throws IOException { |
||||
if (cachedBytes != null) { |
||||
return; |
||||
} |
||||
|
||||
if (objectType != OBJ_COMMIT) { |
||||
UnpackedObjectCache.Entry cache = pack.readCache(objectOffset); |
||||
if (cache != null) { |
||||
curs.release(); |
||||
cachedBytes = cache.data; |
||||
return; |
||||
} |
||||
} |
||||
|
||||
try { |
||||
cachedBytes = pack.decompress(objectOffset + headerSize, |
||||
objectSize, curs); |
||||
curs.release(); |
||||
if (objectType != OBJ_COMMIT) |
||||
pack.saveCache(objectOffset, cachedBytes, objectType); |
||||
} catch (DataFormatException dfe) { |
||||
final CorruptObjectException coe; |
||||
coe = new CorruptObjectException(MessageFormat.format(JGitText.get().objectAtHasBadZlibStream, |
||||
objectOffset, pack.getPackFile())); |
||||
coe.initCause(dfe); |
||||
throw coe; |
||||
} |
||||
} |
||||
} |
||||
Loading…
Reference in new issue