[S2GRAPH-181]: MutateVertices yield different state with different storage type.
JIRA:
[S2GRAPH-181] https://issues.apache.org/jira/browse/S2GRAPH-181
Pull Request:
Closes #138
Author
DO YUNG YOON <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/7544a056
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/7544a056
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/7544a056
Branch: refs/heads/master
Commit: 7544a05657384e2634fd43ace0fbade64d1f5de6
Parents: 50c9eaf ddfd10d
Author: DO YUNG YOON <[email protected]>
Authored: Mon Mar 19 11:16:43 2018 +0900
Committer: DO YUNG YOON <[email protected]>
Committed: Tue Mar 20 14:18:58 2018 +0900
----------------------------------------------------------------------
CHANGES | 5 +
build.sbt | 11 +-
loader/build.sbt | 5 +-
loader/loader.py | 85 +-
.../s2graph/loader/spark/HBaseContext.scala | 12 +-
.../loader/spark/HBaseRDDFunctions.scala | 3 +-
.../loader/subscriber/GraphSubscriber.scala | 10 +
.../loader/subscriber/TransferToHFile.scala | 278 ++++--
.../loader/subscriber/TransferToHFileTest.scala | 232 +++++
project/Common.scala | 1 +
.../s2graph/core/GraphElementBuilder.scala | 2 +-
.../org/apache/s2graph/core/JSONParser.scala | 3 +-
.../apache/s2graph/core/S2VertexProperty.scala | 3 -
.../apache/s2graph/core/mysqls/ColumnMeta.scala | 4 +-
.../apache/s2graph/core/mysqls/Service.scala | 2 +-
.../s2graph/core/mysqls/ServiceColumn.scala | 4 +-
.../apache/s2graph/core/storage/SKeyValue.scala | 4 +
.../s2graph/core/storage/StorageSerDe.scala | 2 +-
.../hbase/AsynchbaseStorageManagement.scala | 16 +-
s2graphql/src/main/scala/GraphRepository.scala | 9 +-
s2graphql/src/main/scala/S2Type.scala | 184 ++--
s2jobs/build.sbt | 57 ++
s2jobs/loader.py | 156 ++++
.../hbase/mapreduce/GraphHFileOutputFormat.java | 169 ++++
.../apache/s2graph/s2jobs/S2GraphHelper.scala | 31 +
.../s2jobs/loader/GraphFileGenerator.scala | 43 +
.../s2jobs/loader/GraphFileOptions.scala | 138 +++
.../s2graph/s2jobs/loader/HFileGenerator.scala | 223 +++++
.../s2jobs/loader/HFileMRGenerator.scala | 161 ++++
.../s2jobs/loader/RawFileGenerator.scala | 51 ++
.../s2jobs/spark/BulkLoadPartitioner.scala | 56 ++
.../s2jobs/spark/FamilyHFileWriteOptions.scala | 35 +
.../s2graph/s2jobs/spark/HBaseContext.scala | 850 +++++++++++++++++++
.../s2jobs/spark/HBaseDStreamFunctions.scala | 158 ++++
.../s2jobs/spark/HBaseRDDFunctions.scala | 206 +++++
.../s2graph/s2jobs/spark/JavaHBaseContext.scala | 342 ++++++++
.../s2jobs/spark/KeyFamilyQualifier.scala | 46 +
.../s2graph/s2jobs/S2GraphHelperTest.scala | 24 +
.../s2jobs/loader/GraphFileGeneratorTest.scala | 256 ++++++
s2rest_play/conf/application.conf | 2 +-
40 files changed, 3622 insertions(+), 257 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/7544a056/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index b6cb4ce,c44c8c0..da3d682
--- a/CHANGES
+++ b/CHANGES
@@@ -38,6 -38,8 +38,9 @@@ Release Notes - S2Graph - Version 0.2.
* [S2GRAPH-159] - Wrong syntax at a bash script under Linux
* [S2GRAPH-168] - Fix args order mismatch when use addServiceColumnProp
* [S2GRAPH-176] - Fix compile error on LabelMeta
+ * [S2GRAPH-179] - Add defaultValue on ColumnMeta
+ * [S2GRAPH-178] - Fix null pointer error on BulkLoader
++ * [S2GRAPH-181] - MutateVertices yield different state with different
storage type
** Improvement
* [S2GRAPH-72] - Support Apache TinkerPop and Gremlin
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/7544a056/s2graphql/src/main/scala/S2Type.scala
----------------------------------------------------------------------
diff --cc s2graphql/src/main/scala/S2Type.scala
index 1fae450,c584363..349d996
--- a/s2graphql/src/main/scala/S2Type.scala
+++ b/s2graphql/src/main/scala/S2Type.scala
@@@ -23,7 -23,7 +23,6 @@@ import org.apache.s2graph.core.Manageme
import org.apache.s2graph.core._
import org.apache.s2graph.core.mysqls._
import org.apache.s2graph.core.storage.MutateResponse
--import org.apache.s2graph.core.utils.logger
import play.api.libs.json.JsValue
import sangria.marshalling.{CoercedScalaResultMarshaller, FromInput}
import sangria.schema._
