Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C29C51067B for ; Wed, 10 Apr 2013 16:22:53 +0000 (UTC) Received: (qmail 50121 invoked by uid 500); 10 Apr 2013 16:22:53 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 50097 invoked by uid 500); 10 Apr 2013 16:22:53 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 50089 invoked by uid 99); 10 Apr 2013 16:22:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Apr 2013 16:22:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Apr 2013 16:22:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BA17823888E4; Wed, 10 Apr 2013 16:22:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1466546 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/JsopDiff.java Date: Wed, 10 Apr 2013 16:22:29 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130410162229.BA17823888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Wed Apr 10 16:22:29 2013 New Revision: 1466546 URL: http://svn.apache.org/r1466546 Log: OAK-769: Add utility method to JsopDiff for debugging node states Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/JsopDiff.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/JsopDiff.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/JsopDiff.java?rev=1466546&r1=1466545&r2=1466546&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/JsopDiff.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/JsopDiff.java Wed Apr 10 16:22:29 2013 @@ -16,8 +16,14 @@ */ package org.apache.jackrabbit.oak.kernel; +import static org.apache.jackrabbit.oak.api.Type.BINARIES; +import static org.apache.jackrabbit.oak.api.Type.BOOLEANS; +import static org.apache.jackrabbit.oak.api.Type.LONGS; +import static org.apache.jackrabbit.oak.api.Type.STRINGS; + import java.io.IOException; import java.io.InputStream; +import java.util.Arrays; import javax.jcr.PropertyType; @@ -32,11 +38,6 @@ import org.apache.jackrabbit.oak.spi.sta import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.jackrabbit.oak.api.Type.BINARIES; -import static org.apache.jackrabbit.oak.api.Type.BOOLEANS; -import static org.apache.jackrabbit.oak.api.Type.LONGS; -import static org.apache.jackrabbit.oak.api.Type.STRINGS; - /** * TODO document */ @@ -65,6 +66,17 @@ class JsopDiff implements NodeStateDiff after.compareAgainstBaseState(before, new JsopDiff(kernel, jsop, path)); } + public static String diffToJsop(NodeState before, NodeState after) { + JsopDiff diff = new JsopDiff(null) { + @Override + protected String writeBlob(Blob blob) { + return "Blob{" + Arrays.toString(blob.sha256()) + '}'; + } + }; + after.compareAgainstBaseState(before, diff); + return diff.toString(); + } + protected JsopDiff createChildDiff(JsopBuilder jsop, String path) { return new JsopDiff(kernel, jsop, path); } @@ -156,14 +168,7 @@ class JsopDiff implements NodeStateDiff break; case PropertyType.BINARY: for (Blob value : property.getValue(BINARIES)) { - String binId; - if (value instanceof KernelBlob) { - binId = ((KernelBlob) value).getBinaryID(); - } else { - InputStream is = value.getNewStream(); - binId = kernel.write(is); - close(is); - } + String binId = writeBlob(value); jsop.value(TypeCodes.encode(type, binId)); } break; @@ -178,6 +183,23 @@ class JsopDiff implements NodeStateDiff } } + /** + * Make sure {@code blob} is persisted and return the id of the persisted blob. + * @param blob blob to persist + * @return id of the persisted blob + */ + protected String writeBlob(Blob blob) { + String blobId; + if (blob instanceof KernelBlob) { + blobId = ((KernelBlob) blob).getBinaryID(); + } else { + InputStream is = blob.getNewStream(); + blobId = kernel.write(is); + close(is); + } + return blobId; + } + private static void close(InputStream stream) { try { stream.close();