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/03/22 23:20:45 UTC
[1/2] git commit: Dependency and other cleanup.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o a705630f6 -> c4f9d0f20
Dependency and other cleanup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e1b4cffa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e1b4cffa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e1b4cffa
Branch: refs/heads/two-dot-o
Commit: e1b4cffafaa6f8350cff78885c47e977f9e14cba
Parents: 9d6ed41
Author: Dave Johnson <dm...@apigee.com>
Authored: Sat Mar 22 18:15:51 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Sat Mar 22 18:15:51 2014 -0400
----------------------------------------------------------------------
stack/corepersistence/perftest1/pom.xml | 9 ++---
.../persistence/Usergrid1PerformanceTest.java | 36 +++++++++++---------
2 files changed, 22 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e1b4cffa/stack/corepersistence/perftest1/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/perftest1/pom.xml b/stack/corepersistence/perftest1/pom.xml
index 0e380b1..0307bde 100644
--- a/stack/corepersistence/perftest1/pom.xml
+++ b/stack/corepersistence/perftest1/pom.xml
@@ -31,11 +31,6 @@
</dependency>
<dependency>
- <artifactId>groovy-all</artifactId>
- <groupId>org.codehaus.groovy</groupId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid-tools</artifactId>
<version>0.0.29-SNAPSHOT</version>
@@ -49,7 +44,7 @@
<build>
<plugins>
- <plugin>
+<!-- <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<dependencies>
@@ -69,7 +64,7 @@
<groupId>org.codehaus.groovy</groupId>
<version>2.6.0-01</version>
<extensions>true</extensions>
- </plugin>
+ </plugin>-->
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e1b4cffa/stack/corepersistence/perftest1/src/test/java/org/apache/usergrid/persistence/Usergrid1PerformanceTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/perftest1/src/test/java/org/apache/usergrid/persistence/Usergrid1PerformanceTest.java b/stack/corepersistence/perftest1/src/test/java/org/apache/usergrid/persistence/Usergrid1PerformanceTest.java
index a818199..7aee702 100644
--- a/stack/corepersistence/perftest1/src/test/java/org/apache/usergrid/persistence/Usergrid1PerformanceTest.java
+++ b/stack/corepersistence/perftest1/src/test/java/org/apache/usergrid/persistence/Usergrid1PerformanceTest.java
@@ -36,8 +36,8 @@ import org.slf4j.LoggerFactory;
/**
* TODO: make configurable, add CHOP markup.
*/
-public class Usegrid1PerformanceTest {
- private static final Logger log = LoggerFactory.getLogger(Usegrid1PerformanceTest.class);
+public class Usergrid1PerformanceTest {
+ private static final Logger log = LoggerFactory.getLogger(Usergrid1PerformanceTest.class);
// max entities we will write and read
static int maxEntities = Integer.MAX_VALUE;
@@ -53,7 +53,7 @@ public class Usegrid1PerformanceTest {
private final EntityManagerFactory emf;
- public Usegrid1PerformanceTest() throws Throwable {
+ public Usergrid1PerformanceTest() throws Throwable {
emf = UsergridBootstrap.newInstance().getBean( EntityManagerFactory.class );
}
@@ -66,13 +66,13 @@ public class Usegrid1PerformanceTest {
@Test
public void loadAndReadData() throws Exception {
- log.info("Start Data Load");
+ log("Start Data Load");
List<UUID> apps = loadData();
- log.info("Finish Data Load");
+ log("Finish Data Load");
- log.info("Start Data Read");
+ log("Start Data Read");
readData( apps );
- log.info("Finish Data Read");
+ log("Finish Data Read");
runSelectedQueries( apps );
@@ -167,13 +167,13 @@ public class Usegrid1PerformanceTest {
results = em.searchCollection( em.getApplicationRef(), "reviews", query );
} catch (Exception ex) {
log.error("Error on search, aborting", ex);
- log.info("Read {} reviews in {}", count, appId );
+ log( String.format("Read %d reviews in %s", count, appId) );
return;
}
results.getEntities(); // cause retrieval from Cassanda;
count += results.size();
- log.info("Read {} reviews in {}", count, appId );
+ log( String.format("Read %d reviews in %s", count, appId.toString()) );
}
}
}
@@ -223,8 +223,8 @@ public class Usegrid1PerformanceTest {
Entity entity = em.create("review", currentEntityMap );
if ( maxEntities < 20 ) {
- log.info("Index written for {}", entity.getUuid());
- log.info("---");
+ log( String.format("Index written for %s", entity.getUuid().toString()));
+ log("---");
}
// create the next entity
@@ -232,7 +232,7 @@ public class Usegrid1PerformanceTest {
count++;
if (count % 100000 == 0) {
- log.info("Indexed {} reviews in {}", count, appId );
+ log( String.format("Indexed %d reviews in %s", count, appId.toString()) );
}
continue;
}
@@ -242,7 +242,7 @@ public class Usegrid1PerformanceTest {
String value = s.substring( s.indexOf(":") + 1 ).trim();
if ( maxEntities < 20 ) {
- log.info("Indexing {} = {}", name, value);
+ log( String.format("Indexing %s = %s", name, value));
}
if ( NumberUtils.isNumber(value) && value.contains(".")) {
@@ -256,7 +256,7 @@ public class Usegrid1PerformanceTest {
}
} catch ( Exception e ) {
- log.info("Error on line " + count);
+ log("Error on line " + count);
}
}
@@ -293,10 +293,14 @@ public class Usegrid1PerformanceTest {
}
}
- public static void query( EntityManager em, String query ) throws Exception {
+ public void query( EntityManager em, String query ) throws Exception {
Query q = Query.fromQL(query) ;
Results results = em.searchCollection( em.getApplicationRef(), "reviews", q );
- log.info("size = {} returned from query {}",results.size(), q.getQl() );
+ log( String.format("size = %d returned from query %s", results.size(), q.getQl()) );
}
+ private void log( String s ) {
+ //log.info(s);
+ System.out.println( System.currentTimeMillis() + ": " + s );
+ }
}
[2/2] git commit: Merge branch 'two-dot-o' of
https://github.com/usergrid/usergrid into two-dot-o
Posted by sn...@apache.org.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c4f9d0f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c4f9d0f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c4f9d0f2
Branch: refs/heads/two-dot-o
Commit: c4f9d0f20ee4c342f7fec643f4eca35d2c384518
Parents: e1b4cff a705630
Author: Dave Johnson <dm...@apigee.com>
Authored: Sat Mar 22 18:16:08 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Sat Mar 22 18:16:08 2014 -0400
----------------------------------------------------------------------
.../src/main/groovy/wait_for_instances.groovy | 2 +-
.../graph/consistency/AsyncProcessor.java | 14 +-
.../graph/consistency/AsyncProcessorImpl.java | 94 ++++++-
.../graph/consistency/TimeService.java | 33 +++
.../persistence/graph/guice/GraphModule.java | 7 +-
.../graph/consistency/AsyncProcessorTest.java | 273 +++++++++++++++++++
6 files changed, 409 insertions(+), 14 deletions(-)
----------------------------------------------------------------------