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 2012/05/07 09:51:19 UTC
svn commit: r1334903 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src:
main/java/org/apache/cayenne/access/
main/java/org/apache/cayenne/configuration/server/
test/java/org/apache/cayenne/
Author: aadamchik
Date: Mon May 7 07:51:18 2012
New Revision: 1334903
URL: http://svn.apache.org/viewvc?rev=1334903&view=rev
Log:
CAY-1700 Split long DISJOINT_BY_ID prefetch query on several smaller queries
CAY-1700-typo.patch by Andrei Veprev
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/HierarchicalObjectResolver.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java?rev=1334903&r1=1334902&r2=1334903&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java Mon May 7 07:51:18 2012
@@ -108,7 +108,7 @@ class DataContextQueryAction extends Obj
DbEntity dbEntity = metadata.getDbEntity();
Integer maxIdQualifierSize = actingDataContext
.getParentDataDomain()
- .getMaxIdQualifierSite();
+ .getMaxIdQualifierSize();
List<?> paginatedList;
if (dbEntity != null && dbEntity.getPrimaryKeys().size() == 1) {
paginatedList = new SimpleIdIncrementalFaultList<Object>(
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java?rev=1334903&r1=1334902&r2=1334903&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java Mon May 7 07:51:18 2012
@@ -80,7 +80,7 @@ public class DataDomain implements Query
/**
* @since 3.1
*/
- protected int maxIdQualifierSite;
+ protected int maxIdQualifierSize;
/**
* @since 3.1
@@ -1058,19 +1058,19 @@ public class DataDomain implements Query
* Cayenne when processing paginated queries and DISJOINT_BY_ID prefetches and is
* intended to address database limitations on the size of SQL statements as well as
* to cap memory use in Cayenne when generating such queries. The default is 10000. It
- * can be changed either by calling {@link #setMaxIdQualifierSite(int)} or changing
+ * can be changed either by calling {@link #setMaxIdQualifierSize(int)} or changing
* the value for property {@link Constants#SERVER_MAX_ID_QUALIFIER_SIZE_PROPERTY}.
*
* @since 3.1
*/
- public int getMaxIdQualifierSite() {
- return maxIdQualifierSite;
+ public int getMaxIdQualifierSize() {
+ return maxIdQualifierSize;
}
/**
* @since 3.1
*/
- public void setMaxIdQualifierSite(int maxIdQualifierSite) {
- this.maxIdQualifierSite = maxIdQualifierSite;
+ public void setMaxIdQualifierSize(int maxIdQualifierSize) {
+ this.maxIdQualifierSize = maxIdQualifierSize;
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/HierarchicalObjectResolver.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/HierarchicalObjectResolver.java?rev=1334903&r1=1334902&r2=1334903&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/HierarchicalObjectResolver.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/HierarchicalObjectResolver.java Mon May 7 07:51:18 2012
@@ -170,7 +170,7 @@ class HierarchicalObjectResolver {
int maxIdQualifierSize = context
.getParentDataDomain()
- .getMaxIdQualifierSite();
+ .getMaxIdQualifierSize();
List<PrefetchSelectQuery> queries = new ArrayList<PrefetchSelectQuery>();
int qualifiersCount = 0;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java?rev=1334903&r1=1334902&r2=1334903&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java Mon May 7 07:51:18 2012
@@ -178,7 +178,7 @@ public class DataDomainProvider implemen
DataChannelDescriptor descriptor = descriptorMerger.merge(descriptors);
DataDomain dataDomain = createDataDomain(descriptor.getName());
- dataDomain.setMaxIdQualifierSite(runtimeProperties.getInt(
+ dataDomain.setMaxIdQualifierSize(runtimeProperties.getInt(
Constants.SERVER_MAX_ID_QUALIFIER_SIZE_PROPERTY,
-1));
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierTest.java?rev=1334903&r1=1334902&r2=1334903&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierTest.java Mon May 7 07:51:18 2012
@@ -59,7 +59,7 @@ public class DataContextMaxIdQualifierTe
tBox.insert(i + 1, i + 1, "box" + (i + 1));
}
- runtime.getDataDomain().setMaxIdQualifierSite(100);
+ runtime.getDataDomain().setMaxIdQualifierSize(100);
final SelectQuery query = new SelectQuery(Bag.class);
query.addPrefetch(Bag.BOXES_PROPERTY).setSemantics(
@@ -81,7 +81,7 @@ public class DataContextMaxIdQualifierTe
tBox.insert(i + 1, i + 1, "box" + (i + 1));
}
- runtime.getDataDomain().setMaxIdQualifierSite(0);
+ runtime.getDataDomain().setMaxIdQualifierSize(0);
final SelectQuery query = new SelectQuery(Bag.class);
query.addPrefetch(Bag.BOXES_PROPERTY).setSemantics(
@@ -103,7 +103,7 @@ public class DataContextMaxIdQualifierTe
tBox.insert(i + 1, i + 1, "box" + (i + 1));
}
- runtime.getDataDomain().setMaxIdQualifierSite(-1);
+ runtime.getDataDomain().setMaxIdQualifierSize(-1);
final SelectQuery query = new SelectQuery(Bag.class);
query.addPrefetch(Bag.BOXES_PROPERTY).setSemantics(
@@ -126,7 +126,7 @@ public class DataContextMaxIdQualifierTe
tBox.insert(i + 1, 1, "box" + (i + 1));
}
- runtime.getDataDomain().setMaxIdQualifierSite(50);
+ runtime.getDataDomain().setMaxIdQualifierSize(50);
final SelectQuery query = new SelectQuery(Box.class);
query.setPageSize(100);
@@ -160,7 +160,7 @@ public class DataContextMaxIdQualifierTe
tBox.insert(i + 1, 1, "box" + (i + 1));
}
- runtime.getDataDomain().setMaxIdQualifierSite(1001);
+ runtime.getDataDomain().setMaxIdQualifierSize(1001);
final SelectQuery query = new SelectQuery(Box.class);
query.setPageSize(100);
@@ -194,7 +194,7 @@ public class DataContextMaxIdQualifierTe
tBox.insert(i + 1, 1, "box" + (i + 1));
}
- runtime.getDataDomain().setMaxIdQualifierSite(0);
+ runtime.getDataDomain().setMaxIdQualifierSize(0);
final SelectQuery query = new SelectQuery(Box.class);
query.setPageSize(100);
@@ -216,7 +216,7 @@ public class DataContextMaxIdQualifierTe
tBox.insert(i + 1, 1, "box" + (i + 1));
}
- runtime.getDataDomain().setMaxIdQualifierSite(-1);
+ runtime.getDataDomain().setMaxIdQualifierSize(-1);
final SelectQuery query = new SelectQuery(Box.class);
query.setPageSize(100);