usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mru...@apache.org
Subject [1/2] usergrid git commit: Remove call to .duplicate on the BB in serialization classes and lower number of database connections on collection tests.
Date Mon, 23 Jan 2017 21:19:42 GMT
Repository: usergrid
Updated Branches:
  refs/heads/master 2fe81cd58 -> 2f25e9ce9


Remove call to .duplicate on the BB in serialization classes and lower number of database
connections on collection tests.


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

Branch: refs/heads/master
Commit: 9f63dccbcc4c17da1871f349d018243639ae0920
Parents: 2fe81cd
Author: Michael Russo <mrusso@apigee.com>
Authored: Mon Jan 23 13:18:05 2017 -0800
Committer: Michael Russo <mrusso@apigee.com>
Committed: Mon Jan 23 13:18:05 2017 -0800

----------------------------------------------------------------------
 .../persistence/cache/impl/ScopedCacheSerializationImpl.java | 2 +-
 .../impl/UniqueValueSerializationStrategyV1Impl.java         | 8 ++++----
 .../impl/UniqueValueSerializationStrategyV2Impl.java         | 8 ++++----
 .../collection/src/test/resources/usergrid-UNIT.properties   | 3 ++-
 .../usergrid/persistence/map/impl/MapSerializationImpl.java  | 2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/9f63dccb/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java
b/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java
index e2574c1..2ffa89f 100644
--- a/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java
+++ b/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java
@@ -335,7 +335,7 @@ public class ScopedCacheSerializationImpl<K,V> implements ScopedCacheSerializati
 
         }
         stuff.flip();
-        return stuff.duplicate();
+        return stuff;
 
     }
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/9f63dccb/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV1Impl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV1Impl.java
b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV1Impl.java
index ba3fcb0..b53f125 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV1Impl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV1Impl.java
@@ -268,7 +268,7 @@ public class UniqueValueSerializationStrategyV1Impl  extends
         }
 
         stuff.flip();
-        return stuff.duplicate();
+        return stuff;
 
     }
 
@@ -350,7 +350,7 @@ public class UniqueValueSerializationStrategyV1Impl  extends
         }
 
         stuff.flip();
-        return stuff.duplicate();
+        return stuff;
 
     }
 
@@ -499,7 +499,7 @@ public class UniqueValueSerializationStrategyV1Impl  extends
 
         }
         stuff.flip();
-        return stuff.duplicate();
+        return stuff;
 
     }
 
@@ -544,7 +544,7 @@ public class UniqueValueSerializationStrategyV1Impl  extends
 
         }
         stuff.flip();
-        return stuff.duplicate();
+        return stuff;
 
     }
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/9f63dccb/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV2Impl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV2Impl.java
b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV2Impl.java
index aeb1720..0f6aef1 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV2Impl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV2Impl.java
@@ -254,7 +254,7 @@ public class UniqueValueSerializationStrategyV2Impl  extends UniqueValueSerializ
         }
 
         stuff.flip();
-        return stuff.duplicate();
+        return stuff;
 
     }
 
@@ -339,7 +339,7 @@ public class UniqueValueSerializationStrategyV2Impl  extends UniqueValueSerializ
         }
 
         stuff.flip();
-        return stuff.duplicate();
+        return stuff;
 
     }
 
@@ -474,7 +474,7 @@ public class UniqueValueSerializationStrategyV2Impl  extends UniqueValueSerializ
 
         }
         stuff.flip();
-        return stuff.duplicate();
+        return stuff;
 
     }
 
@@ -507,7 +507,7 @@ public class UniqueValueSerializationStrategyV2Impl  extends UniqueValueSerializ
 
         }
         stuff.flip();
-        return stuff.duplicate();
+        return stuff;
 
     }
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/9f63dccb/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
b/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
index ec8a4a2..82bea14 100644
--- a/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
+++ b/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
@@ -18,7 +18,8 @@
 #
 
 # Keep nothing but overriding test defaults in here
-cassandra.connections=15
+# purposely setting connections lower to slow down the activity on the cassandra server locally
+cassandra.connections=5
 cassandra.timeout.pool=60000
 cassandra.port=9160
 cassandra.hosts=localhost

http://git-wip-us.apache.org/repos/asf/usergrid/blob/9f63dccb/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/impl/MapSerializationImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/impl/MapSerializationImpl.java
b/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/impl/MapSerializationImpl.java
index ab6087d..26a1890 100644
--- a/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/impl/MapSerializationImpl.java
+++ b/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/impl/MapSerializationImpl.java
@@ -498,7 +498,7 @@ public class MapSerializationImpl implements MapSerialization {
 
         }
         stuff.flip();
-        return stuff.duplicate();
+        return stuff;
 
     }
 


Mime
View raw message