You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2008/04/17 17:57:37 UTC
svn commit: r649156 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src:
main/java/org/apache/cayenne/cache/ main/java/org/apache/cayenne/util/
test/java/org/apache/cayenne/ test/java/org/apache/cayenne/access/
Author: aadamchik
Date: Thu Apr 17 08:57:20 2008
New Revision: 649156
URL: http://svn.apache.org/viewvc?rev=649156&view=rev
Log:
CAY-1019 Streamlining LOCAL_CACHE handling
(part 1 - local cache is really local)
Added:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheTest.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectContextQueryAction.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java?rev=649156&r1=649155&r2=649156&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java Thu Apr 17 08:57:20 2008
@@ -59,6 +59,14 @@
}
/**
+ * Returns the actual implementation of the query cache that is wrapped by this
+ * NestedQueryCache.
+ */
+ public QueryCache getDelegate() {
+ return delegate;
+ }
+
+ /**
* Clears the underlying shared cache.
*/
public void clear() {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectContextQueryAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectContextQueryAction.java?rev=649156&r1=649155&r2=649156&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectContextQueryAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ObjectContextQueryAction.java Thu Apr 17 08:57:20 2008
@@ -56,6 +56,7 @@
protected ObjectContext actingContext;
protected Query query;
protected QueryMetadata metadata;
+ protected boolean queryOriginator;
protected transient QueryResponse response;
@@ -65,6 +66,12 @@
this.actingContext = actingContext;
this.query = query;
+ // this means that a caller must pass self as both acting context and target
+ // context to indicate that a query originated here... null (ROP) or differing
+ // context indicates that the query was originated elsewhere, which has
+ // consequences in LOCAL_CACHE handling
+ this.queryOriginator = targetContext != null && targetContext == actingContext;
+
// no special target context and same target context as acting context mean the
// same thing. "normalize" the internal state to avoid confusion
this.targetContext = targetContext != actingContext ? targetContext : null;
@@ -243,6 +250,11 @@
protected boolean interceptLocalCache() {
if (metadata.getCacheKey() == null) {
+ return !DONE;
+ }
+
+ // ignore local cache unless this context originated the query...
+ if (!queryOriginator) {
return !DONE;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java?rev=649156&r1=649155&r2=649156&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/CayenneContextWithDataContextTest.java Thu Apr 17 08:57:20 2008
@@ -22,10 +22,13 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.art.Artist;
import org.apache.cayenne.access.ClientServerChannel;
+import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.map.LifecycleEvent;
import org.apache.cayenne.query.ObjectIdQuery;
+import org.apache.cayenne.query.QueryMetadata;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.reflect.LifecycleCallbackRegistry;
import org.apache.cayenne.remote.ClientChannel;
@@ -49,6 +52,31 @@
return CayenneResources.getResources().getAccessStack(MULTI_TIER_ACCESS_STACK);
}
+ public void testLocalCacheStaysLocal() {
+
+ DataContext context = createDataContext();
+ ClientServerChannel clientServerChannel = new ClientServerChannel(context);
+ UnitLocalConnection connection = new UnitLocalConnection(
+ clientServerChannel,
+ LocalConnection.HESSIAN_SERIALIZATION);
+ ClientChannel channel = new ClientChannel(connection);
+ CayenneContext clientContext = new CayenneContext(channel);
+
+ SelectQuery query = new SelectQuery(ClientMtTable1.class);
+ query.setCachePolicy(QueryMetadata.LOCAL_CACHE);
+
+ assertEquals(0, clientContext.getQueryCache().size());
+ assertEquals(0, context.getQueryCache().size());
+
+ List<?> results = clientContext.performQuery(query);
+
+ assertEquals(1, clientContext.getQueryCache().size());
+ assertSame(results, clientContext.getQueryCache().get(
+ query.getMetaData(clientContext.getEntityResolver())));
+
+ assertEquals(0, context.getQueryCache().size());
+ }
+
public void testPrePersistCallback() throws Exception {
ClientServerChannel csChannel = new ClientServerChannel(getDomain());
@@ -192,8 +220,7 @@
CayenneContext context = new CayenneContext(channel);
- ClientMtTable1 object = context
- .newObject(ClientMtTable1.class);
+ ClientMtTable1 object = context.newObject(ClientMtTable1.class);
assertFalse(flag[0]);
context.commitChanges();
@@ -249,12 +276,10 @@
CayenneContext context = new CayenneContext(channel);
- ClientMtReflexive o1 = context
- .newObject(ClientMtReflexive.class);
+ ClientMtReflexive o1 = context.newObject(ClientMtReflexive.class);
o1.setName("parent");
- ClientMtReflexive o2 = context
- .newObject(ClientMtReflexive.class);
+ ClientMtReflexive o2 = context.newObject(ClientMtReflexive.class);
o2.setName("child");
o2.setToParent(o1);
context.commitChanges();
Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheTest.java?rev=649156&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheTest.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheTest.java Thu Apr 17 08:57:20 2008
@@ -0,0 +1,57 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+package org.apache.cayenne.access;
+
+import java.util.List;
+
+import org.apache.art.Artist;
+import org.apache.cayenne.query.QueryMetadata;
+import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.unit.CayenneCase;
+
+public class NestedDataContextLocalCacheTest extends CayenneCase {
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ deleteTestData();
+ }
+
+ public void testLocalCacheStaysLocal() {
+
+ SelectQuery query = new SelectQuery(Artist.class);
+ query.setCachePolicy(QueryMetadata.LOCAL_CACHE);
+
+ DataContext context = createDataContext();
+ DataContext child1 = context.createChildDataContext();
+
+ assertNull(child1.getQueryCache().get(
+ query.getMetaData(child1.getEntityResolver())));
+
+ assertNull(context.getQueryCache().get(
+ query.getMetaData(context.getEntityResolver())));
+
+ List<?> results = child1.performQuery(query);
+ assertSame(results, child1.getQueryCache().get(
+ query.getMetaData(child1.getEntityResolver())));
+
+ assertNull(context.getQueryCache().get(
+ query.getMetaData(context.getEntityResolver())));
+ }
+}