You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/08/19 23:17:23 UTC
[3/3] usergrid git commit: Merge branch 'hotfix-20160819'
Merge branch 'hotfix-20160819'
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d2061dc3
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d2061dc3
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d2061dc3
Branch: refs/heads/master
Commit: d2061dc3d1e0f6b279415fc0b09fac209323ca8a
Parents: 80e9f37 b5ed32a
Author: Michael Russo <mr...@apigee.com>
Authored: Fri Aug 19 13:49:34 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Fri Aug 19 13:49:34 2016 -0700
----------------------------------------------------------------------
.../mq/cassandra/io/AbstractSearch.java | 8 +++---
.../impl/shard/impl/NodeShardCacheImpl.java | 26 +++++++++++---------
.../usergrid/persistence/queue/QueueFig.java | 8 +++---
.../queue/impl/SNSQueueManagerImpl.java | 14 ++++++++---
.../rest/applications/ServiceResource.java | 7 +++++-
5 files changed, 40 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d2061dc3/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/NodeShardCacheImpl.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/NodeShardCacheImpl.java
index ee9602c,0a259f0..30beaf9
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/NodeShardCacheImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/NodeShardCacheImpl.java
@@@ -201,15 -201,15 +201,17 @@@ public class NodeShardCacheImpl impleme
this.graphs = CacheBuilder.newBuilder()
- //we want to asynchronously load new values for existing ones, that way we wont' have to
- //wait for a trip to cassandra
- .refreshAfterWrite( graphFig.getShardCacheTimeout(), TimeUnit.MILLISECONDS )
+ //we want to asynchronously load new values for existing ones, that way we wont' have to
+ //wait for a trip to cassandra
+ .refreshAfterWrite( graphFig.getShardCacheTimeout(), TimeUnit.MILLISECONDS )
- //set a static cache entry size here
- .maximumSize(graphFig.getShardCacheSize())
+
- //set our shard loader
- .build( new ShardCacheLoader() );
+ //set a static cache entry size here
+ .maximumSize(graphFig.getShardCacheSize())
+
+ //set our shard loader
+ .build( new ShardCacheLoader() );
++
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d2061dc3/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
----------------------------------------------------------------------