You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ya...@apache.org on 2021/12/06 09:07:20 UTC

[incubator-kyuubi] branch master updated: [KYUUBI #1505] Move ServiceNodeInfo to a separate file

This is an automated email from the ASF dual-hosted git repository.

yao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git


The following commit(s) were added to refs/heads/master by this push:
     new 542cead  [KYUUBI #1505] Move ServiceNodeInfo to a separate file
542cead is described below

commit 542ceadcf30fea3e01f1712af2ca14d5b6a37d2e
Author: hongdongdong <ho...@cmss.chinamobile.com>
AuthorDate: Mon Dec 6 17:07:11 2021 +0800

    [KYUUBI #1505] Move ServiceNodeInfo to a separate file
    
    <!--
    Thanks for sending a pull request!
    
    Here are some tips for you:
      1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html
      2. If the PR is related to an issue in https://github.com/apache/incubator-kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'.
      3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'.
    -->
    
    ### _Why are the changes needed?_
    <!--
    Please clarify why the changes are needed. For instance,
      1. If you add a feature, you can talk about the use case of it.
      2. If you fix a bug, you can clarify why it is a bug.
    -->
    Decouple zookeeper #1392
    
    ### _How was this patch tested?_
    - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible
    
    - [ ] Add screenshots for manual tests if appropriate
    
    - [X] [Run test](https://kyuubi.readthedocs.io/en/latest/develop_tools/testing.html#running-tests) locally before make a pull request
    
    Closes #1506 from hddong/move-serviceNodeInfo.
    
    Closes #1505
    
    7bd7f18d [hongdongdong] [KYUUBI #1505] Move ServiceNodeInfo to a separate file
    
    Authored-by: hongdongdong <ho...@cmss.chinamobile.com>
    Signed-off-by: Kent Yao <ya...@apache.org>
---
 .../apache/kyuubi/ha/client/ServiceDiscovery.scala | 10 --------
 .../apache/kyuubi/ha/client/ServiceNodeInfo.scala  | 28 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/ServiceDiscovery.scala b/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/ServiceDiscovery.scala
index 13b0dd1..0bb5aa1 100644
--- a/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/ServiceDiscovery.scala
+++ b/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/ServiceDiscovery.scala
@@ -153,13 +153,3 @@ object ServiceDiscovery extends Logging {
     createServiceNode(conf, zkClient, namespace, instance, version, external).getActualPath
   }
 }
-
-case class ServiceNodeInfo(
-    namespace: String,
-    nodeName: String,
-    host: String,
-    port: Int,
-    version: Option[String],
-    engineRefId: Option[String]) {
-  def instance: String = s"$host:$port"
-}
diff --git a/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/ServiceNodeInfo.scala b/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/ServiceNodeInfo.scala
new file mode 100644
index 0000000..69f0840
--- /dev/null
+++ b/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/ServiceNodeInfo.scala
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+package org.apache.kyuubi.ha.client
+
+case class ServiceNodeInfo(
+    namespace: String,
+    nodeName: String,
+    host: String,
+    port: Int,
+    version: Option[String],
+    engineRefId: Option[String]) {
+  def instance: String = s"$host:$port"
+}