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 2018/04/26 03:09:54 UTC
[5/7] incubator-s2graph git commit: fix compile error while
test:compile.
fix compile error while test:compile.
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/1a342bb8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/1a342bb8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/1a342bb8
Branch: refs/heads/master
Commit: 1a342bb8c83d1a5037023071569da8ea2aced9bc
Parents: 8a388a4
Author: DO YUNG YOON <st...@apache.org>
Authored: Wed Apr 25 16:46:17 2018 +0900
Committer: DO YUNG YOON <st...@apache.org>
Committed: Wed Apr 25 16:46:17 2018 +0900
----------------------------------------------------------------------
.../org/apache/s2graph/core/Integrate/IntegrateCommon.scala | 2 +-
.../scala/org/apache/s2graph/core/index/IndexProviderTest.scala | 5 +++--
.../apache/s2graph/core/tinkerpop/structure/S2GraphTest.scala | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1a342bb8/s2core/src/test/scala/org/apache/s2graph/core/Integrate/IntegrateCommon.scala
----------------------------------------------------------------------
diff --git a/s2core/src/test/scala/org/apache/s2graph/core/Integrate/IntegrateCommon.scala b/s2core/src/test/scala/org/apache/s2graph/core/Integrate/IntegrateCommon.scala
index 0177543..c2aa9b8 100644
--- a/s2core/src/test/scala/org/apache/s2graph/core/Integrate/IntegrateCommon.scala
+++ b/s2core/src/test/scala/org/apache/s2graph/core/Integrate/IntegrateCommon.scala
@@ -20,7 +20,7 @@
package org.apache.s2graph.core.Integrate
import com.typesafe.config._
-import org.apache.s2graph.core.schema.{GlobalIndex, Label, Schema}
+import org.apache.s2graph.core.schema.{Label, Schema}
import org.apache.s2graph.core.rest.{RequestParser, RestHandler}
import org.apache.s2graph.core.utils.logger
import org.apache.s2graph.core._
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1a342bb8/s2core/src/test/scala/org/apache/s2graph/core/index/IndexProviderTest.scala
----------------------------------------------------------------------
diff --git a/s2core/src/test/scala/org/apache/s2graph/core/index/IndexProviderTest.scala b/s2core/src/test/scala/org/apache/s2graph/core/index/IndexProviderTest.scala
index 4a87cb2..c12ad7d 100644
--- a/s2core/src/test/scala/org/apache/s2graph/core/index/IndexProviderTest.scala
+++ b/s2core/src/test/scala/org/apache/s2graph/core/index/IndexProviderTest.scala
@@ -34,6 +34,7 @@ import scala.concurrent.duration._
class IndexProviderTest extends IntegrateCommon {
import scala.concurrent.ExecutionContext.Implicits.global
+ import IndexProvider._
val indexProvider = IndexProvider(config)
val numOfTry = 1
@@ -77,9 +78,9 @@ class IndexProviderTest extends IntegrateCommon {
(0 until numOfTry).foreach { ith =>
// val hasContainer = new HasContainer(indexPropsColumnMeta.name, P.eq(Long.box(1)))
- val hasContainer = new HasContainer(GlobalIndex.serviceColumnField, P.eq(testColumn.columnName))
+ val hasContainer = new HasContainer(serviceColumnField, P.eq(testColumn.columnName))
- val f = graph.searchVertices(VertexQueryParam(0, 100, Option(s"${GlobalIndex.serviceColumnField}:${testColumn.columnName}")))
+ val f = graph.searchVertices(VertexQueryParam(0, 100, Option(s"${serviceColumnField}:${testColumn.columnName}")))
val a = Await.result(f, Duration("60 sec"))
println(a)
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/1a342bb8/s2core/src/test/scala/org/apache/s2graph/core/tinkerpop/structure/S2GraphTest.scala
----------------------------------------------------------------------
diff --git a/s2core/src/test/scala/org/apache/s2graph/core/tinkerpop/structure/S2GraphTest.scala b/s2core/src/test/scala/org/apache/s2graph/core/tinkerpop/structure/S2GraphTest.scala
index 04268d6..a77c6f3 100644
--- a/s2core/src/test/scala/org/apache/s2graph/core/tinkerpop/structure/S2GraphTest.scala
+++ b/s2core/src/test/scala/org/apache/s2graph/core/tinkerpop/structure/S2GraphTest.scala
@@ -24,7 +24,7 @@ import java.util.function.Predicate
import org.apache.s2graph.core.GraphExceptions.LabelNotExistException
import org.apache.s2graph.core.Management.JsonModel.Prop
import org.apache.s2graph.core._
-import org.apache.s2graph.core.schema.{GlobalIndex, Service, ServiceColumn}
+import org.apache.s2graph.core.schema.{Service, ServiceColumn}
import org.apache.s2graph.core.tinkerpop.S2GraphProvider
import org.apache.s2graph.core.utils.logger
import org.apache.tinkerpop.gremlin.process.traversal.{Compare, P, Scope}