usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [21/50] [abbrv] incubator-usergrid git commit: Removed Hystrix for performance testing.
Date Thu, 19 Mar 2015 23:26:38 GMT
Removed Hystrix for performance testing.


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

Branch: refs/heads/USERGRID-480
Commit: 2e77c631683168befdf377283f0374576ab52a3a
Parents: e83caf2
Author: Todd Nine <tnine@apigee.com>
Authored: Wed Mar 4 19:21:10 2015 -0700
Committer: Todd Nine <tnine@apigee.com>
Committed: Wed Mar 4 19:21:10 2015 -0700

----------------------------------------------------------------------
 .../core/hystrix/HystrixCassandra.java          | 26 +++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e77c631/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/hystrix/HystrixCassandra.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/hystrix/HystrixCassandra.java
b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/hystrix/HystrixCassandra.java
index 7d5316f..76e0c2d 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/hystrix/HystrixCassandra.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/hystrix/HystrixCassandra.java
@@ -30,6 +30,8 @@ import com.netflix.hystrix.HystrixThreadPoolProperties;
 
 /**
  * A utility class that creates graph observables wrapped in Hystrix for timeouts and circuit
breakers.
+ *
+ * TODO USERGRId-405 restore this class before merge
  */
 public class HystrixCassandra {
 
@@ -55,18 +57,18 @@ public class HystrixCassandra {
      * Execute an user operation
      */
     public static <R> OperationResult<R> user( final Execution<R> execution)
{
-        return new HystrixCommand<OperationResult<R>>( USER_GROUP ) {
-
-            @Override
-            protected OperationResult<R> run() {
+//        return new HystrixCommand<OperationResult<R>>( USER_GROUP ) {
+//
+//            @Override
+//            protected OperationResult<R> run() {
                 try {
                     return  execution.execute();
                 }
                 catch ( ConnectionException e ) {
                     throw new RuntimeException( e );
                 }
-            }
-        }.execute();
+//            }
+//        }.execute();
     }
 
 
@@ -76,18 +78,18 @@ public class HystrixCassandra {
     public static <R> OperationResult<R> async( final Execution<R> execution)
{
 
 
-        return new HystrixCommand<OperationResult<R>>( ASYNC_GROUP ) {
-
-            @Override
-            protected OperationResult<R> run() {
+//        return new HystrixCommand<OperationResult<R>>( ASYNC_GROUP ) {
+//
+//            @Override
+//            protected OperationResult<R> run() {
                 try {
                     return  execution.execute();
                 }
                 catch ( ConnectionException e ) {
                     throw new RuntimeException( e );
                 }
-            }
-        }.execute();
+//            }
+//        }.execute();
     }
 
 


Mime
View raw message