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 2017/07/01 15:28:31 UTC
[40/46] incubator-s2graph git commit: remove hard coded vertexCache.
remove hard coded vertexCache.
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/fd1bdc48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/fd1bdc48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/fd1bdc48
Branch: refs/heads/master
Commit: fd1bdc483a8a6fe6f55f757f42e70f95fb076cd7
Parents: aedc445
Author: DO YUNG YOON <st...@apache.org>
Authored: Thu May 4 15:20:42 2017 +0900
Committer: DO YUNG YOON <st...@apache.org>
Committed: Thu May 4 15:20:42 2017 +0900
----------------------------------------------------------------------
.../main/scala/org/apache/s2graph/core/QueryParam.scala | 2 +-
.../src/main/scala/org/apache/s2graph/core/S2Graph.scala | 7 ++++---
.../s2graph/core/storage/hbase/AsynchbaseStorage.scala | 11 +++++++----
3 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/fd1bdc48/s2core/src/main/scala/org/apache/s2graph/core/QueryParam.scala
----------------------------------------------------------------------
diff --git a/s2core/src/main/scala/org/apache/s2graph/core/QueryParam.scala b/s2core/src/main/scala/org/apache/s2graph/core/QueryParam.scala
index 0228b3b..1e0d3b2 100644
--- a/s2core/src/main/scala/org/apache/s2graph/core/QueryParam.scala
+++ b/s2core/src/main/scala/org/apache/s2graph/core/QueryParam.scala
@@ -270,7 +270,7 @@ case class QueryParam(labelName: String,
limit: Int = 100,
sample: Int = -1,
maxAttempt: Int = 2,
- rpcTimeout: Int = 60000,
+ rpcTimeout: Int = 600000,
cacheTTLInMillis: Long = -1L,
indexName: String = LabelIndex.DefaultName,
where: Try[Where] = Success(WhereParser.success),
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/fd1bdc48/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala
----------------------------------------------------------------------
diff --git a/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala b/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala
index b899911..483c8c4 100644
--- a/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala
+++ b/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala
@@ -55,6 +55,7 @@ object S2Graph {
type FilterHashKey = (Int, Int)
val DefaultScore = 1.0
+ val FetchAllLimit = 10000000
private val DefaultConfigs: Map[String, AnyRef] = Map(
"hbase.zookeeper.quorum" -> "localhost",
@@ -65,11 +66,11 @@ object S2Graph {
"db.default.url" -> "jdbc:h2:file:./var/metastore;MODE=MYSQL",
"db.default.password" -> "graph",
"db.default.user" -> "graph",
- "cache.max.size" -> java.lang.Integer.valueOf(10000),
- "cache.ttl.seconds" -> java.lang.Integer.valueOf(60),
+ "cache.max.size" -> java.lang.Integer.valueOf(0),
+ "cache.ttl.seconds" -> java.lang.Integer.valueOf(-1),
"hbase.client.retries.number" -> java.lang.Integer.valueOf(20),
"hbase.rpcs.buffered_flush_interval" -> java.lang.Short.valueOf(100.toShort),
- "hbase.rpc.timeout" -> java.lang.Integer.valueOf(60000),
+ "hbase.rpc.timeout" -> java.lang.Integer.valueOf(600000),
"max.retry.number" -> java.lang.Integer.valueOf(100),
"lock.expire.time" -> java.lang.Integer.valueOf(1000 * 60 * 10),
"max.back.off" -> java.lang.Integer.valueOf(100),
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/fd1bdc48/s2core/src/main/scala/org/apache/s2graph/core/storage/hbase/AsynchbaseStorage.scala
----------------------------------------------------------------------
diff --git a/s2core/src/main/scala/org/apache/s2graph/core/storage/hbase/AsynchbaseStorage.scala b/s2core/src/main/scala/org/apache/s2graph/core/storage/hbase/AsynchbaseStorage.scala
index 5c9695d..dbb6e4c 100644
--- a/s2core/src/main/scala/org/apache/s2graph/core/storage/hbase/AsynchbaseStorage.scala
+++ b/s2core/src/main/scala/org/apache/s2graph/core/storage/hbase/AsynchbaseStorage.scala
@@ -663,10 +663,13 @@ class AsynchbaseStorage(override val graph: S2Graph,
get.setFailfast(true)
get.maxVersions(1)
- val cacheKey = MurmurHash3.stringHash(get.toString)
- vertexCache.getOrElseUpdate(cacheKey, cacheTTL = 10000)(fetchVertexKeyValues(Left(get))).map { kvs =>
+ fetchVertexKeyValues(Left(get)).map { kvs =>
fromResult(kvs, vertex.serviceColumn.schemaVersion)
}
+// val cacheKey = MurmurHash3.stringHash(get.toString)
+// vertexCache.getOrElseUpdate(cacheKey, cacheTTL = -1)(fetchVertexKeyValues(Left(get))).map { kvs =>
+// fromResult(kvs, vertex.serviceColumn.schemaVersion)
+// }
}
Future.sequence(futures).map { result => result.toList.flatten }
@@ -680,7 +683,7 @@ class AsynchbaseStorage(override val graph: S2Graph,
scan.setFamily(Serializable.edgeCf)
scan.setMaxVersions(1)
- scan.nextRows(100000).toFuture(emptyKeyValuesLs).map {
+ scan.nextRows(S2Graph.FetchAllLimit).toFuture(emptyKeyValuesLs).map {
case null => Seq.empty
case kvsLs =>
kvsLs.flatMap { kvs =>
@@ -704,7 +707,7 @@ class AsynchbaseStorage(override val graph: S2Graph,
scan.setFamily(Serializable.vertexCf)
scan.setMaxVersions(1)
- scan.nextRows(10000).toFuture(emptyKeyValuesLs).map {
+ scan.nextRows(S2Graph.FetchAllLimit).toFuture(emptyKeyValuesLs).map {
case null => Seq.empty
case kvsLs =>
kvsLs.flatMap { kvs =>