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/04/07 22:22:08 UTC
[17/28] git commit: Merge branch 'two-dot-o' of
https://github.com/usergrid/usergrid into binary_serialization
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization
# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
Fixes to CorePersistenceIT and index impl.
Conflicts:
stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/50347dd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/50347dd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/50347dd1
Branch: refs/heads/two-dot-o
Commit: 50347dd13a45b5da64248e384780d93613f48a66
Parents: fc2bf68 6b7ffbe
Author: grey <gr...@apigee.com>
Authored: Thu Mar 20 10:29:37 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Thu Mar 20 10:29:37 2014 -0700
----------------------------------------------------------------------
.../index/impl/EsEntityCollectionIndex.java | 12 ++++---
.../index/impl/CorePerformanceIT.java | 38 +++++++++++---------
2 files changed, 29 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/50347dd1/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/50347dd1/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/CorePerformanceIT.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/CorePerformanceIT.java
index b368b92,0008304..59bde56
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/CorePerformanceIT.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/CorePerformanceIT.java
@@@ -17,9 -17,9 +17,6 @@@
*/
package org.apache.usergrid.persistence.index.impl;
--import com.google.inject.Guice;
--import com.google.inject.Injector;
--import com.netflix.config.ConfigurationManager;
import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.FileReader;
@@@ -27,7 -27,7 +24,14 @@@ import java.io.IOException
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
++
++import org.junit.Ignore;
++import org.junit.Test;
++import org.slf4j.Logger;
++import org.slf4j.LoggerFactory;
++
import org.apache.commons.lang3.math.NumberUtils;
++
import org.apache.usergrid.persistence.collection.CollectionScope;
import org.apache.usergrid.persistence.collection.EntityCollectionManager;
import org.apache.usergrid.persistence.collection.EntityCollectionManagerFactory;
@@@ -44,10 -44,10 +48,10 @@@ import org.apache.usergrid.persistence.
import org.apache.usergrid.persistence.model.util.UUIDGenerator;
import org.apache.usergrid.persistence.query.Query;
import org.apache.usergrid.persistence.query.Results;
--import org.junit.Ignore;
--import org.junit.Test;
--import org.slf4j.Logger;
--import org.slf4j.LoggerFactory;
++
++import com.google.inject.Guice;
++import com.google.inject.Injector;
++import com.netflix.config.ConfigurationManager;
/**