Merge branch 'S2GRAPH-215' * S2GRAPH-215: remove hard coded cacheTTL for resouceManager implement jdbc driver for H2 DB naive implementation
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/4b94204a Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/4b94204a Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/4b94204a Branch: refs/heads/master Commit: 4b94204a6678ea0bb4d3abdebaa7e3dc797cdaa0 Parents: f0f1081 3f00d4e Author: daewon <dae...@apache.org> Authored: Mon Jun 4 18:11:24 2018 +0900 Committer: daewon <dae...@apache.org> Committed: Mon Jun 4 18:11:24 2018 +0900 ---------------------------------------------------------------------- .../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 +- 15 files changed, 850 insertions(+), 71 deletions(-) ----------------------------------------------------------------------
