Merge pull request #967 from peacewong/dev-1.0.2

Optimize gateway/hiveEngineConn/Entrance modules
apache · Aug 20, 2021 · 93e6cb9 · 93e6cb9
2 parents d87a821 + 1525eb4
commit 93e6cb9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/linkis-computation-governance/linkis-entrance/pom.xml b/linkis-computation-governance/linkis-entrance/pom.xml
@@ -124,11 +124,11 @@
             <version>${linkis.version}</version>
         </dependency>
 
-        <dependency>
+        <!--<dependency>
             <groupId>com.webank.wedatasphere.linkis</groupId>
             <artifactId>linkis-instance-label-client</artifactId>
             <version>${linkis.version}</version>
-        </dependency>
+        </dependency>-->
 
     </dependencies>
 

diff --git a/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml b/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml
@@ -108,6 +108,10 @@
             <artifactId>hive-exec</artifactId>
             <version>${hive.version}</version>
             <exclusions>
+                <exclusion>
+                    <groupId>org.pentaho</groupId>
+                    <artifactId>pentaho-aggdesigner-algorithm</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.apache.hive</groupId>
                     <artifactId>hive-ant</artifactId>

diff --git a/...eway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/route/GatewayRouter.scala b/...eway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/route/GatewayRouter.scala
@@ -63,23 +63,23 @@ abstract class AbstractGatewayRouter extends GatewayRouter with Logging {
     else None
   }
 
-  protected def retainAllInRegistry(serviceId: String, serviceInstances: util.List[ServiceInstance]): util.List[ServiceInstance] ={
-    val instancesInRegistry = SpringCloudFeignConfigurationCache.getDiscoveryClient
-      .getInstances(serviceId).map( instance => instance.getHost + ":" + instance.getPort)
+  protected def retainAllInRegistry(serviceId: String, serviceInstances: util.List[ServiceInstance]): util.List[ServiceInstance] = {
+    val instancesInRegistry = ServiceInstanceUtils.getRPCServerLoader.getServiceInstances(serviceId)
     serviceInstances.filter(instance => {
-      instancesInRegistry.contains(instance.getInstance)
+      instancesInRegistry.contains(instance)
     })
   }
 
   protected def removeAllFromRegistry(serviceId: String, serviceInstances: util.List[ServiceInstance]): util.List[ServiceInstance] = {
-    var serviceInstancesInRegistry = SpringCloudFeignConfigurationCache.getDiscoveryClient
-      .getInstances(serviceId).map( instance =>
-      ServiceInstance(serviceId, instance.getHost + ":" + instance.getPort)
-    )
+    var serviceInstancesInRegistry = ServiceInstanceUtils.getRPCServerLoader.getServiceInstances(serviceId)
     serviceInstances.foreach(serviceInstance => {
       serviceInstancesInRegistry = serviceInstancesInRegistry.filterNot(_.equals(serviceInstance))
     })
-    serviceInstancesInRegistry
+    if (null == serviceInstancesInRegistry) {
+      new util.ArrayList[ServiceInstance]()
+    } else {
+      serviceInstancesInRegistry.toList
+    }
   }
 }