You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@s2graph.apache.org by st...@apache.org on 2017/08/07 02:23:42 UTC
[1/2] incubator-s2graph git commit: check and add apache license
header.
Repository: incubator-s2graph
Updated Branches:
refs/heads/master 9f0e1e6de -> 1213c26e0
check and add apache license header.
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/2481a746
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/2481a746
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/2481a746
Branch: refs/heads/master
Commit: 2481a746e299a0c5d2f20b6733fcb07c62b2e1e5
Parents: 9f0e1e6
Author: DO YUNG YOON <st...@apache.org>
Authored: Mon Aug 7 09:52:17 2017 +0900
Committer: DO YUNG YOON <st...@apache.org>
Committed: Mon Aug 7 10:26:42 2017 +0900
----------------------------------------------------------------------
README.md | 1 +
.../s2graph/core/mysqls/GlobalIndex.scala | 6 ------
s2graph_gremlin/README.md | 21 ++++++++++++++++++++
...inkerpop.gremlin.groovy.plugin.GremlinPlugin | 14 +++++++++++++
4 files changed, 36 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/2481a746/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 9b3e7de..d05ddc9 100644
--- a/README.md
+++ b/README.md
@@ -72,6 +72,7 @@ Here is what you can find in each subproject.
5. `spark`: Spark utilities for `loader` and `s2counter_loader`.
6. `s2counter_core`: The core library providing data structures and logics for `s2counter_loader`.
7. `s2counter_loader`: Spark streaming jobs that consume Kafka WAL logs and calculate various top-*K* results on-the-fly.
+8. `s2graph_gremlin`: Gremlin plugin for tinkerpop users.
The first three projects are for OLTP-style workloads, currently the main target of S2Graph. The other four projects could be helpful for OLAP-style or streaming workloads, especially for integrating S2Graph with [Apache Spark](https://spark.apache.org/) and/or [Kafka](https://kafka.apache.org/). Note that, the latter four projects are currently out-of-date, which we are planning to update and provide documentations in the upcoming releases.
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/2481a746/s2core/src/main/scala/org/apache/s2graph/core/mysqls/GlobalIndex.scala
----------------------------------------------------------------------
diff --git a/s2core/src/main/scala/org/apache/s2graph/core/mysqls/GlobalIndex.scala b/s2core/src/main/scala/org/apache/s2graph/core/mysqls/GlobalIndex.scala
index b3657e1..a918db5 100644
--- a/s2core/src/main/scala/org/apache/s2graph/core/mysqls/GlobalIndex.scala
+++ b/s2core/src/main/scala/org/apache/s2graph/core/mysqls/GlobalIndex.scala
@@ -6,15 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
-<<<<<<< HEAD
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
-=======
*
* http://www.apache.org/licenses/LICENSE-2.0
*
->>>>>>> S2GRAPH-152
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/2481a746/s2graph_gremlin/README.md
----------------------------------------------------------------------
diff --git a/s2graph_gremlin/README.md b/s2graph_gremlin/README.md
index a4782e6..3f2e059 100644
--- a/s2graph_gremlin/README.md
+++ b/s2graph_gremlin/README.md
@@ -1,3 +1,24 @@
+<!---
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+--->
+
# S2Graph Tinkerpop3 Implementation(s2graph-gremlin)
Currently tested with tinkerpop 3.2.5 only on gremlin-console.
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/2481a746/s2graph_gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin
----------------------------------------------------------------------
diff --git a/s2graph_gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin b/s2graph_gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin
index 89d6ff5..a8e0555 100644
--- a/s2graph_gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin
+++ b/s2graph_gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin
@@ -1 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
org.apache.s2graph.core.tinkerpop.groovy.plugin.S2GraphGremlinPlugin
[2/2] incubator-s2graph git commit: [S2GRAPH-157]: Check proper
apache license header on all files for release 0.2.0
Posted by st...@apache.org.
[S2GRAPH-157]: Check proper apache license header on all files for release 0.2.0
JIRA:
[S2GRAPH-157] https://issues.apache.org/jira/browse/S2GRAPH-157
Pull Request:
Closes #116
Author
DO YUNG YOON <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/1213c26e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/1213c26e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/1213c26e
Branch: refs/heads/master
Commit: 1213c26e0cd2f3688ee5e80478590699a2666c63
Parents: 2481a74
Author: DO YUNG YOON <st...@apache.org>
Authored: Mon Aug 7 11:22:54 2017 +0900
Committer: DO YUNG YOON <st...@apache.org>
Committed: Mon Aug 7 11:22:54 2017 +0900
----------------------------------------------------------------------
CHANGES | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1213c26e/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 797b790..ae6d096 100644
--- a/CHANGES
+++ b/CHANGES
@@ -248,6 +248,8 @@ Release 0.1.0 - unreleased
S2GRAPH-153: Implement IndexProvider(for Mixed IndexType) class. (Committed by DOYUNG YOON).
S2GRAPH-148: Provide Gremlin Plugin. (Committed by DOYUNG YOON).
+
+ S2GRAPH-157: Check proper apache license header on all files for release 0.2.0 (Committed by DOYUNG YOON).
TEST