Fix for DLFS upload of very large Blobs

convex-core/src/main/java/convex/core/data/AArrayBlob.java

@@ -247,8 +247,8 @@ public boolean equals(ABlob o) {
 	}
 
 	@Override
-	public boolean equalsBytes(byte[] bytes, int byteOffset) {
-		return Utils.arrayEquals(store, offset, bytes, byteOffset, length);
+	public boolean equalsBytes(byte[] bytes, long byteOffset) {
+		return Utils.arrayEquals(store, offset, bytes, Utils.checkedInt(byteOffset), length);
 	}
 
 	public boolean equalsBytes(ABlob k) {

convex-core/src/main/java/convex/core/data/ABlob.java

@@ -180,7 +180,7 @@ public boolean equals(ACell o) {
 	 * @param offset Offset into byte array from which to start comparison
 	 * @return true if exactly equal, false otherwise
 	 */
-	public abstract boolean equalsBytes(byte[] bytes, int offset);
+	public abstract boolean equalsBytes(byte[] bytes, long offset);
 
 	/**
 	 * Compares this Blob to another Blob, in lexicographic order sorting by first
@@ -327,8 +327,17 @@ public int read(long offset, ByteBuffer dest) {
 	 */
 	public ABlob replaceSlice(long position, ABlob b) {
 		long end=Math.min(position+b.count(),count());
-		ABlob rest=slice(end,count());
-		return slice(0,position).append(b).append(rest);
+		ABlob head=slice(0,position);
+		if (head==null)throw new IllegalArgumentException("Invalid "+position+ " in blob of size "+count());
+		ABlob tail=slice(end,count());
+		ABlob firstPart= head.append(b);
+		ABlob result= firstPart.append(tail);
+
+		if (result.count()<0) {
+			head.append(b);
+			throw new Error("This is bad!!");
+		}
+		return result;
 	}
 
 

convex-core/src/main/java/convex/core/data/ALongBlob.java

@@ -135,6 +135,11 @@ public final boolean equalsBytes(ABlob b) {
 		if (b.count()!=LENGTH) return false;
 		return value==b.longValue();
 	}
+
+	@Override
+	public boolean equalsBytes(byte[] bytes, long byteOffset) {
+		return value==Utils.readLong(bytes, Utils.checkedInt(byteOffset),8);
+	}
 
 	@Override
 	public abstract byte getTag();

convex-core/src/main/java/convex/core/data/Address.java

@@ -235,10 +235,7 @@ protected void updateDigest(MessageDigest digest) {
 		toFlatBlob().updateDigest(digest);
 	}
 
-	@Override
-	public boolean equalsBytes(byte[] bytes, int byteOffset) {
-		return value==Utils.readLong(bytes, byteOffset,8);
-	}
+
 
 	public static final int MAX_ENCODING_LENGTH = 1+Format.MAX_VLC_COUNT_LENGTH;
 

convex-core/src/main/java/convex/core/data/BlobTree.java

@@ -208,6 +208,7 @@ public ABlob slice(long start, long end) {
 		if (end >count) return null;
 		long length=end-start;;
 		if (length<0) return null;
+		if (start==end) return Blob.EMPTY;
 
 		if ((start == 0L) && (length == this.count)) return this;
 
@@ -258,7 +259,7 @@ protected void updateDigest(MessageDigest digest) {
 
 	@Override
 	public byte byteAtUnchecked(long i) {
-		int childLength = childLength();
+		long childLength = childLength();
 		int ci = (int) (i >> (shift + Blobs.CHUNK_SHIFT));
 		return getChild(ci).byteAtUnchecked(i - ci * childLength);
 	}
@@ -267,8 +268,8 @@ public byte byteAtUnchecked(long i) {
 	 * Gets the length in bytes of each full child of this BlobTree
 	 * @return
 	 */
-	private int childLength() {
-		return 1 << (shift + Blobs.CHUNK_SHIFT);
+	private long childLength() {
+		return 1L << (shift + Blobs.CHUNK_SHIFT);
 	}
 
 	@Override
@@ -288,8 +289,8 @@ public boolean equals(BlobTree b) {
 	}
 
 	@Override
-	public boolean equalsBytes(byte[] bytes, int byteOffset) {
-		int clen=childLength();
+	public boolean equalsBytes(byte[] bytes, long byteOffset) {
+		long clen=childLength();
 		for (int i=0; i<children.length; i++) {
 			if (!(getChild(i).equalsBytes(bytes, byteOffset+i*clen))) return false;
 		}
@@ -453,7 +454,7 @@ public void validate() throws InvalidDataException {
 		super.validate();
 		int n = children.length;
 		if ((n < 2) | (n > FANOUT)) throw new InvalidDataException("Illegal number of BlobTree children: " + n, this);
-		int clen = childLength();
+		long clen = childLength();
 		long total = 0;
 
 		// We need to validate and check the lengths of all child notes. Note that only the last child can

convex-core/src/main/java/convex/core/data/LongBlob.java

@@ -103,11 +103,6 @@ public byte getTag() {
 		return Tag.BLOB;
 	}
 
-	@Override
-	public boolean equalsBytes(byte[] bytes, int byteOffset) {
-		return value==Utils.readLong(bytes, byteOffset,8);
-	}
-
 	@Override
 	public boolean isCanonical() {
 		return false;

convex-core/src/main/java/convex/dlfs/impl/DLFileChannel.java

@@ -114,12 +114,13 @@ public int write(ByteBuffer src) throws IOException {
 			long n=b.count();
 			ABlob newData=data.replaceSlice(position,b);
 
+			// position after replaced slice
+			position=position+n;
+
 			if (newData!=data) {
 				AVector<ACell> newNode=node.assoc(DLFSNode.POS_DATA, newData);
 				updateNode(newNode);
 			}
-			// position after replaced slice
-			position=position+n;
 
 			return (int)n;
 		}

convex-gui/src/main/java/convex/gui/components/AbstractGUI.java

@@ -27,7 +27,7 @@ public void run() {
 					frame.setTitle(getTitle());
 					frame.setIconImage(Toolkit.getDefaultToolkit()
 							.getImage(MainGUI.class.getResource("/images/Convex.png")));
-					frame.setBounds(50, 50, 1000, 800);
+					frame.setBounds(50, 50, 1200, 920);
 
 					Toolkit.closeIfFirstFrame(frame);
 

convex-gui/src/main/java/convex/gui/dlfs/PreviewPanel.java

@@ -65,12 +65,12 @@ public void setPath(Path path) {
 							sb.append("DLFS Directory accessible\n");
 						}
 						sb.append("Entries:     "+DLFSNode.getDirectoryEntries(node).count()+"\n");
-						sb.append("Node Hash:   "+node.getHash()+"\n");
 					} else {
 						ABlob data=DLFSNode.getData(node);
 						sb.append("File Size:   "+data.count()+"\n");
 						sb.append("Data Hash:   "+data.getHash()+"\n");
 					}
+					sb.append("Node Hash:   "+node.getHash()+"\n");
 				} else {
 					sb.append("Not a DLFS file: "+Utils.getClassName(path));
 				}