Merge branch 'master' into S2GRAPH-206
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/8696d15e Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/8696d15e Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/8696d15e Branch: refs/heads/master Commit: 8696d15e8dd856bec801cd436e2655c0b94720ce Parents: b69421b 7af37db Author: DO YUNG YOON <[email protected]> Authored: Thu May 3 14:59:27 2018 +0900 Committer: DO YUNG YOON <[email protected]> Committed: Thu May 3 14:59:27 2018 +0900 ---------------------------------------------------------------------- CHANGES | 2 + README.md | 882 +++++++++++-------- build.sbt | 2 +- .../org/apache/s2graph/core/schema/Schema.scala | 3 +- s2jobs/build.sbt | 4 + .../org/apache/s2graph/s2jobs/task/Task.scala | 13 +- .../apache/s2graph/s2jobs/BaseSparkTest.scala | 37 +- .../s2jobs/loader/GraphFileGeneratorTest.scala | 7 + .../apache/s2graph/s2jobs/task/SinkTest.scala | 15 +- .../apache/s2graph/s2jobs/task/SourceTest.scala | 9 +- 10 files changed, 578 insertions(+), 396 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/8696d15e/s2core/src/main/scala/org/apache/s2graph/core/schema/Schema.scala ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/8696d15e/s2jobs/build.sbt ----------------------------------------------------------------------
