usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [41/50] [abbrv] git commit: Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into USERGRID-165_fix-exports-tests
Date Fri, 13 Jun 2014 18:54:20 GMT
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into USERGRID-165_fix-exports-tests

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Fix for remaining Core module tests and removing some redundant tests.

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.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/47012826
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/47012826
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/47012826

Branch: refs/pull/200/head
Commit: 47012826997e3625eaeda3bb5b7591c01723e394
Parents: df918f8 67290f9
Author: grey <greyes@apigee.com>
Authored: Thu Jun 12 12:41:35 2014 -0700
Committer: grey <greyes@apigee.com>
Committed: Thu Jun 12 12:41:35 2014 -0700

----------------------------------------------------------------------
 .../corepersistence/CpEntityManager.java        |  37 +-
 .../corepersistence/CpRelationManager.java      |   8 +-
 .../usergrid/ConcurrentCoreTestSuite.java       |   5 +-
 .../java/org/apache/usergrid/CoreTestSuite.java |   5 +-
 .../cassandra/QueryProcessorTest.java           |   5 +
 .../persistence/query/tree/GrammarTreeTest.java | 608 -------------------
 .../persistence/query/tree/LongLiteralTest.java |  63 --
 .../query/tree/StringLiteralTest.java           |  89 ---
 .../usergrid/persistence/graph/SimpleTest.java  |  82 +++
 .../index/impl/EsEntityIndexImpl.java           |   5 +-
 10 files changed, 122 insertions(+), 785 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/47012826/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index 8f91e72,be56160..c934c2d
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@@ -106,15 -51,22 +106,16 @@@ import me.prettyprint.hector.api.mutati
  import me.prettyprint.hector.api.query.MultigetSliceCounterQuery;
  import me.prettyprint.hector.api.query.QueryResult;
  import me.prettyprint.hector.api.query.SliceCounterQuery;
 +import rx.Observable;
 +
 +import static java.lang.String.CASE_INSENSITIVE_ORDER;
 +import static java.util.Arrays.asList;
 +
 +import static me.prettyprint.hector.api.factory.HFactory.createCounterSliceQuery;
 +import static me.prettyprint.hector.api.factory.HFactory.createMutator;
 +import static org.apache.commons.lang.StringUtils.capitalize;
  import static org.apache.commons.lang.StringUtils.isBlank;
+ import static org.apache.usergrid.corepersistence.CpRelationManager.ALL_TYPES;
 -import org.apache.usergrid.persistence.AggregateCounter;
 -import org.apache.usergrid.persistence.AggregateCounterSet;
 -import org.apache.usergrid.persistence.CollectionRef;
 -import org.apache.usergrid.persistence.ConnectedEntityRef;
 -import org.apache.usergrid.persistence.ConnectionRef;
 -import org.apache.usergrid.persistence.Entity;
 -import org.apache.usergrid.persistence.EntityFactory;
 -import org.apache.usergrid.persistence.EntityManager;
 -import org.apache.usergrid.persistence.EntityManagerFactory;
 -import org.apache.usergrid.persistence.EntityRef;
 -import org.apache.usergrid.persistence.IndexBucketLocator;
 -import org.apache.usergrid.persistence.RelationManager;
 -import org.apache.usergrid.persistence.Results;
 -import org.apache.usergrid.persistence.Schema;
  import static org.apache.usergrid.persistence.Schema.COLLECTION_ROLES;
  import static org.apache.usergrid.persistence.Schema.COLLECTION_USERS;
  import static org.apache.usergrid.persistence.Schema.DICTIONARY_PERMISSIONS;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/47012826/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
----------------------------------------------------------------------


Mime
View raw message