Repository: usergrid
Updated Branches:
  refs/heads/2.1-release 67c0bfa10 -> 39ccdb191


Changes cache options to be more sensible defaults


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/39ccdb19
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/39ccdb19
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/39ccdb19

Branch: refs/heads/2.1-release
Commit: 39ccdb191845a58b82de2cd001a62bb2e37c12be
Parents: 67c0bfa
Author: Todd Nine <[email protected]>
Authored: Fri Nov 6 14:01:21 2015 -0700
Committer: Todd Nine <[email protected]>
Committed: Fri Nov 6 14:01:21 2015 -0700

----------------------------------------------------------------------
 .../graph/serialization/impl/shard/ShardedEdgeSerialization.java | 2 +-
 .../impl/shard/impl/SizebasedEdgeColumnFamilies.java             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/39ccdb19/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/ShardedEdgeSerialization.java
----------------------------------------------------------------------
diff --git 
a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/ShardedEdgeSerialization.java
 
b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/ShardedEdgeSerialization.java
index 51fdf0c..45d8a47 100644
--- 
a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/ShardedEdgeSerialization.java
+++ 
b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/ShardedEdgeSerialization.java
@@ -122,7 +122,7 @@ public interface ShardedEdgeSerialization {
             * @param markedEdge The edge to write
             * @param timestamp The timestamp to use
             */
-           MutationBatch deleteEdgeVersions( EdgeColumnFamilies 
columnFamilies, ApplicationScope scope, MarkedEdge markedEdge,
+    MutationBatch deleteEdgeVersions( EdgeColumnFamilies columnFamilies, 
ApplicationScope scope, MarkedEdge markedEdge,
                                               Collection<Shard> shards,  
DirectedEdgeMeta sourceEdgeMeta,  UUID timestamp );
 
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/39ccdb19/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/SizebasedEdgeColumnFamilies.java
----------------------------------------------------------------------
diff --git 
a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/SizebasedEdgeColumnFamilies.java
 
b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/SizebasedEdgeColumnFamilies.java
index 8f16448..f163ecd 100644
--- 
a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/SizebasedEdgeColumnFamilies.java
+++ 
b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/SizebasedEdgeColumnFamilies.java
@@ -140,7 +140,7 @@ public class SizebasedEdgeColumnFamilies implements 
EdgeColumnFamilies {
                         graphCf( TARGET_NODE_SOURCE_TYPE ),
                         new MultiTennantColumnFamilyDefinition( EDGE_VERSIONS, 
BytesType.class.getSimpleName(),
                                 ColumnTypes.LONG_TYPE_REVERSED, 
BytesType.class.getSimpleName(),
-                                
MultiTennantColumnFamilyDefinition.CacheOption.KEYS ) );
+                                
MultiTennantColumnFamilyDefinition.CacheOption.ALL ) );
     }
 
 
@@ -149,6 +149,6 @@ public class SizebasedEdgeColumnFamilies implements 
EdgeColumnFamilies {
      */
     private MultiTennantColumnFamilyDefinition graphCf( 
MultiTennantColumnFamily cf ) {
         return new MultiTennantColumnFamilyDefinition( cf, 
BytesType.class.getSimpleName(), EDGE_DYNAMIC_COMPOSITE_TYPE,
-                BytesType.class.getSimpleName(), 
MultiTennantColumnFamilyDefinition.CacheOption.KEYS );
+                BytesType.class.getSimpleName(), 
MultiTennantColumnFamilyDefinition.CacheOption.ALL );
     }
 }

Reply via email to