Merge branch 'master' into S2GRAPH-193
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/233a17fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/233a17fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/233a17fb Branch: refs/heads/master Commit: 233a17fb72e1ae483cf4af78f59dab6a8800b1b5 Parents: fc273fb b21db65 Author: DO YUNG YOON <[email protected]> Authored: Mon Apr 23 13:53:38 2018 +0900 Committer: DO YUNG YOON <[email protected]> Committed: Mon Apr 23 13:53:38 2018 +0900 ---------------------------------------------------------------------- CHANGES | 15 + build.sbt | 36 ++ dev_support/README.md | 19 +- project/Common.scala | 3 +- project/plugins.sbt | 2 + .../org/apache/s2graph/core/PostProcess.scala | 22 ++ .../org/apache/s2graph/core/QueryParam.scala | 91 +++-- .../scala/org/apache/s2graph/core/S2Edge.scala | 108 +++--- .../org/apache/s2graph/core/S2EdgeLike.scala | 9 +- .../scala/org/apache/s2graph/core/S2Graph.scala | 33 +- .../org/apache/s2graph/core/S2VertexLike.scala | 10 +- .../s2graph/core/index/ESIndexProvider.scala | 67 ++-- .../s2graph/core/index/IndexProvider.scala | 3 +- .../core/index/LuceneIndexProvider.scala | 125 ++++--- .../s2graph/core/parsers/WhereParser.scala | 64 ++-- .../s2graph/core/rest/RequestParser.scala | 32 +- .../apache/s2graph/core/storage/SKeyValue.scala | 5 +- .../hbase/AsynchbaseStorageManagement.scala | 2 +- .../tall/SnapshotEdgeDeserializable.scala | 5 +- .../core/Integrate/IntegrateCommon.scala | 8 +- .../s2graph/core/Integrate/QueryTest.scala | 2 +- .../core/Integrate/VertexTestHelper.scala | 42 +++ .../core/benchmark/BenchmarkCommon.scala | 1 - .../core/benchmark/JsonBenchmarkSpec.scala | 78 ----- .../core/benchmark/SamplingBenchmarkSpec.scala | 105 ------ .../s2graph/core/index/IndexProviderTest.scala | 23 +- .../s2graph/core/parsers/WhereParserTest.scala | 11 +- .../loader/core/CounterEtlFunctionsSpec.scala | 2 +- .../apache/s2graph/graphql/GraphQLServer.scala | 35 +- .../org/apache/s2graph/graphql/HttpServer.scala | 34 +- .../apache/s2graph/graphql/bind/AstHelper.scala | 28 ++ .../s2graph/graphql/bind/Unmarshaller.scala | 127 +++++++ .../s2graph/graphql/marshaller/package.scala | 124 ------- .../graphql/repository/GraphRepository.scala | 111 ++++-- .../s2graph/graphql/resolver/Resolver.scala | 28 -- .../s2graph/graphql/types/FieldResolver.scala | 108 ++++++ .../s2graph/graphql/types/ManagementType.scala | 312 +++++++++++++++++ .../graphql/types/S2ManagementType.scala | 341 ------------------- .../apache/s2graph/graphql/types/S2Type.scala | 225 ++++++------ .../types/SangriaPlayJsonScalarType.scala | 76 ----- .../s2graph/graphql/types/SchemaDef.scala | 4 +- .../s2graph/graphql/types/StaticType.scala | 149 ++++++++ .../apache/s2graph/graphql/types/package.scala | 122 +------ .../apache/s2graph/graphql/ScenarioTest.scala | 186 ++++++---- .../org/apache/s2graph/graphql/SchemaTest.scala | 35 +- .../org/apache/s2graph/graphql/TestGraph.scala | 19 +- .../org/apache/s2graph/s2jobs/DegreeKey.scala | 80 +++++ .../apache/s2graph/s2jobs/JobDescription.scala | 3 +- .../apache/s2graph/s2jobs/S2GraphHelper.scala | 104 +++++- .../org/apache/s2graph/s2jobs/Schema.scala | 21 ++ .../s2jobs/loader/GraphFileGenerator.scala | 8 +- .../s2jobs/loader/GraphFileOptions.scala | 45 ++- .../s2graph/s2jobs/loader/HFileGenerator.scala | 189 ++++------ .../s2jobs/loader/HFileMRGenerator.scala | 43 +-- .../loader/LocalBulkLoaderTransformer.scala | 51 +++ .../s2jobs/loader/RawFileGenerator.scala | 28 +- .../loader/SparkBulkLoaderTransformer.scala | 73 ++++ .../s2jobs/serde/GraphElementReadable.scala | 26 ++ .../s2jobs/serde/GraphElementWritable.scala | 30 ++ .../s2graph/s2jobs/serde/Transformer.scala | 41 +++ .../s2jobs/serde/reader/IdentityReader.scala | 28 ++ .../serde/reader/RowBulkFormatReader.scala | 33 ++ .../s2jobs/serde/reader/S2GraphCellReader.scala | 54 +++ .../serde/reader/TsvBulkFormatReader.scala | 29 ++ .../s2jobs/serde/writer/IdentityWriter.scala | 32 ++ .../s2jobs/serde/writer/KeyValueWriter.scala | 48 +++ .../serde/writer/RowDataFrameWriter.scala | 36 ++ .../org/apache/s2graph/s2jobs/task/Sink.scala | 119 ++++++- .../org/apache/s2graph/s2jobs/task/Source.scala | 39 +++ .../org/apache/s2graph/s2jobs/task/Task.scala | 21 ++ .../spark/sql/streaming/S2SinkContext.scala | 2 + .../sql/streaming/S2StreamQueryWriter.scala | 53 +-- .../apache/s2graph/s2jobs/BaseSparkTest.scala | 138 ++++++++ .../s2graph/s2jobs/S2GraphHelperTest.scala | 13 +- .../s2jobs/loader/GraphFileGeneratorTest.scala | 307 ++++++++--------- .../apache/s2graph/s2jobs/task/SinkTest.scala | 98 ++++++ .../apache/s2graph/s2jobs/task/SourceTest.scala | 130 +++++++ .../s2graph/s2jobs/task/TaskConfTest.scala | 61 ++++ s2rest_netty/build.sbt | 2 - s2rest_play/build.sbt | 2 - 80 files changed, 3167 insertions(+), 1807 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/233a17fb/s2jobs/src/main/scala/org/apache/s2graph/s2jobs/task/Source.scala ----------------------------------------------------------------------
