diff --git a/nebula-exchange/src/main/scala/com/vesoft/nebula/exchange/MetaProvider.scala b/nebula-exchange/src/main/scala/com/vesoft/nebula/exchange/MetaProvider.scala index 31810c0d..07f182a0 100644 --- a/nebula-exchange/src/main/scala/com/vesoft/nebula/exchange/MetaProvider.scala +++ b/nebula-exchange/src/main/scala/com/vesoft/nebula/exchange/MetaProvider.scala @@ -6,6 +6,7 @@ package com.vesoft.nebula.exchange import com.google.common.net.HostAndPort +import com.vesoft.nebula.PropertyType import com.vesoft.nebula.client.graph.data.{ CASignedSSLParam, HostAddress, @@ -14,7 +15,7 @@ import com.vesoft.nebula.client.graph.data.{ } import com.vesoft.nebula.client.meta.MetaClient import com.vesoft.nebula.exchange.config.{SslConfigEntry, SslType, Type} -import com.vesoft.nebula.meta.{EdgeItem, PropertyType, TagItem} +import com.vesoft.nebula.meta.{EdgeItem, TagItem} import org.apache.log4j.Logger import scala.collection.JavaConverters._ diff --git a/nebula-exchange/src/main/scala/com/vesoft/nebula/exchange/processor/Processor.scala b/nebula-exchange/src/main/scala/com/vesoft/nebula/exchange/processor/Processor.scala index a33964c2..7dd7ede4 100644 --- a/nebula-exchange/src/main/scala/com/vesoft/nebula/exchange/processor/Processor.scala +++ b/nebula-exchange/src/main/scala/com/vesoft/nebula/exchange/processor/Processor.scala @@ -6,22 +6,23 @@ package com.vesoft.nebula.exchange.processor import com.vesoft.nebula.{ + Coordinate, Date, DateTime, - NullType, - Time, - Value, Geography, - Coordinate, - Point, LineString, - Polygon + NullType, + Point, + Polygon, + PropertyType, + Time, + Value } import com.vesoft.nebula.exchange.utils.NebulaUtils.DEFAULT_EMPTY_VALUE import com.vesoft.nebula.exchange.utils.{HDFSUtils, NebulaUtils} -import com.vesoft.nebula.meta.PropertyType import org.apache.spark.sql.Row import org.apache.spark.sql.types.{IntegerType, LongType, StringType} + import scala.collection.JavaConverters._ import scala.collection.mutable.ListBuffer diff --git a/nebula-exchange/src/test/scala/com/vesoft/nebula/exchange/processor/ProcessorSuite.scala b/nebula-exchange/src/test/scala/com/vesoft/nebula/exchange/processor/ProcessorSuite.scala index 87e709e9..c9cbd38e 100644 --- a/nebula-exchange/src/test/scala/com/vesoft/nebula/exchange/processor/ProcessorSuite.scala +++ b/nebula-exchange/src/test/scala/com/vesoft/nebula/exchange/processor/ProcessorSuite.scala @@ -7,18 +7,18 @@ package scala.com.vesoft.nebula.exchange.processor import com.vesoft.nebula.exchange.processor.Processor import com.vesoft.nebula.{ + Coordinate, Date, DateTime, - NullType, - Time, - Value, Geography, - Coordinate, - Point, LineString, - Polygon + NullType, + Point, + Polygon, + PropertyType, + Time, + Value } -import com.vesoft.nebula.meta.PropertyType import org.apache.spark.sql.catalyst.expressions.GenericRowWithSchema import org.apache.spark.sql.types.{ BooleanType, diff --git a/nebula-exchange/src/test/scala/com/vesoft/nebula/exchange/utils/NebulaUtilsSuite.scala b/nebula-exchange/src/test/scala/com/vesoft/nebula/exchange/utils/NebulaUtilsSuite.scala index 3f66ac49..6fe29cea 100644 --- a/nebula-exchange/src/test/scala/com/vesoft/nebula/exchange/utils/NebulaUtilsSuite.scala +++ b/nebula-exchange/src/test/scala/com/vesoft/nebula/exchange/utils/NebulaUtilsSuite.scala @@ -6,10 +6,10 @@ package scala.com.vesoft.nebula.exchange.utils import com.google.common.net.HostAndPort +import com.vesoft.nebula.PropertyType import com.vesoft.nebula.client.graph.NebulaPoolConfig import com.vesoft.nebula.client.graph.data.HostAddress import com.vesoft.nebula.client.graph.net.NebulaPool -import com.vesoft.nebula.client.storage.StorageClient import com.vesoft.nebula.exchange.config.{ NebulaSinkConfigEntry, SinkCategory, @@ -18,7 +18,6 @@ import com.vesoft.nebula.exchange.config.{ } import com.vesoft.nebula.exchange.utils.NebulaUtils import com.vesoft.nebula.exchange.{KeyPolicy, MetaProvider, VidType} -import com.vesoft.nebula.meta.PropertyType import org.apache.log4j.Logger import org.junit.{After, Before, Test}