You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@s2graph.apache.org by st...@apache.org on 2016/12/28 01:20:51 UTC
[2/2] incubator-s2graph git commit: [S2GRAPH-132] Support buffering
for 'Increment RPC'
[S2GRAPH-132] Support buffering for 'Increment RPC'
JIRA:
[S2GRAPH-132] https://issues.apache.org/jira/browse/S2GRAPH-132
Pull Request:
Closes #105
Author
daewon <bl...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/c099da6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/c099da6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/c099da6f
Branch: refs/heads/master
Commit: c099da6fb988ba2b1f0f2081b5c807c978eaf041
Parents: 146094b 478db84
Author: DO YUNG YOON <st...@apache.org>
Authored: Wed Dec 28 10:21:44 2016 +0900
Committer: DO YUNG YOON <st...@apache.org>
Committed: Wed Dec 28 10:22:06 2016 +0900
----------------------------------------------------------------------
CHANGES | 2 +
.../scala/org/apache/s2graph/core/S2Edge.scala | 72 +++++++++++++++++++-
.../scala/org/apache/s2graph/core/S2Graph.scala | 5 +-
.../apache/s2graph/core/mysqls/LabelIndex.scala | 8 +--
.../apache/s2graph/core/storage/Storage.scala | 22 +++---
.../core/storage/hbase/AsynchbaseStorage.scala | 2 +-
6 files changed, 94 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/c099da6f/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index 8328fec,860d2f5..4a0d5ce
--- a/CHANGES
+++ b/CHANGES
@@@ -99,8 -99,6 +99,10 @@@ Release 0.1.0 - unrelease
S2GRAPH-121: Create `Result` class to hold traverse result edges (Committed by DOYUNG YOON).
S2GRAPH-122: Change data types of Edge/IndexEdge/SnapshotEdge (Committed by DOYUNG YOON).
+
+ S2GRAPH-135: Change the way LabelIndexOption is implemented and improve it (Committed by daewon).
++
++ S2GRAPH-132: Support buffering for 'Increment RPC' (Committed by daewon).
BUG FIXES
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/c099da6f/s2core/src/main/scala/org/apache/s2graph/core/S2Edge.scala
----------------------------------------------------------------------
diff --cc s2core/src/main/scala/org/apache/s2graph/core/S2Edge.scala
index 1472786,9408ed5..7859218
--- a/s2core/src/main/scala/org/apache/s2graph/core/S2Edge.scala
+++ b/s2core/src/main/scala/org/apache/s2graph/core/S2Edge.scala
@@@ -571,9 -634,13 +628,14 @@@ case class S2Edge(innerGraph: S2Graph
override def label(): String = innerLabel.label
}
+case class EdgeId(srcVertexId: InnerValLike, tgtVertexId: InnerValLike, labelName: String, direction: String)
object EdgeMutate {
+
+ def partitionBufferedIncrement(edges: Seq[IndexEdge]): (Seq[IndexEdge], Seq[IndexEdge]) = {
+ edges.partition(_.indexOption.fold(false)(_.isBufferIncrement))
+ }
+
def filterIndexOptionForDegree(edges: Seq[IndexEdge]): Seq[IndexEdge] = edges.filter { ie =>
ie.indexOption.fold(true)(_.storeDegree)
}
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/c099da6f/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/c099da6f/s2core/src/main/scala/org/apache/s2graph/core/storage/Storage.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/c099da6f/s2core/src/main/scala/org/apache/s2graph/core/storage/hbase/AsynchbaseStorage.scala
----------------------------------------------------------------------