Repository: incubator-s2graph Updated Branches: refs/heads/master 0841eccda -> cfa5f6fcd
[S2GRAPH-63] Condition on partition strong edges and weak edges on mutateEdges is wrong. [S2GRAPH-63]: Condition on partition strong edges and weak edges on mutateEdges is wrong. update CHANGES file. JIRA: [S2GRAPH-63] https://issues.apache.org/jira/browse/S2GRAPH-63 Pull Request: Closes #49 Authors: DO YUNG YOON [email protected] Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/cfa5f6fc Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/cfa5f6fc Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/cfa5f6fc Branch: refs/heads/master Commit: cfa5f6fcdd43b9ffd7353b0be7a983e0c32b69f2 Parents: 0841ecc Author: DO YUNG YOON <[email protected]> Authored: Sat May 28 08:32:47 2016 +0900 Committer: Jaesang Kim <[email protected]> Committed: Fri Jun 10 18:46:26 2016 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ .../src/main/scala/org/apache/s2graph/core/storage/Storage.scala | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/cfa5f6fc/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index a8e5f4a..1d622b4 100644 --- a/CHANGES +++ b/CHANGES @@ -84,6 +84,8 @@ Release 0.12.1 - unreleased S2GRAPH-43: Bug on offset when Interval is given on query (Committed by DOYUNG YOON). S2GRAPH-19: When query with duration error (Committed by DOYUNG YOON). + + S2GRAPH-63: Condition on partition strong edges and weak edges on mutateEdges is wrong (Committed by DOYUNG YOON). TASKS http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/cfa5f6fc/s2core/src/main/scala/org/apache/s2graph/core/storage/Storage.scala ---------------------------------------------------------------------- diff --git a/s2core/src/main/scala/org/apache/s2graph/core/storage/Storage.scala b/s2core/src/main/scala/org/apache/s2graph/core/storage/Storage.scala index fd968ad..f5cd9b2 100644 --- a/s2core/src/main/scala/org/apache/s2graph/core/storage/Storage.scala +++ b/s2core/src/main/scala/org/apache/s2graph/core/storage/Storage.scala @@ -311,7 +311,7 @@ abstract class Storage[R](val config: Config)(implicit ec: ExecutionContext) { def mutateEdges(edges: Seq[Edge], withWait: Boolean): Future[Seq[Boolean]] = { val (strongEdges, weakEdges) = - (edges.partition(e => e.label.consistencyLevel == "strong" || e.op == GraphUtil.operations("insertBulk"))) + edges.partition(e => e.label.consistencyLevel == "strong" && e.op != GraphUtil.operations("insertBulk")) val weakEdgesFutures = weakEdges.groupBy { e => e.label.hbaseZkAddr }.map { case (zkQuorum, edges) => val mutations = edges.flatMap { edge =>
