You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/01/30 16:20:51 UTC
[15/34] git commit: Fixes query processor size and test to work
correctly with the 1k defaults
Fixes query processor size and test to work correctly with the 1k defaults
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b05edcdf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b05edcdf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b05edcdf
Branch: refs/pull/39/merge
Commit: b05edcdfb26606965c886975d05e344ee590ab51
Parents: 8d4425d
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Jan 28 18:41:21 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Jan 28 18:41:21 2014 -0700
----------------------------------------------------------------------
.../org/usergrid/persistence/cassandra/QueryProcessor.java | 3 +--
.../usergrid/persistence/query/IntersectionUnionPagingIT.java | 6 ++++--
stack/core/src/test/resources/log4j.properties | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b05edcdf/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java
index 4389b79..5d9bbc8 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java
@@ -77,8 +77,7 @@ import static org.usergrid.persistence.Schema.getDefaultSchema;
public class QueryProcessor {
- private static final int PAGE_SIZE = 10;
-// private static final int PAGE_SIZE = 1000;
+ public static final int PAGE_SIZE = 1000;
private static final Logger logger = LoggerFactory.getLogger( QueryProcessor.class );
private static final Schema SCHEMA = getDefaultSchema();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b05edcdf/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java b/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java
index 76995b9..94fdc40 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java
@@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Results;
+import org.usergrid.persistence.cassandra.QueryProcessor;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -44,7 +45,8 @@ public class IntersectionUnionPagingIT extends AbstractIteratingQueryIT {
"select * where (field1Or > '00000000' OR field2Or > '00000000') AND fieldDate = '0000-00-00'";
private static final String scanUnion =
"select * where fieldDate = '0000-00-00' AND (field1Or > '00000000' OR field2Or > '00000000') ";
- private static final int PAGE_SIZE = 20;
+
+ private static final int PAGE_SIZE = 300;
@Test
@@ -77,7 +79,7 @@ public class IntersectionUnionPagingIT extends AbstractIteratingQueryIT {
private Set<String> performSetup( final IoHelper io ) throws Exception {
io.doSetup();
- int size = 40;
+ int size = ( int ) ( QueryProcessor.PAGE_SIZE*2.5);
long start = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b05edcdf/stack/core/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/stack/core/src/test/resources/log4j.properties b/stack/core/src/test/resources/log4j.properties
index 9282771..4c75404 100644
--- a/stack/core/src/test/resources/log4j.properties
+++ b/stack/core/src/test/resources/log4j.properties
@@ -18,7 +18,7 @@
# and the pattern to %c instead of %l. (%l is slower.)
# output messages into a rolling log file as well as stdout
-log4j.rootLogger=DEBUG,stdout
+log4j.rootLogger=INFO,stdout
# stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender