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 CDCCFE6AB for ; Fri, 14 Dec 2012 10:32:47 +0000 (UTC) Received: (qmail 45696 invoked by uid 500); 14 Dec 2012 10:32:47 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 45620 invoked by uid 500); 14 Dec 2012 10:32:45 -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 45583 invoked by uid 99); 14 Dec 2012 10:32:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Dec 2012 10:32:44 +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; Fri, 14 Dec 2012 10:32:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3A0AF2388962; Fri, 14 Dec 2012 10:32:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1421786 - in /jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl: MongoNodeStore.java action/FetchNodesActionNew.java Date: Fri, 14 Dec 2012 10:32:20 -0000 To: oak-commits@jackrabbit.apache.org From: meteatamel@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121214103221.3A0AF2388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: meteatamel Date: Fri Dec 14 10:32:20 2012 New Revision: 1421786 URL: http://svn.apache.org/viewvc?rev=1421786&view=rev Log: Cache the fetched nodes as well Modified: jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/MongoNodeStore.java jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/action/FetchNodesActionNew.java Modified: jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/MongoNodeStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/MongoNodeStore.java?rev=1421786&r1=1421785&r2=1421786&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/MongoNodeStore.java (original) +++ jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/MongoNodeStore.java Fri Dec 14 10:32:20 2012 @@ -216,7 +216,7 @@ public class MongoNodeStore implements N long revisionId = node.getRevisionId(); String path = node.getPath(); String branchId = node.getBranchId(); - String key = path + "@" + branchId + "@" + revisionId; + String key = path + "*" + branchId + "*" + revisionId; if (!nodeCache.containsKey(key)) { LOG.debug("Adding node to cache: {}", key); nodeCache.put(key, node); @@ -232,7 +232,7 @@ public class MongoNodeStore implements N * @return */ public MongoNode getFromCache(String path, String branchId, long revisionId) { - String key = path + "@" + branchId + "@" + revisionId; + String key = path + "*" + branchId + "*" + revisionId; MongoNode node = nodeCache.get(key); if (node == null) { return null; Modified: jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/action/FetchNodesActionNew.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/action/FetchNodesActionNew.java?rev=1421786&r1=1421785&r2=1421786&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/action/FetchNodesActionNew.java (original) +++ jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/action/FetchNodesActionNew.java Fri Dec 14 10:32:20 2012 @@ -111,7 +111,11 @@ public class FetchNodesActionNew extends } DBCursor dbCursor = performQuery(); - return getMostRecentValidNodes(dbCursor); + Map nodes = getMostRecentValidNodes(dbCursor); + for (MongoNode node : nodes.values()) { + nodeStore.cache(node); + } + return nodes; } private DBCursor performQuery() {