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 D06D4EC39 for ; Mon, 25 Feb 2013 18:49:32 +0000 (UTC) Received: (qmail 19785 invoked by uid 500); 25 Feb 2013 18:49:32 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 19772 invoked by uid 500); 25 Feb 2013 18:49:32 -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 19764 invoked by uid 99); 25 Feb 2013 18:49:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Feb 2013 18:49:32 +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; Mon, 25 Feb 2013 18:49:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EA5E92388900; Mon, 25 Feb 2013 18:49:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1449805 - /jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java Date: Mon, 25 Feb 2013 18:49:12 -0000 To: oak-commits@jackrabbit.apache.org From: chetanm@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130225184912.EA5E92388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chetanm Date: Mon Feb 25 18:49:12 2013 New Revision: 1449805 URL: http://svn.apache.org/r1449805 Log: OAK-619 - Lock-free MongoMK implementation Moving the remove from cache step to the later part. Modified: jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java Modified: jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java?rev=1449805&r1=1449804&r2=1449805&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java (original) +++ jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java Mon Feb 25 18:49:12 2013 @@ -481,7 +481,6 @@ public class MongoMK implements MicroKer UpdateOp op = commit.getUpdateOperationForNode(path); op.addMapEntry("_deleted", rev.toString(), "true"); op.increment("_writeCount", 1); - nodeCache.remove(path + "@" + rev); if(subTreeAlso){ // TODO Would cause issue with large number of children. @@ -492,6 +491,9 @@ public class MongoMK implements MicroKer markAsDeleted(childPath, commit,true); } } + + //Remove the node from the cache + nodeCache.remove(path + "@" + rev); } private boolean isDeleted(Map nodeProps, Revision rev) {