Merge branch 'master' into S2GRAPH-226
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/716b0042 Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/716b0042 Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/716b0042 Branch: refs/heads/master Commit: 716b004245f48b75b696aac29e38ece9db653ca6 Parents: 0f06c52 5c42b1c Author: DO YUNG YOON <steams...@apache.org> Authored: Thu Dec 6 17:44:08 2018 +0900 Committer: DO YUNG YOON <steams...@apache.org> Committed: Thu Dec 6 17:44:08 2018 +0900 ---------------------------------------------------------------------- .gitignore | 3 + .travis.yml | 6 - .travis/install-hbase.sh | 10 +- CHANGES | 6 + doc/Makefile | 19 ++ doc/make.bat | 35 +++ doc/readme.md | 56 ++++ doc/source/conf.py | 186 ++++++++++++ doc/source/getting_started/index.rst | 43 +++ doc/source/getting_started/your_first_graph.rst | 178 ++++++++++++ doc/source/index.rst | 30 ++ project/Common.scala | 3 +- s2core/build.sbt | 2 +- .../apache/s2graph/core/schema/ColumnMeta.scala | 2 + .../apache/s2graph/core/schema/LabelIndex.scala | 2 + .../core/storage/hbase/AsynchbaseStorage.scala | 2 +- .../s2graph/core/Integrate/ExampleTest.scala | 130 +++++++++ s2graphql/README.md | 114 +++++--- .../apache/s2graph/graphql/GraphQLServer.scala | 36 ++- .../org/apache/s2graph/graphql/HttpServer.scala | 22 +- .../graphql/repository/GraphRepository.scala | 77 ++++- .../s2graph/graphql/types/FieldResolver.scala | 2 +- .../s2graph/graphql/types/ManagementType.scala | 59 ++-- .../apache/s2graph/graphql/types/S2Type.scala | 288 +++++++++++++------ .../s2graph/graphql/types/SchemaDef.scala | 26 +- s2jobs/build.sbt | 1 + .../scala/org/apache/s2graph/s2jobs/Job.scala | 6 +- .../apache/s2graph/s2jobs/JobDescription.scala | 8 +- .../org/apache/s2graph/s2jobs/JobLauncher.scala | 8 + .../org/apache/s2graph/s2jobs/task/Sink.scala | 22 +- .../org/apache/s2graph/s2jobs/udfs/Grok.scala | 36 +++ .../org/apache/s2graph/s2jobs/udfs/Udf.scala | 14 + .../s2graph/s2jobs/utils/GrokHelper.scala | 59 ++++ 33 files changed, 1268 insertions(+), 223 deletions(-) ----------------------------------------------------------------------
