Merge branch 'master' into S2GRAPH-216

* master:
  [S2GRAPH-215] Implement a Storage Backend for JDBC driver, such as H2, MySql 
using the Mutator and Fetcher interfaces
  [S2GRAPH-214]: Add REAME for movielens examples
  remove hard coded cacheTTL for resouceManager
  implement jdbc driver for H2 DB
  naive implementation
  add REAME.md to explaining movielens example.


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

Branch: refs/heads/master
Commit: 8af51d915cd2a4510e18fd8237161a6719f8b7a2
Parents: 2d37cf6 32eb344
Author: daewon <dae...@apache.org>
Authored: Mon Jun 4 18:29:02 2018 +0900
Committer: daewon <dae...@apache.org>
Committed: Mon Jun 4 18:29:02 2018 +0900

----------------------------------------------------------------------
 CHANGES                                         |   2 +
 example/movielens/README.md                     | 453 +++++++++++++++++++
 .../org/apache/s2graph/core/EdgeFetcher.scala   |   2 +-
 .../org/apache/s2graph/core/EdgeMutator.scala   |   2 +-
 .../org/apache/s2graph/core/Management.scala    |  93 ++--
 .../apache/s2graph/core/ResourceManager.scala   |  62 ++-
 .../scala/org/apache/s2graph/core/S2Graph.scala |   2 +
 .../org/apache/s2graph/core/VertexFetcher.scala |   2 +-
 .../org/apache/s2graph/core/VertexMutator.scala |   2 +-
 .../core/storage/jdbc/JdbcEdgeFetcher.scala     |  99 ++++
 .../core/storage/jdbc/JdbcEdgeMutator.scala     | 123 +++++
 .../s2graph/core/storage/jdbc/JdbcStorage.scala | 177 ++++++++
 .../apache/s2graph/core/utils/Importer.scala    |   3 +-
 .../s2graph/core/utils/SafeUpdateCache.scala    |  29 +-
 .../s2graph/core/fetcher/BaseFetcherTest.scala  |  17 +-
 .../core/storage/jdbc/JdbcStorageTest.scala     | 301 ++++++++++++
 .../org/apache/s2graph/graphql/TestGraph.scala  |   7 +-
 17 files changed, 1305 insertions(+), 71 deletions(-)
----------------------------------------------------------------------


Reply via email to