You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/04/27 22:56:39 UTC
[3/3] incubator-usergrid git commit: optional fields
optional fields
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/07e2a414
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/07e2a414
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/07e2a414
Branch: refs/heads/two-dot-o-dev
Commit: 07e2a414511d2ae6d176a81e370e7ff443534447
Parents: a8cf784
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Apr 27 14:56:28 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Apr 27 14:56:28 2015 -0600
----------------------------------------------------------------------
.../persistence/core/rx/OrderedMerge.java | 27 ++++++++++----------
.../persistence/core/astyanax/TestUtils.java | 2 +-
.../graph/impl/stage/EdgeDeleteRepairImpl.java | 3 ++-
.../graph/impl/stage/EdgeMetaRepairImpl.java | 6 +++--
.../graph/test/util/EdgeTestUtils.java | 6 ++---
5 files changed, 23 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/07e2a414/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/OrderedMerge.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/OrderedMerge.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/OrderedMerge.java
index 613585e..6600b3e 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/OrderedMerge.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/rx/OrderedMerge.java
@@ -94,20 +94,19 @@ public final class OrderedMerge<T> implements Observable.OnSubscribe<T> {
innerObservers[i] = inner;
}
-// TODO, if this merge makes it into 2.0-dev remove this and use 2.0 -dev
-// /**
-// * Once we're set up, begin the subscription to sub observables
-// */
-// for ( int i = 0; i < observables.length; i++ ) {
-// //subscribe after setting them up
-// //add our subscription to the composite for future cancellation
-// Subscription subscription = observables[i].subscribe( innerObservers[i] );
-//
-// csub.add( subscription );
-//
-// //add the internal composite subscription
-// outerOperation.add( csub );
-// }
+ /**
+ * Once we're set up, begin the subscription to sub observables
+ */
+ for ( int i = 0; i < observables.length; i++ ) {
+ //subscribe after setting them up
+ //add our subscription to the composite for future cancellation
+ Subscription subscription = observables[i].subscribe( innerObservers[i] );
+
+ csub.add( subscription );
+
+ //add the internal composite subscription
+ outerOperation.add( csub );
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/07e2a414/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/TestUtils.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/TestUtils.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/TestUtils.java
index 1ede643..f693857 100644
--- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/TestUtils.java
+++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/TestUtils.java
@@ -58,7 +58,7 @@ public class TestUtils {
keyspace.createKeyspace( options );
}
catch ( Throwable t ) {
- log.error( "Error on creating keyspace, ignoring", t );
+ log.info( "Error on creating keyspace, ignoring", t );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/07e2a414/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeDeleteRepairImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeDeleteRepairImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeDeleteRepairImpl.java
index 7dca0ce..9b84978 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeDeleteRepairImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeDeleteRepairImpl.java
@@ -23,6 +23,7 @@ package org.apache.usergrid.persistence.graph.impl.stage;
import java.util.Iterator;
import java.util.UUID;
+import com.google.common.base.Optional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -120,7 +121,7 @@ public class EdgeDeleteRepairImpl implements EdgeDeleteRepair {
final SimpleSearchByEdge search =
new SimpleSearchByEdge( edge.getSourceNode(), edge.getType(), edge.getTargetNode(),
- edge.getTimestamp(), SearchByEdgeType.Order.DESCENDING, null );
+ edge.getTimestamp(), SearchByEdgeType.Order.DESCENDING, Optional.<Edge>absent() );
return serialization.getEdgeVersions( scope, search );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/07e2a414/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeMetaRepairImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeMetaRepairImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeMetaRepairImpl.java
index a371b24..5e76f75 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeMetaRepairImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeMetaRepairImpl.java
@@ -24,6 +24,8 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import com.google.common.base.Optional;
+import org.apache.usergrid.persistence.graph.Edge;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -297,7 +299,7 @@ public class EdgeMetaRepairImpl implements EdgeMetaRepair {
@Override
protected Iterator<MarkedEdge> getIterator() {
return storageEdgeSerialization.getEdgesToTargetBySourceType( scope,
- new SimpleSearchByIdType( nodeId, edgeType, maxTimestamp, SearchByEdgeType.Order.DESCENDING, subType, null ) );
+ new SimpleSearchByIdType( nodeId, edgeType, maxTimestamp, SearchByEdgeType.Order.DESCENDING, subType, Optional.<Edge>absent() ) );
}
} );
}
@@ -343,7 +345,7 @@ public class EdgeMetaRepairImpl implements EdgeMetaRepair {
@Override
protected Iterator<MarkedEdge> getIterator() {
return storageEdgeSerialization.getEdgesFromSourceByTargetType( scope,
- new SimpleSearchByIdType( nodeId, edgeType, maxTimestamp, SearchByEdgeType.Order.DESCENDING, subType, null ) );
+ new SimpleSearchByIdType( nodeId, edgeType, maxTimestamp, SearchByEdgeType.Order.DESCENDING, subType, Optional.<Edge>absent() ) );
}
} );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/07e2a414/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/test/util/EdgeTestUtils.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/test/util/EdgeTestUtils.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/test/util/EdgeTestUtils.java
index 0239f4b..b2142e8 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/test/util/EdgeTestUtils.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/test/util/EdgeTestUtils.java
@@ -164,7 +164,7 @@ public class EdgeTestUtils {
*/
public static SearchByIdType createSearchByEdgeAndId( final Id sourceId, final String type, final long maxVersion,
final String idType, final Edge last ) {
- return new SimpleSearchByIdType( sourceId, type, maxVersion, SearchByEdgeType.Order.DESCENDING, idType, Optional.of(last) );
+ return new SimpleSearchByIdType( sourceId, type, maxVersion, SearchByEdgeType.Order.DESCENDING, idType, Optional.fromNullable(last) );
}
@@ -192,8 +192,8 @@ public class EdgeTestUtils {
*/
public static SearchByEdge createGetByEdge( final Id sourceId, final String type, final Id targetId,
final long maxVersion, final Edge last ) {
- return new SimpleSearchByEdge( sourceId, type, targetId, maxVersion, SearchByEdgeType.Order.DESCENDING, Optional
- .of( last ) );
+ return new SimpleSearchByEdge( sourceId, type, targetId, maxVersion, SearchByEdgeType.Order.DESCENDING,
+ Optional.fromNullable( last ) );
}
//