You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/05/12 19:43:25 UTC
[1/2] incubator-usergrid git commit: Merge branch 'two-dot-o-dev'
into USERGRID-641
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev 30e0e45af -> bc3cafb00
Merge branch 'two-dot-o-dev' into USERGRID-641
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9995576a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9995576a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9995576a
Branch: refs/heads/two-dot-o-dev
Commit: 9995576a5cc11d5d5931c22f7bd2cb0715ac8d46
Parents: cf8b551 30e0e45
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon May 11 09:46:16 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon May 11 09:46:16 2015 -0700
----------------------------------------------------------------------
.../usergrid/corepersistence/CoreModule.java | 31 +-
.../corepersistence/CpEntityManager.java | 2 +-
.../corepersistence/CpEntityManagerFactory.java | 2 +-
.../corepersistence/CpRelationManager.java | 4 +-
.../asyncevents/AsyncIndexProvider.java | 8 +-
.../asyncevents/EventBuilder.java | 105 +++
.../asyncevents/EventBuilderImpl.java | 154 ++++
.../asyncevents/InMemoryAsyncEventService.java | 59 +-
.../events/EntityDeletedHandler.java | 81 ---
.../events/EntityVersionCreatedHandler.java | 83 ---
.../events/EntityVersionDeletedHandler.java | 142 ----
.../migration/AppInfoMigrationPlugin.java | 3 +-
.../index/InMemoryAsycIndexServiceTest.java | 5 +-
.../collection/EntityCollectionManager.java | 20 +-
.../cache/CachedEntityCollectionManager.java | 18 +-
.../collection/event/EntityDeleted.java | 45 --
.../collection/event/EntityVersionCreated.java | 39 -
.../collection/event/EntityVersionDeleted.java | 46 --
.../collection/guice/CollectionModule.java | 39 -
.../EntityCollectionManagerFactoryImpl.java | 39 +-
.../impl/EntityCollectionManagerImpl.java | 386 ++++------
.../collection/impl/EntityDeletedTask.java | 137 ----
.../impl/EntityVersionCleanupTask.java | 247 -------
.../impl/EntityVersionCreatedTask.java | 115 ---
.../impl/EntityVersionTaskFactory.java | 60 --
.../mvcc/stage/delete/UniqueCleanup.java | 133 ++++
.../mvcc/stage/delete/VersionCompact.java | 125 ++++
.../MvccLogEntrySerializationStrategy.java | 14 +
.../serialization/SerializationFig.java | 30 +-
.../serialization/impl/LogEntryIterator.java | 114 ---
.../impl/MinMaxLogEntryIterator.java | 121 ++++
.../MvccEntitySerializationStrategyV3Impl.java | 39 +-
.../MvccLogEntrySerializationProxyImpl.java | 14 +
.../MvccLogEntrySerializationStrategyImpl.java | 83 ++-
.../migration/MvccEntityDataMigrationImpl.java | 30 +-
.../collection/EntityCollectionManagerIT.java | 216 ++++--
.../impl/EntityVersionCleanupTaskTest.java | 715 -------------------
.../impl/EntityVersionCreatedTaskTest.java | 241 -------
.../mvcc/stage/delete/UniqueCleanupTest.java | 712 ++++++++++++++++++
.../mvcc/stage/delete/VersionCompactTest.java | 238 ++++++
.../impl/LogEntryIteratorTest.java | 132 ----
.../impl/MinMaxLogEntryIteratorTest.java | 131 ++++
...MvccEntitySerializationStrategyImplTest.java | 2 +-
...ccLogEntrySerializationStrategyImplTest.java | 132 +++-
.../collection/util/LogEntryMock.java | 103 +--
.../src/test/resources/log4j.properties | 1 +
.../core/executor/TaskExecutorFactory.java | 95 +++
.../persistence/core/rx/RxTaskScheduler.java | 2 -
.../core/task/NamedTaskExecutorImpl.java | 286 --------
.../usergrid/persistence/core/task/Task.java | 48 --
.../persistence/core/task/TaskExecutor.java | 41 --
.../core/task/NamedTaskExecutorImplTest.java | 271 -------
.../usergrid/persistence/graph/GraphFig.java | 26 +-
.../persistence/graph/GraphManager.java | 33 +-
.../persistence/graph/GraphManagerFactory.java | 2 +-
.../usergrid/persistence/graph/MarkedEdge.java | 8 +-
.../persistence/graph/SearchByEdge.java | 6 +
.../persistence/graph/SearchByEdgeType.java | 6 +
.../persistence/graph/guice/GraphModule.java | 11 -
.../graph/impl/GraphManagerImpl.java | 657 ++++++-----------
.../graph/impl/SimpleMarkedEdge.java | 3 +
.../graph/impl/SimpleSearchByEdge.java | 40 +-
.../graph/impl/SimpleSearchByEdgeType.java | 29 +-
.../graph/impl/SimpleSearchByIdType.java | 8 +
.../graph/impl/stage/EdgeDeleteListener.java | 2 +-
.../impl/stage/EdgeDeleteListenerImpl.java | 31 +-
.../graph/impl/stage/EdgeMetaRepair.java | 6 +-
.../graph/impl/stage/EdgeMetaRepairImpl.java | 196 +++--
.../graph/impl/stage/NodeDeleteListener.java | 2 +-
.../shard/impl/ShardGroupCompactionImpl.java | 90 ++-
.../graph/CommittedGraphManagerIT.java | 135 ----
.../persistence/graph/GraphManagerIT.java | 699 ++++++++++++++----
.../graph/StorageGraphManagerIT.java | 240 -------
.../impl/shard/ShardGroupCompactionTest.java | 6 +-
.../graph/test/util/EdgeTestUtils.java | 27 +
75 files changed, 3598 insertions(+), 4604 deletions(-)
----------------------------------------------------------------------
[2/2] incubator-usergrid git commit: remove optional args
Posted by sf...@apache.org.
remove optional args
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/bc3cafb0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bc3cafb0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bc3cafb0
Branch: refs/heads/two-dot-o-dev
Commit: bc3cafb00fcf8eda2ec314132906d3e4df5c7dd1
Parents: 9995576
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon May 11 10:37:08 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon May 11 10:37:08 2015 -0700
----------------------------------------------------------------------
.../usergrid/corepersistence/CpRelationManager.java | 4 ++--
.../java/org/apache/usergrid/persistence/Query.java | 13 ++++---------
.../usergrid/services/AbstractCollectionService.java | 4 ++--
.../org/apache/usergrid/services/ServiceRequest.java | 2 +-
4 files changed, 9 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bc3cafb0/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
index 7082a26..fb66b97 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
@@ -627,7 +627,7 @@ public class CpRelationManager implements RelationManager {
//set our fields applicable to both operations
readPipelineBuilder.withCursor(query.getCursor());
- readPipelineBuilder.withLimit(query.getLimit());
+ readPipelineBuilder.withLimit( Optional.of( query.getLimit() ));
//TODO, this should be removed when the CP relation manager is removed
readPipelineBuilder.setStartId( cpHeadEntity.getId() );
@@ -928,7 +928,7 @@ public class CpRelationManager implements RelationManager {
//set our fields applicable to both operations
readPipelineBuilder
.withCursor(query.getCursor())
- .withLimit(query.getLimit())
+ .withLimit(Optional.of(query.getLimit()))
//TODO, this should be removed when the CP relation manager is removed
.setStartId( cpHeadEntity.getId() );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bc3cafb0/stack/core/src/main/java/org/apache/usergrid/persistence/Query.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/Query.java b/stack/core/src/main/java/org/apache/usergrid/persistence/Query.java
index 16f3ed0..4b655bd 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/Query.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/Query.java
@@ -522,21 +522,16 @@ public class Query {
}
- public Optional<Integer> getLimit() {
+ public int getLimit() {
return getLimit( DEFAULT_LIMIT );
}
- public Optional<Integer> getLimit( int defaultLimit ) {
+ public int getLimit( int defaultLimit ) {
if ( limit <= 0 ) {
- if ( defaultLimit > 0 ) {
- return Optional.of( defaultLimit);
- }
- else {
- return Optional.of( DEFAULT_LIMIT );
- }
+ return defaultLimit > 0 ? defaultLimit : DEFAULT_LIMIT;
}
- return Optional.of( limit );
+ return limit;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bc3cafb0/stack/services/src/main/java/org/apache/usergrid/services/AbstractCollectionService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/AbstractCollectionService.java b/stack/services/src/main/java/org/apache/usergrid/services/AbstractCollectionService.java
index ffb1d65..b84598d 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/AbstractCollectionService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/AbstractCollectionService.java
@@ -200,7 +200,7 @@ public class AbstractCollectionService extends AbstractService {
query = new Query( query );
query.setResultsLevel( level );
- query.setLimit( query.getLimit( count ).get() );
+ query.setLimit( query.getLimit( count ) );
if ( !query.isReversedSet() ) {
query.setReversed( isCollectionReversed( context ) );
@@ -507,7 +507,7 @@ public class AbstractCollectionService extends AbstractService {
query = new Query( query );
query.setResultsLevel( Level.ALL_PROPERTIES );
- query.setLimit( query.getLimit().get() );
+ query.setLimit( query.getLimit() );
if ( !query.isReversedSet() ) {
query.setReversed( isCollectionReversed( context ) );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bc3cafb0/stack/services/src/main/java/org/apache/usergrid/services/ServiceRequest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/ServiceRequest.java b/stack/services/src/main/java/org/apache/usergrid/services/ServiceRequest.java
index a122004..90c3b7e 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/ServiceRequest.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/ServiceRequest.java
@@ -325,7 +325,7 @@ public class ServiceRequest {
}
has_prev_param = true;
}
- int limit = p.getQuery().getLimit().get();
+ int limit = p.getQuery().getLimit();
if ( limit != Query.DEFAULT_LIMIT ) {
if ( has_prev_param ) {
sb.append( '&' );