missing = null;
for (T obj : objects) {
- if (needChunkOnly && obj instanceof IdWithChunk) {
- push(obj, ((IdWithChunk) obj).getChunkKey());
+ if (needChunkOnly && obj instanceof RefDataUtil.IdWithChunk) {
+ push(obj, ((RefDataUtil.IdWithChunk) obj).getChunkKey());
continue;
}
diff --git a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/RecentChunks.java b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/RecentChunks.java
index f704c1daf..f75e3bdc8 100644
--- a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/RecentChunks.java
+++ b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/RecentChunks.java
@@ -48,7 +48,7 @@ import java.io.IOException;
import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.ObjectLoader;
import org.eclipse.jgit.storage.dht.DhtReader.ChunkAndOffset;
-import org.eclipse.jgit.storage.dht.RefData.IdWithChunk;
+import org.eclipse.jgit.storage.dht.RefDataUtil.IdWithChunk;
final class RecentChunks {
private final DhtReader reader;
diff --git a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/RefData.java b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/RefData.java
deleted file mode 100644
index e34e9d1c3..000000000
--- a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/RefData.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (C) 2011, Google Inc.
- * 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.dht;
-
-import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH;
-import static org.eclipse.jgit.storage.dht.TinyProtobuf.encode;
-
-import java.util.Arrays;
-
-import org.eclipse.jgit.lib.AnyObjectId;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Ref;
-import org.eclipse.jgit.storage.dht.TinyProtobuf.Encoder;
-
-/**
- * Describes the current state of a Git reference.
- *
- * The reference state contains not just the SHA-1 object name that a reference
- * points to, but the state also caches its peeled value if its a tag, and the
- * {@link ChunkKey} the object was observed in when the reference was last
- * updated. This cached data reduces latency when initially starting to work
- * with a repository.
- */
-public class RefData {
- /** Magic constant meaning does not exist. */
- public static final RefData NONE = new RefData(new byte[0]);
-
- static final int TAG_SYMREF = 1;
-
- static final int TAG_TARGET = 2;
-
- static final int TAG_IS_PEELED = 3;
-
- static final int TAG_PEELED = 4;
-
- /**
- * @param data
- * @return the content
- */
- public static RefData fromBytes(byte[] data) {
- return new RefData(data);
- }
-
- static RefData symbolic(String target) {
- Encoder e = encode(2 + target.length());
- e.string(TAG_SYMREF, target);
- return new RefData(e.asByteArray());
- }
-
- static RefData id(AnyObjectId id) {
- Encoder e = encode(4 + OBJECT_ID_STRING_LENGTH + ChunkKey.KEYLEN);
- e.message(TAG_TARGET, IdWithChunk.encode(id));
- return new RefData(e.asByteArray());
- }
-
- static RefData fromRef(Ref ref) {
- if (ref.isSymbolic())
- return symbolic(ref.getTarget().getName());
-
- if (ref.getObjectId() == null)
- return RefData.NONE;
-
- int max = 8 + 2 * OBJECT_ID_STRING_LENGTH + 2 * ChunkKey.KEYLEN;
- Encoder e = encode(max);
- e.message(TAG_TARGET, IdWithChunk.encode(ref.getObjectId()));
- if (ref.isPeeled()) {
- e.bool(TAG_IS_PEELED, true);
- if (ref.getPeeledObjectId() != null)
- e.message(TAG_PEELED,
- IdWithChunk.encode(ref.getPeeledObjectId()));
- }
- return new RefData(e.asByteArray());
- }
-
- static RefData peeled(ObjectId targetId, ObjectId peeledId) {
- int max = 8 + 2 * OBJECT_ID_STRING_LENGTH + 2 * ChunkKey.KEYLEN;
- Encoder e = encode(max);
- e.message(TAG_TARGET, IdWithChunk.encode(targetId));
- e.bool(TAG_IS_PEELED, true);
- if (peeledId != null)
- e.message(TAG_PEELED, IdWithChunk.encode(peeledId));
- return new RefData(e.asByteArray());
- }
-
- private final byte[] data;
-
- RefData(byte[] data) {
- this.data = data;
- }
-
- TinyProtobuf.Decoder decode() {
- return TinyProtobuf.decode(data);
- }
-
- /** @return the contents, encoded as a byte array for storage. */
- public byte[] asBytes() {
- return data;
- }
-
- @Override
- public int hashCode() {
- int hash = 5381;
- for (int ptr = 0; ptr < data.length; ptr++)
- hash = ((hash << 5) + hash) + (data[ptr] & 0xff);
- return hash;
- }
-
- @Override
- public boolean equals(Object other) {
- if (other instanceof RefData)
- return Arrays.equals(data, ((RefData) other).data);
- return false;
- }
-
- @Override
- public String toString() {
- StringBuilder b = new StringBuilder();
- TinyProtobuf.Decoder d = decode();
- for (;;) {
- switch (d.next()) {
- case 0:
- return b.toString().substring(1);
- case TAG_SYMREF:
- b.append("\nsymref: ").append(d.string());
- continue;
- case TAG_TARGET:
- b.append("\ntarget: ").append(IdWithChunk.decode(d.message()));
- continue;
- case TAG_IS_PEELED:
- b.append("\nis_peeled: ").append(d.bool());
- continue;
- case TAG_PEELED:
- b.append("\npeeled: ").append(IdWithChunk.decode(d.message()));
- continue;
- default:
- d.skip();
- continue;
- }
- }
- }
-
- static class IdWithChunk extends ObjectId {
- static ObjectId decode(TinyProtobuf.Decoder d) {
- ObjectId id = null;
- ChunkKey key = null;
- DECODE: for (;;) {
- switch (d.next()) {
- case 0:
- break DECODE;
- case 1:
- id = d.stringObjectId();
- continue;
- case 2:
- key = ChunkKey.fromBytes(d);
- continue;
- default:
- d.skip();
- }
- }
- return key != null ? new IdWithChunk(id, key) : id;
- }
-
- static TinyProtobuf.Encoder encode(AnyObjectId id) {
- if (id instanceof IdWithChunk) {
- int max = 4 + OBJECT_ID_STRING_LENGTH + ChunkKey.KEYLEN;
- TinyProtobuf.Encoder e = TinyProtobuf.encode(max);
- e.string(1, id);
- e.string(2, ((IdWithChunk) id).chunkKey);
- return e;
- } else {
- int max = 2 + OBJECT_ID_STRING_LENGTH;
- TinyProtobuf.Encoder e = TinyProtobuf.encode(max);
- e.string(1, id);
- return e;
- }
- }
-
- private final ChunkKey chunkKey;
-
- IdWithChunk(AnyObjectId id, ChunkKey key) {
- super(id);
- this.chunkKey = key;
- }
-
- ChunkKey getChunkKey() {
- return chunkKey;
- }
-
- @Override
- public String toString() {
- return name() + "->" + chunkKey;
- }
- }
-}
diff --git a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/RefDataUtil.java b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/RefDataUtil.java
new file mode 100644
index 000000000..7c5d9e0b8
--- /dev/null
+++ b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/RefDataUtil.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2011, Google Inc.
+ * 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.dht;
+
+import org.eclipse.jgit.generated.storage.dht.proto.GitStore.RefData;
+import org.eclipse.jgit.lib.AnyObjectId;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Ref;
+
+/** Tools to work with {@link RefData}. */
+public class RefDataUtil {
+ /** Magic constant meaning does not exist. */
+ public static final RefData NONE = RefData.newBuilder().build();
+
+ static RefData symbolic(String target) {
+ RefData.Builder b = RefData.newBuilder();
+ b.setSymref(target);
+ return b.build();
+ }
+
+ static RefData id(AnyObjectId id) {
+ RefData.Builder b = RefData.newBuilder();
+ b.setTarget(toRefData(id));
+ return b.build();
+ }
+
+ static RefData fromRef(Ref ref) {
+ if (ref.isSymbolic())
+ return symbolic(ref.getTarget().getName());
+
+ if (ref.getObjectId() == null)
+ return NONE;
+
+ RefData.Builder b = RefData.newBuilder();
+ b.setTarget(toRefData(ref.getObjectId()));
+ if (ref.isPeeled()) {
+ b.setIsPeeled(true);
+ if (ref.getPeeledObjectId() != null)
+ b.setPeeled(toRefData(ref.getPeeledObjectId()));
+ }
+ return b.build();
+ }
+
+ static RefData peeled(ObjectId targetId, ObjectId peeledId) {
+ RefData.Builder b = RefData.newBuilder();
+ b.setTarget(toRefData(targetId));
+ b.setIsPeeled(true);
+ if (peeledId != null)
+ b.setPeeled(toRefData(peeledId));
+ return b.build();
+ }
+
+ private static RefData.Id toRefData(AnyObjectId id) {
+ RefData.Id.Builder r = RefData.Id.newBuilder();
+ r.setObjectName(id.name());
+ if (id instanceof IdWithChunk)
+ r.setChunkKey(((IdWithChunk) id).getChunkKey().asString());
+ return r.build();
+ }
+
+ static class IdWithChunk extends ObjectId {
+ static ObjectId create(RefData.Id src) {
+ if (src.hasChunkKey()) {
+ return new IdWithChunk(
+ ObjectId.fromString(src.getObjectName()),
+ ChunkKey.fromString(src.getChunkKey()));
+ }
+ return ObjectId.fromString(src.getObjectName());
+ }
+
+ private final ChunkKey chunkKey;
+
+ IdWithChunk(AnyObjectId id, ChunkKey key) {
+ super(id);
+ this.chunkKey = key;
+ }
+
+ ChunkKey getChunkKey() {
+ return chunkKey;
+ }
+
+ @Override
+ public String toString() {
+ return name() + "->" + chunkKey;
+ }
+ }
+
+ private RefDataUtil() {
+ // Utility class, do not create instances.
+ }
+}
diff --git a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/TinyProtobuf.java b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/TinyProtobuf.java
deleted file mode 100644
index dcf3dfb17..000000000
--- a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/TinyProtobuf.java
+++ /dev/null
@@ -1,755 +0,0 @@
-/*
- * Copyright (C) 2011, Google Inc.
- * 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.dht;
-
-import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH;
-import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH;
-
-import java.nio.ByteBuffer;
-import java.text.MessageFormat;
-
-import org.eclipse.jgit.lib.AnyObjectId;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.util.RawParseUtils;
-
-/**
- * A tiny implementation of a subset of the Google Protocol Buffers format.
- *
- * For more information on the network format, see the canonical documentation
- * at Google Protocol Buffers.
- */
-public class TinyProtobuf {
- private static final int WIRE_VARINT = 0;
-
- private static final int WIRE_FIXED_64 = 1;
-
- private static final int WIRE_LEN_DELIM = 2;
-
- private static final int WIRE_FIXED_32 = 5;
-
- /**
- * Create a new encoder.
- *
- * @param estimatedSize
- * estimated size of the message. If the size is accurate,
- * copying of the result can be avoided during
- * {@link Encoder#asByteArray()}. If the size is too small, the
- * buffer will grow dynamically.
- * @return a new encoder.
- */
- public static Encoder encode(int estimatedSize) {
- return new Encoder(new byte[estimatedSize]);
- }
-
- /**
- * Create an encoder that estimates size.
- *
- * @return a new encoder.
- */
- public static Encoder size() {
- return new Encoder(null);
- }
-
- /**
- * Decode a buffer.
- *
- * @param buf
- * the buffer to read.
- * @return a new decoder.
- */
- public static Decoder decode(byte[] buf) {
- return decode(buf, 0, buf.length);
- }
-
- /**
- * Decode a buffer.
- *
- * @param buf
- * the buffer to read.
- * @param off
- * offset to begin reading from {@code buf}.
- * @param len
- * total number of bytes to read from {@code buf}.
- * @return a new decoder.
- */
- public static Decoder decode(byte[] buf, int off, int len) {
- return new Decoder(buf, off, len);
- }
-
- /** An enumerated value that encodes/decodes as int32. */
- public static interface Enum {
- /** @return the wire value. */
- public int value();
- }
-
- /** Decode fields from a binary protocol buffer. */
- public static class Decoder {
- private final byte[] buf;
-
- private final int end;
-
- private int ptr;
-
- private int field;
-
- private int type;
-
- private int length;
-
- private Decoder(byte[] buf, int off, int len) {
- this.buf = buf;
- this.ptr = off;
- this.end = off + len;
- }
-
- /** @return get the field tag number, 0 on end of buffer. */
- public int next() {
- if (ptr == end)
- return 0;
-
- int fieldAndType = varint32();
- field = fieldAndType >>> 3;
- type = fieldAndType & 7;
- return field;
- }
-
- /** Skip the current field's value. */
- public void skip() {
- switch (type) {
- case WIRE_VARINT:
- varint64();
- break;
- case WIRE_FIXED_64:
- ptr += 8;
- break;
- case WIRE_LEN_DELIM:
- ptr += varint32();
- break;
- case WIRE_FIXED_32:
- ptr += 4;
- break;
- default:
- throw new IllegalStateException(MessageFormat.format(DhtText
- .get().protobufUnsupportedFieldType, Integer
- .valueOf(type)));
- }
- }
-
- /** @return decode the current field as an int32. */
- public int int32() {
- checkFieldType(WIRE_VARINT);
- return varint32();
- }
-
- /** @return decode the current field as an int64. */
- public long int64() {
- checkFieldType(WIRE_VARINT);
- return varint64();
- }
-
- /**
- * @param
- * the type of enumeration.
- * @param all
- * all of the supported values.
- * @return decode the current field as an enumerated value.
- */
- public T intEnum(T[] all) {
- checkFieldType(WIRE_VARINT);
- int value = varint32();
- for (T t : all) {
- if (t.value() == value)
- return t;
- }
- throw new IllegalStateException(MessageFormat.format(
- DhtText.get().protobufWrongFieldType, Integer
- .valueOf(field), Integer.valueOf(type), all[0]
- .getClass().getSimpleName()));
- }
-
- /** @return decode the current field as a bool. */
- public boolean bool() {
- checkFieldType(WIRE_VARINT);
- int val = varint32();
- switch (val) {
- case 0:
- return false;
- case 1:
- return true;
- default:
- throw new IllegalStateException(MessageFormat.format(DhtText
- .get().protobufNotBooleanValue, Integer.valueOf(field),
- Integer.valueOf(val)));
- }
- }
-
- /** @return decode a fixed 64 bit value. */
- public long fixed64() {
- checkFieldType(WIRE_FIXED_64);
- long val = buf[ptr + 0] & 0xff;
- val |= ((long) (buf[ptr + 1] & 0xff)) << (1 * 8);
- val |= ((long) (buf[ptr + 2] & 0xff)) << (2 * 8);
- val |= ((long) (buf[ptr + 3] & 0xff)) << (3 * 8);
- val |= ((long) (buf[ptr + 4] & 0xff)) << (4 * 8);
- val |= ((long) (buf[ptr + 5] & 0xff)) << (5 * 8);
- val |= ((long) (buf[ptr + 6] & 0xff)) << (6 * 8);
- val |= ((long) (buf[ptr + 7] & 0xff)) << (7 * 8);
- ptr += 8;
- return val;
- }
-
- /** @return decode the current field as a string. */
- public String string() {
- checkFieldType(WIRE_LEN_DELIM);
- int len = varint32();
- String s = RawParseUtils.decode(buf, ptr, ptr + len);
- ptr += len;
- return s;
- }
-
- /** @return decode the current hex string to an ObjectId. */
- public ObjectId stringObjectId() {
- checkFieldType(WIRE_LEN_DELIM);
- int len = varint32();
- if (len != OBJECT_ID_STRING_LENGTH)
- throw new IllegalStateException(MessageFormat.format(DhtText
- .get().protobufWrongFieldLength,
- Integer.valueOf(field), Integer
- .valueOf(OBJECT_ID_STRING_LENGTH), Integer
- .valueOf(len)));
-
- ObjectId id = ObjectId.fromString(buf, ptr);
- ptr += OBJECT_ID_STRING_LENGTH;
- return id;
- }
-
- /** @return decode a string from 8 hex digits. */
- public int stringHex32() {
- checkFieldType(WIRE_LEN_DELIM);
- int len = varint32();
- if (len != 8)
- throw new IllegalStateException(MessageFormat.format(DhtText
- .get().protobufWrongFieldLength,
- Integer.valueOf(field), Integer.valueOf(8), Integer
- .valueOf(len)));
- int val = KeyUtils.parse32(buf, ptr);
- ptr += 8;
- return val;
- }
-
- /** @return decode the current field as an array of bytes. */
- public byte[] bytes() {
- checkFieldType(WIRE_LEN_DELIM);
- byte[] r = new byte[varint32()];
- System.arraycopy(buf, ptr, r, 0, r.length);
- ptr += r.length;
- return r;
- }
-
- /** @return backing array of the current field. */
- public byte[] bytesArray() {
- return buf;
- }
-
- /** @return length of field, call before {@link #bytesOffset}. */
- public int bytesLength() {
- checkFieldType(WIRE_LEN_DELIM);
- length = varint32();
- return length;
- }
-
- /** @return starting offset of the field, after {@link #bytesLength()}. */
- public int bytesOffset() {
- int start = ptr;
- ptr += length;
- return start;
- }
-
- /** @return decode the current raw bytes to an ObjectId. */
- public ObjectId bytesObjectId() {
- checkFieldType(WIRE_LEN_DELIM);
- int len = varint32();
- if (len != OBJECT_ID_LENGTH)
- throw new IllegalStateException(MessageFormat.format(DhtText
- .get().protobufWrongFieldLength,
- Integer.valueOf(field), Integer
- .valueOf(OBJECT_ID_LENGTH), Integer
- .valueOf(len)));
-
- ObjectId id = ObjectId.fromRaw(buf, ptr);
- ptr += OBJECT_ID_LENGTH;
- return id;
- }
-
- /** @return decode the current field as a nested message. */
- public Decoder message() {
- checkFieldType(WIRE_LEN_DELIM);
- int len = varint32();
- Decoder msg = decode(buf, ptr, len);
- ptr += len;
- return msg;
- }
-
- private int varint32() {
- long v = varint64();
- if (Integer.MAX_VALUE < v)
- throw new IllegalStateException(MessageFormat.format(DhtText
- .get().protobufWrongFieldType, Integer.valueOf(field),
- "int64", "int32"));
- return (int) v;
- }
-
- private long varint64() {
- int c = buf[ptr++];
- long r = c & 0x7f;
- int shift = 7;
- while ((c & 0x80) != 0) {
- c = buf[ptr++];
- r |= ((long) (c & 0x7f)) << shift;
- shift += 7;
- }
- return r;
- }
-
- private void checkFieldType(int expected) {
- if (type != expected)
- throw new IllegalStateException(MessageFormat.format(DhtText
- .get().protobufWrongFieldType, Integer.valueOf(field),
- Integer.valueOf(type), Integer.valueOf(expected)));
- }
- }
-
- /** Encode values into a binary protocol buffer. */
- public static class Encoder {
- private byte[] buf;
-
- private int ptr;
-
- private Encoder(byte[] buf) {
- this.buf = buf;
- }
-
- /**
- * Encode a variable length positive integer.
- *
- * @param field
- * field tag number.
- * @param value
- * the value to store. Must be >= 0.
- */
- public void int32(int field, int value) {
- int64(field, value);
- }
-
- /**
- * Encode a variable length positive integer.
- *
- * @param field
- * field tag number.
- * @param value
- * the value to store; omitted if 0.
- */
- public void int32IfNotZero(int field, int value) {
- int64IfNotZero(field, value);
- }
-
- /**
- * Encode a variable length positive integer.
- *
- * @param field
- * field tag number.
- * @param value
- * the value to store; omitted if negative.
- */
- public void int32IfNotNegative(int field, int value) {
- int64IfNotNegative(field, value);
- }
-
- /**
- * Encode a variable length positive integer.
- *
- * @param field
- * field tag number.
- * @param value
- * the value to store. Must be >= 0.
- */
- public void int64(int field, long value) {
- if (value < 0)
- throw new IllegalArgumentException(
- DhtText.get().protobufNegativeValuesNotSupported);
-
- field(field, WIRE_VARINT);
- varint(value);
- }
-
- /**
- * Encode a variable length positive integer.
- *
- * @param field
- * field tag number.
- * @param value
- * the value to store; omitted if 0.
- */
- public void int64IfNotZero(int field, long value) {
- if (0 != value)
- int64(field, value);
- }
-
- /**
- * Encode a variable length positive integer.
- *
- * @param field
- * field tag number.
- * @param value
- * the value to store; omitted if negative.
- */
- public void int64IfNotNegative(int field, long value) {
- if (0 <= value)
- int64(field, value);
- }
-
- /**
- * Encode an enumerated value.
- *
- * @param
- * type of the enumerated values.
- * @param field
- * field tag number.
- * @param value
- * value to store; if null the field is omitted.
- */
- public void intEnum(int field, T value) {
- if (value != null) {
- field(field, WIRE_VARINT);
- varint(value.value());
- }
- }
-
- /**
- * Encode a boolean value.
- *
- * @param field
- * field tag number.
- * @param value
- * the value to store.
- */
- public void bool(int field, boolean value) {
- field(field, WIRE_VARINT);
- varint(value ? 1 : 0);
- }
-
- /**
- * Encode a boolean value, only if true.
- *
- * @param field
- * field tag number.
- * @param value
- * the value to store.
- */
- public void boolIfTrue(int field, boolean value) {
- if (value)
- bool(field, value);
- }
-
- /**
- * Encode a fixed 64 value.
- *
- * @param field
- * field tag number.
- * @param value
- * the value to store.
- */
- public void fixed64(int field, long value) {
- field(field, WIRE_FIXED_64);
- if (buf != null) {
- ensureSpace(8);
-
- buf[ptr + 0] = (byte) value;
- value >>>= 8;
-
- buf[ptr + 1] = (byte) value;
- value >>>= 8;
-
- buf[ptr + 3] = (byte) value;
- value >>>= 8;
-
- buf[ptr + 3] = (byte) value;
- value >>>= 8;
-
- buf[ptr + 4] = (byte) value;
- value >>>= 8;
-
- buf[ptr + 5] = (byte) value;
- value >>>= 8;
-
- buf[ptr + 6] = (byte) value;
- value >>>= 8;
-
- buf[ptr + 7] = (byte) value;
- }
- ptr += 8;
- }
-
- /**
- * Encode a length delimited bytes field.
- *
- * @param field
- * field tag number.
- * @param value
- * the value to store; if null the field is omitted.
- */
- public void bytes(int field, byte[] value) {
- if (value != null)
- bytes(field, value, 0, value.length);
- }
-
- /**
- * Encode a length delimited bytes field.
- *
- * @param field
- * field tag number.
- * @param value
- * the value to store; if null the field is omitted.
- */
- public void bytes(int field, ByteBuffer value) {
- if (value != null) {
- if (!value.hasArray())
- throw new IllegalArgumentException(DhtText.get().protobufNoArray);
- byte[] valBuf = value.array();
- int valPtr = value.arrayOffset() + value.position();
- int valLen = value.limit() - value.position();
- bytes(field, valBuf, valPtr, valLen);
- }
- }
-
- /**
- * Encode a length delimited bytes field.
- *
- * @param field
- * field tag number.
- * @param value
- * the value to store; if null the field is omitted.
- * @param off
- * position to copy from.
- * @param len
- * number of bytes to copy.
- */
- public void bytes(int field, byte[] value, int off, int len) {
- if (value != null) {
- field(field, WIRE_LEN_DELIM);
- varint(len);
- copy(value, off, len);
- }
- }
-
- /**
- * Encode an ObjectId as a bytes (in raw binary format).
- *
- * @param field
- * field tag number.
- * @param value
- * the value to store, as a raw binary; if null the field is
- * omitted.
- */
- public void bytes(int field, AnyObjectId value) {
- if (value != null) {
- field(field, WIRE_LEN_DELIM);
- varint(OBJECT_ID_LENGTH);
- if (buf != null) {
- ensureSpace(OBJECT_ID_LENGTH);
- value.copyRawTo(buf, ptr);
- }
- ptr += OBJECT_ID_LENGTH;
- }
- }
-
- /**
- * Encode an ObjectId as a string (in hex format).
- *
- * @param field
- * field tag number.
- * @param value
- * the value to store, as a hex string; if null the field is
- * omitted.
- */
- public void string(int field, AnyObjectId value) {
- if (value != null) {
- field(field, WIRE_LEN_DELIM);
- varint(OBJECT_ID_STRING_LENGTH);
- if (buf != null) {
- ensureSpace(OBJECT_ID_STRING_LENGTH);
- value.copyTo(buf, ptr);
- }
- ptr += OBJECT_ID_STRING_LENGTH;
- }
- }
-
- /**
- * Encode a plain Java string.
- *
- * @param field
- * field tag number.
- * @param value
- * the value to store; if null the field is omitted.
- */
- public void string(int field, String value) {
- if (value != null)
- bytes(field, Constants.encode(value));
- }
-
- /**
- * Encode a row key as a string.
- *
- * @param field
- * field tag number.
- * @param key
- * the row key to store as a string; if null the field is
- * omitted.
- */
- public void string(int field, RowKey key) {
- if (key != null)
- bytes(field, key.asBytes());
- }
-
- /**
- * Encode an integer as an 8 byte hex string.
- *
- * @param field
- * field tag number.
- * @param value
- * value to encode.
- */
- public void stringHex32(int field, int value) {
- field(field, WIRE_LEN_DELIM);
- varint(8);
- if (buf != null) {
- ensureSpace(8);
- KeyUtils.format32(buf, ptr, value);
- }
- ptr += 8;
- }
-
- /**
- * Encode a nested message.
- *
- * @param field
- * field tag number.
- * @param msg
- * message to store; if null or empty the field is omitted.
- */
- public void message(int field, Encoder msg) {
- if (msg != null && msg.ptr > 0)
- bytes(field, msg.buf, 0, msg.ptr);
- }
-
- private void field(int field, int type) {
- varint((field << 3) | type);
- }
-
- private void varint(long value) {
- if (buf != null) {
- if (buf.length - ptr < 10)
- ensureSpace(varintSize(value));
-
- do {
- byte b = (byte) (value & 0x7f);
- value >>>= 7;
- if (value != 0)
- b |= 0x80;
- buf[ptr++] = b;
- } while (value != 0);
- } else {
- ptr += varintSize(value);
- }
- }
-
- private static int varintSize(long value) {
- value >>>= 7;
- int need = 1;
- for (; value != 0; value >>>= 7)
- need++;
- return need;
- }
-
- private void copy(byte[] src, int off, int cnt) {
- if (buf != null) {
- ensureSpace(cnt);
- System.arraycopy(src, off, buf, ptr, cnt);
- }
- ptr += cnt;
- }
-
- private void ensureSpace(int need) {
- if (buf.length - ptr < need) {
- byte[] n = new byte[Math.max(ptr + need, buf.length * 2)];
- System.arraycopy(buf, 0, n, 0, ptr);
- buf = n;
- }
- }
-
- /** @return size of the protocol buffer message, in bytes. */
- public int size() {
- return ptr;
- }
-
- /** @return the current buffer, as a byte array. */
- public byte[] asByteArray() {
- if (ptr == buf.length)
- return buf;
- byte[] r = new byte[ptr];
- System.arraycopy(buf, 0, r, 0, ptr);
- return r;
- }
-
- /** @return the current buffer. */
- public ByteBuffer asByteBuffer() {
- return ByteBuffer.wrap(buf, 0, ptr);
- }
- }
-
- private TinyProtobuf() {
- // Don't make instances.
- }
-}
diff --git a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/ChunkTable.java b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/ChunkTable.java
index d5c5cc9ff..db0fded3f 100644
--- a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/ChunkTable.java
+++ b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/ChunkTable.java
@@ -44,11 +44,12 @@
package org.eclipse.jgit.storage.dht.spi;
import java.util.Collection;
+import java.util.Map;
import java.util.Set;
+import org.eclipse.jgit.generated.storage.dht.proto.GitStore.ChunkMeta;
import org.eclipse.jgit.storage.dht.AsyncCallback;
import org.eclipse.jgit.storage.dht.ChunkKey;
-import org.eclipse.jgit.storage.dht.ChunkMeta;
import org.eclipse.jgit.storage.dht.DhtException;
import org.eclipse.jgit.storage.dht.PackChunk;
import org.eclipse.jgit.storage.dht.StreamingCallback;
@@ -113,7 +114,7 @@ public interface ChunkTable {
* results early.
*/
public void getMeta(Context options, Set keys,
- AsyncCallback> callback);
+ AsyncCallback> callback);
/**
* Put some (or all) of a single chunk.
diff --git a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/RefTable.java b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/RefTable.java
index 48171265c..b46ca0b5a 100644
--- a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/RefTable.java
+++ b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/RefTable.java
@@ -46,8 +46,9 @@ package org.eclipse.jgit.storage.dht.spi;
import java.util.Map;
import java.util.concurrent.TimeoutException;
+import org.eclipse.jgit.generated.storage.dht.proto.GitStore.RefData;
import org.eclipse.jgit.storage.dht.DhtException;
-import org.eclipse.jgit.storage.dht.RefData;
+import org.eclipse.jgit.storage.dht.RefDataUtil;
import org.eclipse.jgit.storage.dht.RefKey;
import org.eclipse.jgit.storage.dht.RepositoryKey;
@@ -100,8 +101,8 @@ public interface RefTable {
* @param oldData
* the old data for the reference. The put only occurs if the
* value is still equal to {@code oldData}. Use
- * {@link RefData#NONE} if the reference should not exist and is
- * being created.
+ * {@link RefDataUtil#NONE} if the reference should not exist and
+ * is being created.
* @param newData
* new value to store.
* @return true if the put was successful; false if the current value does
diff --git a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/RepositoryTable.java b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/RepositoryTable.java
index 5921ca95c..8f2dab83e 100644
--- a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/RepositoryTable.java
+++ b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/RepositoryTable.java
@@ -46,7 +46,7 @@ package org.eclipse.jgit.storage.dht.spi;
import java.util.Collection;
import java.util.concurrent.TimeoutException;
-import org.eclipse.jgit.storage.dht.CachedPackInfo;
+import org.eclipse.jgit.generated.storage.dht.proto.GitStore.CachedPackInfo;
import org.eclipse.jgit.storage.dht.CachedPackKey;
import org.eclipse.jgit.storage.dht.ChunkInfo;
import org.eclipse.jgit.storage.dht.ChunkKey;
diff --git a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/cache/CacheChunkTable.java b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/cache/CacheChunkTable.java
index 22989cb93..b7f94fd6c 100644
--- a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/cache/CacheChunkTable.java
+++ b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/cache/CacheChunkTable.java
@@ -44,29 +44,36 @@
package org.eclipse.jgit.storage.dht.spi.cache;
import static java.util.Collections.singleton;
+import static java.util.Collections.singletonMap;
+import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutorService;
+import org.eclipse.jgit.generated.storage.dht.proto.GitStore.ChunkMeta;
import org.eclipse.jgit.storage.dht.AsyncCallback;
import org.eclipse.jgit.storage.dht.ChunkKey;
-import org.eclipse.jgit.storage.dht.ChunkMeta;
import org.eclipse.jgit.storage.dht.DhtException;
import org.eclipse.jgit.storage.dht.PackChunk;
import org.eclipse.jgit.storage.dht.StreamingCallback;
import org.eclipse.jgit.storage.dht.Sync;
-import org.eclipse.jgit.storage.dht.TinyProtobuf;
import org.eclipse.jgit.storage.dht.spi.ChunkTable;
import org.eclipse.jgit.storage.dht.spi.Context;
import org.eclipse.jgit.storage.dht.spi.WriteBuffer;
import org.eclipse.jgit.storage.dht.spi.cache.CacheService.Change;
+import com.google.protobuf.CodedInputStream;
+import com.google.protobuf.CodedOutputStream;
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.WireFormat;
+
/** Cache wrapper around ChunkTable. */
public class CacheChunkTable implements ChunkTable {
private final ChunkTable db;
@@ -105,7 +112,7 @@ public class CacheChunkTable implements ChunkTable {
}
public void getMeta(Context options, Set keys,
- AsyncCallback> callback) {
+ AsyncCallback> callback) {
List toFind = new ArrayList(keys.size());
for (ChunkKey k : keys)
toFind.add(nsMeta.key(k));
@@ -118,8 +125,10 @@ public class CacheChunkTable implements ChunkTable {
db.put(chunk, buf.getWriteBuffer());
// Only store fragmented meta. This is all callers should ask for.
- if (chunk.hasMeta() && chunk.getMeta().getFragmentCount() != 0)
- buf.put(nsMeta.key(chunk.getChunkKey()), chunk.getMeta().asBytes());
+ if (chunk.hasMeta() && chunk.getMeta().getFragmentCount() != 0) {
+ buf.put(nsMeta.key(chunk.getChunkKey()),
+ chunk.getMeta().toByteArray());
+ }
if (chunk.hasChunkData())
buf.put(nsChunk.key(chunk.getChunkKey()), encode(chunk));
@@ -135,57 +144,99 @@ public class CacheChunkTable implements ChunkTable {
}
private static byte[] encode(PackChunk.Members members) {
- final byte[] meta;
- if (members.hasMeta())
- meta = members.getMeta().asBytes();
- else
- meta = null;
-
- ByteBuffer chunkData = members.getChunkDataAsByteBuffer();
- ByteBuffer chunkIndex = members.getChunkIndexAsByteBuffer();
-
- TinyProtobuf.Encoder sizer = TinyProtobuf.size();
- TinyProtobuf.Encoder e = sizer;
- do {
- e.bytes(1, chunkData);
- e.bytes(2, chunkIndex);
- e.bytes(3, meta);
- if (e == sizer)
- e = TinyProtobuf.encode(e.size());
- else
- return e.asByteArray();
- } while (true);
+ // Its too slow to encode ByteBuffer through the standard code.
+ // Since the message is only 3 fields, do it by hand.
+ ByteBuffer data = members.getChunkDataAsByteBuffer();
+ ByteBuffer index = members.getChunkIndexAsByteBuffer();
+ ChunkMeta meta = members.getMeta();
+
+ int sz = 0;
+ if (data != null)
+ sz += computeByteBufferSize(1, data);
+ if (index != null)
+ sz += computeByteBufferSize(2, index);
+ if (meta != null)
+ sz += CodedOutputStream.computeMessageSize(3, meta);
+
+ byte[] r = new byte[sz];
+ CodedOutputStream out = CodedOutputStream.newInstance(r);
+ try {
+ if (data != null)
+ writeByteBuffer(out, 1, data);
+ if (index != null)
+ writeByteBuffer(out, 2, index);
+ if (meta != null)
+ out.writeMessage(3, meta);
+ } catch (IOException err) {
+ throw new RuntimeException("Cannot buffer chunk", err);
+ }
+ return r;
+ }
+
+ private static int computeByteBufferSize(int fieldNumber, ByteBuffer data) {
+ int n = data.remaining();
+ return CodedOutputStream.computeTagSize(fieldNumber)
+ + CodedOutputStream.computeRawVarint32Size(n)
+ + n;
+ }
+
+ private static void writeByteBuffer(CodedOutputStream out, int fieldNumber,
+ ByteBuffer data) throws IOException {
+ byte[] d = data.array();
+ int p = data.arrayOffset() + data.position();
+ int n = data.remaining();
+ out.writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
+ out.writeRawVarint32(n);
+ out.writeRawBytes(d, p, n);
}
private static PackChunk.Members decode(ChunkKey key, byte[] raw) {
PackChunk.Members members = new PackChunk.Members();
members.setChunkKey(key);
- TinyProtobuf.Decoder d = TinyProtobuf.decode(raw);
- for (;;) {
- switch (d.next()) {
- case 0:
- return members;
- case 1: {
- int cnt = d.bytesLength();
- int ptr = d.bytesOffset();
- byte[] buf = d.bytesArray();
- members.setChunkData(buf, ptr, cnt);
- continue;
- }
- case 2: {
- int cnt = d.bytesLength();
- int ptr = d.bytesOffset();
- byte[] buf = d.bytesArray();
- members.setChunkIndex(buf, ptr, cnt);
- continue;
- }
- case 3:
- members.setMeta(ChunkMeta.fromBytes(key, d.message()));
- continue;
- default:
- d.skip();
+ // Its too slow to convert using the standard code, as copies
+ // are made. Instead find offsets in the stream and use that.
+ CodedInputStream in = CodedInputStream.newInstance(raw);
+ try {
+ int tag = in.readTag();
+ for (;;) {
+ switch (WireFormat.getTagFieldNumber(tag)) {
+ case 0:
+ return members;
+ case 1: {
+ int cnt = in.readRawVarint32();
+ int ptr = in.getTotalBytesRead();
+ members.setChunkData(raw, ptr, cnt);
+ in.skipRawBytes(cnt);
+ tag = in.readTag();
+ if (WireFormat.getTagFieldNumber(tag) != 2)
+ continue;
+ }
+ //$FALL-THROUGH$
+ case 2: {
+ int cnt = in.readRawVarint32();
+ int ptr = in.getTotalBytesRead();
+ members.setChunkIndex(raw, ptr, cnt);
+ in.skipRawBytes(cnt);
+ tag = in.readTag();
+ if (WireFormat.getTagFieldNumber(tag) != 3)
+ continue;
+ }
+ //$FALL-THROUGH$
+ case 3: {
+ int cnt = in.readRawVarint32();
+ int oldLimit = in.pushLimit(cnt);
+ members.setMeta(ChunkMeta.parseFrom(in));
+ in.popLimit(oldLimit);
+ tag = in.readTag();
+ continue;
+ }
+ default:
+ in.skipField(tag);
+ }
}
+ } catch (IOException err) {
+ throw new RuntimeException("Cannot decode chunk", err);
}
}
@@ -329,41 +380,49 @@ public class CacheChunkTable implements ChunkTable {
private final Set remaining;
- private final AsyncCallback> normalCallback;
+ private final AsyncCallback> normalCallback;
- private final StreamingCallback> streamingCallback;
+ private final StreamingCallback> streamingCallback;
- private final List all;
+ private final Map all;
MetaFromCache(Context options, Set keys,
- AsyncCallback> callback) {
+ AsyncCallback> callback) {
this.options = options;
this.remaining = new HashSet(keys);
this.normalCallback = callback;
if (callback instanceof StreamingCallback) {
- streamingCallback = (StreamingCallback>) callback;
+ streamingCallback = (StreamingCallback>) callback;
all = null;
} else {
streamingCallback = null;
- all = new ArrayList(keys.size());
+ all = new HashMap();
}
}
public void onPartialResult(Map result) {
for (Map.Entry ent : result.entrySet()) {
ChunkKey key = ChunkKey.fromBytes(ent.getKey().getBytes());
- ChunkMeta meta = ChunkMeta.fromBytes(key, ent.getValue());
+ ChunkMeta meta;
+ try {
+ meta = ChunkMeta.parseFrom(ent.getValue());
+ } catch (InvalidProtocolBufferException e) {
+ // Invalid meta message, remove the cell from cache.
+ client.modify(singleton(Change.remove(ent.getKey())),
+ Sync. none());
+ continue;
+ }
if (streamingCallback != null) {
- streamingCallback.onPartialResult(singleton(meta));
+ streamingCallback.onPartialResult(singletonMap(key, meta));
synchronized (lock) {
remaining.remove(key);
}
} else {
synchronized (lock) {
- all.add(meta);
+ all.put(key, meta);
remaining.remove(key);
}
}
@@ -391,31 +450,31 @@ public class CacheChunkTable implements ChunkTable {
}
private class MetaFromDatabase implements
- StreamingCallback> {
+ StreamingCallback> {
private final Object lock = new Object();
- private final List all;
+ private final Map all;
- private final AsyncCallback> normalCallback;
+ private final AsyncCallback> normalCallback;
- private final StreamingCallback> streamingCallback;
+ private final StreamingCallback> streamingCallback;
- MetaFromDatabase(List all,
- AsyncCallback> normalCallback,
- StreamingCallback> streamingCallback) {
+ MetaFromDatabase(Map all,
+ AsyncCallback> normalCallback,
+ StreamingCallback> streamingCallback) {
this.all = all;
this.normalCallback = normalCallback;
this.streamingCallback = streamingCallback;
}
- public void onPartialResult(Collection result) {
- final List toPutIntoCache = copy(result);
+ public void onPartialResult(Map result) {
+ final Map toPutIntoCache = copy(result);
if (streamingCallback != null)
streamingCallback.onPartialResult(result);
else {
synchronized (lock) {
- all.addAll(result);
+ all.putAll(result);
}
}
@@ -425,20 +484,22 @@ public class CacheChunkTable implements ChunkTable {
//
executor.submit(new Runnable() {
public void run() {
- for (ChunkMeta meta : toPutIntoCache) {
- ChunkKey key = meta.getChunkKey();
- Change op = Change.put(nsMeta.key(key), meta.asBytes());
+ for (Map.Entry ent
+ : toPutIntoCache.entrySet()) {
+ ChunkKey key = ent.getKey();
+ Change op = Change.put(nsMeta.key(key),
+ ent.getValue().toByteArray());
client.modify(singleton(op), none);
}
}
});
}
- private List copy(Collection result) {
- return new ArrayList(result);
+ private Map copy(Map result) {
+ return new HashMap(result);
}
- public void onSuccess(Collection result) {
+ public void onSuccess(Map result) {
if (result != null && !result.isEmpty())
onPartialResult(result);
diff --git a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/cache/CacheObjectIndexTable.java b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/cache/CacheObjectIndexTable.java
index 0438dc09e..0cd3549e0 100644
--- a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/cache/CacheObjectIndexTable.java
+++ b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/cache/CacheObjectIndexTable.java
@@ -44,7 +44,9 @@
package org.eclipse.jgit.storage.dht.spi.cache;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -52,6 +54,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutorService;
+import org.eclipse.jgit.generated.storage.dht.proto.GitCache.CachedObjectIndex;
import org.eclipse.jgit.storage.dht.AsyncCallback;
import org.eclipse.jgit.storage.dht.ChunkKey;
import org.eclipse.jgit.storage.dht.DhtException;
@@ -59,12 +62,13 @@ import org.eclipse.jgit.storage.dht.ObjectIndexKey;
import org.eclipse.jgit.storage.dht.ObjectInfo;
import org.eclipse.jgit.storage.dht.StreamingCallback;
import org.eclipse.jgit.storage.dht.Sync;
-import org.eclipse.jgit.storage.dht.TinyProtobuf;
import org.eclipse.jgit.storage.dht.spi.Context;
import org.eclipse.jgit.storage.dht.spi.ObjectIndexTable;
import org.eclipse.jgit.storage.dht.spi.WriteBuffer;
import org.eclipse.jgit.storage.dht.spi.cache.CacheService.Change;
+import com.google.protobuf.InvalidProtocolBufferException;
+
/** Cache wrapper around ObjectIndexTable. */
public class CacheObjectIndexTable implements ObjectIndexTable {
private final ObjectIndexTable db;
@@ -125,58 +129,6 @@ public class CacheObjectIndexTable implements ObjectIndexTable {
buf.remove(ns.key(objId));
}
- private static byte[] encode(Collection list) {
- TinyProtobuf.Encoder e = TinyProtobuf.encode(128);
- for (ObjectInfo info : list) {
- TinyProtobuf.Encoder m = TinyProtobuf.encode(128);
- m.bytes(1, info.getChunkKey().asBytes());
- m.bytes(2, info.asBytes());
- m.fixed64(3, info.getTime());
- e.message(1, m);
- }
- return e.asByteArray();
- }
-
- private static ObjectInfo decodeItem(TinyProtobuf.Decoder m) {
- ChunkKey key = null;
- TinyProtobuf.Decoder data = null;
- long time = -1;
-
- for (;;) {
- switch (m.next()) {
- case 0:
- return ObjectInfo.fromBytes(key, data, time);
- case 1:
- key = ChunkKey.fromBytes(m);
- continue;
- case 2:
- data = m.message();
- continue;
- case 3:
- time = m.fixed64();
- continue;
- default:
- m.skip();
- }
- }
- }
-
- private static Collection decode(byte[] raw) {
- List res = new ArrayList(1);
- TinyProtobuf.Decoder d = TinyProtobuf.decode(raw);
- for (;;) {
- switch (d.next()) {
- case 0:
- return res;
- case 1:
- res.add(decodeItem(d.message()));
- continue;
- default:
- d.skip();
- }
- }
- }
-
private class LoaderFromCache implements
StreamingCallback> {
private final Object lock = new Object();
@@ -217,7 +169,15 @@ public class CacheObjectIndexTable implements ObjectIndexTable {
for (Map.Entry e : result.entrySet()) {
ObjectIndexKey objKey;
- Collection list = decode(e.getValue());
+ Collection list;
+ try {
+ list = decode(e.getValue());
+ } catch (InvalidProtocolBufferException badCell) {
+ client.modify(
+ Collections.singleton(Change.remove(e.getKey())),
+ Sync. none());
+ continue;
+ }
objKey = ObjectIndexKey.fromBytes(e.getKey().getBytes());
if (tmp != null)
@@ -238,6 +198,21 @@ public class CacheObjectIndexTable implements ObjectIndexTable {
}
}
+ private Collection decode(byte[] value)
+ throws InvalidProtocolBufferException {
+ CachedObjectIndex cacheEntry = CachedObjectIndex.parseFrom(value);
+ int sz = cacheEntry.getItemCount();
+ ObjectInfo[] r = new ObjectInfo[sz];
+ for (int i = 0; i < sz; i++) {
+ CachedObjectIndex.Item item = cacheEntry.getItem(i);
+ r[i] = new ObjectInfo(
+ ChunkKey.fromString(item.getChunkKey()),
+ item.getTime(),
+ item.getObjectInfo());
+ }
+ return Arrays.asList(r);
+ }
+
public void onSuccess(Map result) {
if (result != null && !result.isEmpty())
onPartialResult(result);
@@ -305,6 +280,19 @@ public class CacheObjectIndexTable implements ObjectIndexTable {
client.modify(ops, Sync. none());
}
+
+ private byte[] encode(List items) {
+ CachedObjectIndex.Builder b;
+ b = CachedObjectIndex.newBuilder();
+ for (ObjectInfo info : items) {
+ CachedObjectIndex.Item.Builder i = b.addItemBuilder();
+ i.setChunkKey(info.getChunkKey().asString());
+ i.setObjectInfo(info.getData());
+ if (0 < info.getTime())
+ i.setTime(info.getTime());
+ }
+ return b.build().toByteArray();
+ }
});
}
diff --git a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/cache/CacheRefTable.java b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/cache/CacheRefTable.java
index 5edb49edd..2b6c8dac3 100644
--- a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/cache/CacheRefTable.java
+++ b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/cache/CacheRefTable.java
@@ -46,8 +46,8 @@ package org.eclipse.jgit.storage.dht.spi.cache;
import java.util.Map;
import java.util.concurrent.TimeoutException;
+import org.eclipse.jgit.generated.storage.dht.proto.GitStore.RefData;
import org.eclipse.jgit.storage.dht.DhtException;
-import org.eclipse.jgit.storage.dht.RefData;
import org.eclipse.jgit.storage.dht.RefKey;
import org.eclipse.jgit.storage.dht.RepositoryKey;
import org.eclipse.jgit.storage.dht.spi.Context;
diff --git a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/cache/CacheRepositoryTable.java b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/cache/CacheRepositoryTable.java
index b71c24262..a378e0a8b 100644
--- a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/cache/CacheRepositoryTable.java
+++ b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/cache/CacheRepositoryTable.java
@@ -46,24 +46,24 @@ package org.eclipse.jgit.storage.dht.spi.cache;
import static java.util.Collections.emptyMap;
import static java.util.Collections.singleton;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeoutException;
-import org.eclipse.jgit.storage.dht.CachedPackInfo;
+import org.eclipse.jgit.generated.storage.dht.proto.GitCache.CachedPackInfoList;
+import org.eclipse.jgit.generated.storage.dht.proto.GitStore.CachedPackInfo;
import org.eclipse.jgit.storage.dht.CachedPackKey;
import org.eclipse.jgit.storage.dht.ChunkInfo;
import org.eclipse.jgit.storage.dht.ChunkKey;
import org.eclipse.jgit.storage.dht.DhtException;
import org.eclipse.jgit.storage.dht.RepositoryKey;
import org.eclipse.jgit.storage.dht.Sync;
-import org.eclipse.jgit.storage.dht.TinyProtobuf;
import org.eclipse.jgit.storage.dht.spi.RepositoryTable;
import org.eclipse.jgit.storage.dht.spi.WriteBuffer;
import org.eclipse.jgit.storage.dht.spi.cache.CacheService.Change;
+import com.google.protobuf.InvalidProtocolBufferException;
+
/** Cache wrapper around RepositoryTable. */
public class CacheRepositoryTable implements RepositoryTable {
private final RepositoryTable db;
@@ -126,26 +126,20 @@ public class CacheRepositoryTable implements RepositoryTable {
byte[] data = result.get(memKey);
if (data != null) {
- List r = new ArrayList();
- TinyProtobuf.Decoder d = TinyProtobuf.decode(data);
- for (;;) {
- switch (d.next()) {
- case 0:
- return r;
- case 1:
- r.add(CachedPackInfo.fromBytes(d.message()));
- continue;
- default:
- d.skip();
- }
+ try {
+ return CachedPackInfoList.parseFrom(data).getPackList();
+ } catch (InvalidProtocolBufferException e) {
+ // Invalidate the cache entry and fall through.
+ client.modify(singleton(Change.remove(memKey)), none);
}
}
Collection r = db.getCachedPacks(repo);
- TinyProtobuf.Encoder e = TinyProtobuf.encode(1024);
- for (CachedPackInfo info : r)
- e.bytes(1, info.asBytes());
- client.modify(singleton(Change.put(memKey, e.asByteArray())), none);
+ CachedPackInfoList.Builder list = CachedPackInfoList.newBuilder();
+ list.addAllPack(r);
+ client.modify(
+ singleton(Change.put(memKey, list.build().toByteArray())),
+ none);
return r;
}
diff --git a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/memory/MemChunkTable.java b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/memory/MemChunkTable.java
index 8a04dbb6d..277b2b83a 100644
--- a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/memory/MemChunkTable.java
+++ b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/memory/MemChunkTable.java
@@ -43,21 +43,27 @@
package org.eclipse.jgit.storage.dht.spi.memory;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import org.eclipse.jgit.generated.storage.dht.proto.GitStore.ChunkMeta;
import org.eclipse.jgit.storage.dht.AsyncCallback;
import org.eclipse.jgit.storage.dht.ChunkKey;
-import org.eclipse.jgit.storage.dht.ChunkMeta;
import org.eclipse.jgit.storage.dht.DhtException;
+import org.eclipse.jgit.storage.dht.DhtText;
import org.eclipse.jgit.storage.dht.PackChunk;
import org.eclipse.jgit.storage.dht.spi.ChunkTable;
import org.eclipse.jgit.storage.dht.spi.Context;
import org.eclipse.jgit.storage.dht.spi.WriteBuffer;
import org.eclipse.jgit.storage.dht.spi.util.ColumnMatcher;
+import com.google.protobuf.InvalidProtocolBufferException;
+
final class MemChunkTable implements ChunkTable {
private final MemTable table = new MemTable();
@@ -89,8 +95,15 @@ final class MemChunkTable implements ChunkTable {
m.setChunkIndex(cell.getValue());
cell = table.get(row, colMeta.name());
- if (cell != null)
- m.setMeta(ChunkMeta.fromBytes(chunk, cell.getValue()));
+ if (cell != null) {
+ try {
+ m.setMeta(ChunkMeta.parseFrom(cell.getValue()));
+ } catch (InvalidProtocolBufferException err) {
+ callback.onFailure(new DhtException(MessageFormat.format(
+ DhtText.get().invalidChunkMeta, chunk), err));
+ return;
+ }
+ }
out.add(m);
}
@@ -99,15 +112,21 @@ final class MemChunkTable implements ChunkTable {
}
public void getMeta(Context options, Set keys,
- AsyncCallback> callback) {
- int cnt = keys.size();
- List out = new ArrayList(cnt);
+ AsyncCallback> callback) {
+ Map out = new HashMap();
for (ChunkKey chunk : keys) {
byte[] row = chunk.asBytes();
MemTable.Cell cell = table.get(row, colMeta.name());
- if (cell != null)
- out.add(ChunkMeta.fromBytes(chunk, cell.getValue()));
+ if (cell != null) {
+ try {
+ out.put(chunk, ChunkMeta.parseFrom(cell.getValue()));
+ } catch (InvalidProtocolBufferException err) {
+ callback.onFailure(new DhtException(MessageFormat.format(
+ DhtText.get().invalidChunkMeta, chunk), err));
+ return;
+ }
+ }
}
callback.onSuccess(out);
@@ -124,7 +143,7 @@ final class MemChunkTable implements ChunkTable {
table.put(row, colIndex.name(), chunk.getChunkIndex());
if (chunk.hasMeta())
- table.put(row, colMeta.name(), chunk.getMeta().asBytes());
+ table.put(row, colMeta.name(), chunk.getMeta().toByteArray());
}
public void remove(ChunkKey key, WriteBuffer buffer) throws DhtException {
diff --git a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/memory/MemObjectIndexTable.java b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/memory/MemObjectIndexTable.java
index e6f4f7aca..e3bb7fdd1 100644
--- a/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/memory/MemObjectIndexTable.java
+++ b/org.eclipse.jgit.storage.dht/src/org/eclipse/jgit/storage/dht/spi/memory/MemObjectIndexTable.java
@@ -43,15 +43,18 @@
package org.eclipse.jgit.storage.dht.spi.memory;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import org.eclipse.jgit.generated.storage.dht.proto.GitStore;
import org.eclipse.jgit.storage.dht.AsyncCallback;
import org.eclipse.jgit.storage.dht.ChunkKey;
import org.eclipse.jgit.storage.dht.DhtException;
+import org.eclipse.jgit.storage.dht.DhtText;
import org.eclipse.jgit.storage.dht.ObjectIndexKey;
import org.eclipse.jgit.storage.dht.ObjectInfo;
import org.eclipse.jgit.storage.dht.spi.Context;
@@ -59,6 +62,8 @@ import org.eclipse.jgit.storage.dht.spi.ObjectIndexTable;
import org.eclipse.jgit.storage.dht.spi.WriteBuffer;
import org.eclipse.jgit.storage.dht.spi.util.ColumnMatcher;
+import com.google.protobuf.InvalidProtocolBufferException;
+
final class MemObjectIndexTable implements ObjectIndexTable {
private final MemTable table = new MemTable();
@@ -70,17 +75,25 @@ final class MemObjectIndexTable implements ObjectIndexTable {
for (ObjectIndexKey objId : objects) {
for (MemTable.Cell cell : table.scanFamily(objId.asBytes(), colInfo)) {
- Collection info = out.get(objId);
- if (info == null) {
- info = new ArrayList