Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 21CCB8011 for ; Wed, 7 Sep 2011 17:08:40 +0000 (UTC) Received: (qmail 24461 invoked by uid 500); 7 Sep 2011 17:08:39 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 24368 invoked by uid 500); 7 Sep 2011 17:08:39 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 24350 invoked by uid 99); 7 Sep 2011 17:08:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Sep 2011 17:08:38 +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, 07 Sep 2011 17:08:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3601E23888E7; Wed, 7 Sep 2011 17:08:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1166266 - in /jackrabbit/sandbox/jackrabbit-mk: jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/ jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/ Date: Wed, 07 Sep 2011 17:08:17 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110907170817.3601E23888E7@eris.apache.org> Author: mduerig Date: Wed Sep 7 17:08:16 2011 New Revision: 1166266 URL: http://svn.apache.org/viewvc?rev=1166266&view=rev Log: Microkernel based Jackrabbit prototype (WIP) minor refactor of observation Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/AbstractNodeType.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SessionState.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/AbstractNodeType.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/AbstractNodeType.java?rev=1166266&r1=1166265&r2=1166266&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/AbstractNodeType.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/AbstractNodeType.java Wed Sep 7 17:08:16 2011 @@ -39,9 +39,6 @@ import java.util.ArrayList; /** * {@code AbstractNodeType}... */ -/** - * {@code AbstractNodeType}... - */ public abstract class AbstractNodeType implements NodeType { /** Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SessionState.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SessionState.java?rev=1166266&r1=1166265&r2=1166266&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SessionState.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SessionState.java Wed Sep 7 17:08:16 2011 @@ -51,6 +51,16 @@ public class SessionState { } /** + * The initial revision from when the session was created + * @return + */ + public String getInitialRevision() { + synchronized (commitLog) { + return commitLog.get(commitLog.size() - 1); + } + } + + /** * Snapshot of this session state's commit log at the time of the call * @return */ @@ -61,4 +71,14 @@ public class SessionState { } return commitLog; } + + /** + * Determines whether the given {@code revisionId} was committed by this session. + * That is, whether the commit log of this instance contains the given revisionId. + * @param revisionId + * @return + */ + public boolean hasRevision(String revisionId) { + return getCommitLog().contains(revisionId); + } } Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java?rev=1166266&r1=1166265&r2=1166266&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java Wed Sep 7 17:08:16 2011 @@ -237,8 +237,7 @@ public class SubscriptionImpl implements public EventSource(EventFilter[] eventFilters, SessionState sessionState) { this.eventFilters = eventFilters; - List commitLog = sessionState.getCommitLog(); - startRevision = commitLog.get(commitLog.size() - 1); + startRevision = sessionState.getInitialRevision(); } public EventSource(EventFilter[] eventFilters, String startRevision) { @@ -309,9 +308,7 @@ public class SubscriptionImpl implements .setUserData(commitMessage.getUserData()); Collection events = getEvents(changes, eventTemplate); - - // todo performance: this does a linear search on the list - boolean isLocal = sessionState.getCommitLog().contains(revisionId); + boolean isLocal = sessionState.hasRevision(revisionId); // events.filter(event => eventFilters.any(_.accept(event, isLocal)) for (Iterator it = events.iterator(); it.hasNext(); ) {