usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [36/50] git commit: Temp commit
Date Wed, 12 Feb 2014 13:21:44 GMT
Temp commit


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

Branch: refs/heads/optimistic-tx-semantics
Commit: b7e9969accd72dc00d4afd17a1de04ec6e186e62
Parents: df41a94
Author: Todd Nine <tnine@apigee.com>
Authored: Wed Feb 5 13:58:28 2014 -0700
Committer: Todd Nine <tnine@apigee.com>
Committed: Wed Feb 5 13:58:28 2014 -0700

----------------------------------------------------------------------
 stack/corepersistence/collection/pom.xml                    | 9 ++++++++-
 .../graph/serialization/impl/parse/ObservableIterator.java  | 5 +++--
 stack/corepersistence/pom.xml                               | 1 -
 3 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b7e9969a/stack/corepersistence/collection/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/pom.xml b/stack/corepersistence/collection/pom.xml
index 4555264..cfe5028 100644
--- a/stack/corepersistence/collection/pom.xml
+++ b/stack/corepersistence/collection/pom.xml
@@ -161,7 +161,14 @@
     <dependency>
       <groupId>com.netflix.rxjava</groupId>
       <artifactId>rxjava-core</artifactId>
-      <version>0.15.1</version>
+      <version>0.16.1</version>
+    </dependency>
+
+
+    <dependency>
+      <groupId>com.netflix.rxjava</groupId>
+      <artifactId>rxjava-contrib</artifactId>
+      <version>0.14.6</version>
     </dependency>
 
     <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b7e9969a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/parse/ObservableIterator.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/parse/ObservableIterator.java
b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/parse/ObservableIterator.java
index f820aa9..33efecc 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/parse/ObservableIterator.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/parse/ObservableIterator.java
@@ -10,8 +10,9 @@ import rx.subscriptions.Subscriptions;
 
 
 /**
- * Converts an iterator to an observable.  Subclasses need to only implement getting the
iterator from the data source
- * .
+ * Converts an iterator to an observable.  Subclasses need to only implement getting the
iterator from the data source.
+ * This is used in favor of "Observable.just" when the initial fetch of the iterator will
require I/O.  This allows
+ * us to wrap the iterator in a deferred invocation to avoid the blocking on construction.
  */
 public abstract class ObservableIterator<T> implements Observable.OnSubscribeFunc<T>
{
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b7e9969a/stack/corepersistence/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/pom.xml b/stack/corepersistence/pom.xml
index 4cc845a..3edbf56 100644
--- a/stack/corepersistence/pom.xml
+++ b/stack/corepersistence/pom.xml
@@ -20,7 +20,6 @@
     <archaius.version>0.5.12</archaius.version>
     <slf4j.version>1.7.2</slf4j.version>
     <log4j.version>1.2.17</log4j.version>
-    <rx.version>0.15.1</rx.version>
     <hystrix.version>1.3.8</hystrix.version>
     <guicyfig.version>3.2</guicyfig.version>
     <chop.version>1.0</chop.version>


Mime
View raw message