From 555ccb5da01e05151cd300f7cd7903b1dea0dbdf Mon Sep 17 00:00:00 2001 From: hongdongdong Date: Mon, 31 Oct 2022 11:32:42 +0800 Subject: [PATCH] [KYUUBI #3714] Use ServicesResourceTransformer to concatenating service entries ### _Why are the changes needed?_ ### _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.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request Closes #3714 from hddong/use-ServicesResourceTransformer. Closes #3714 d4c0ed27 [hongdongdong] Use ServicesResourceTransformer to concatenating service entries Authored-by: hongdongdong Signed-off-by: Cheng Pan --- externals/kyuubi-spark-sql-engine/pom.xml | 3 +++ .../services/io.grpc.LoadBalancerProvider | 20 ------------------ .../services/io.grpc.NameResolverProvider | 21 ------------------- 3 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider delete mode 100644 externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/io.grpc.NameResolverProvider diff --git a/externals/kyuubi-spark-sql-engine/pom.xml b/externals/kyuubi-spark-sql-engine/pom.xml index 55709cd79..90034933d 100644 --- a/externals/kyuubi-spark-sql-engine/pom.xml +++ b/externals/kyuubi-spark-sql-engine/pom.xml @@ -324,6 +324,9 @@ + + + diff --git a/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider b/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider deleted file mode 100644 index 9d194dceb..000000000 --- a/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider +++ /dev/null @@ -1,20 +0,0 @@ -# -# 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. -# - -io.grpc.internal.PickFirstLoadBalancerProvider -io.grpc.util.SecretRoundRobinLoadBalancerProvider$Provider -io.grpc.grpclb.GrpclbLoadBalancerProvider diff --git a/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/io.grpc.NameResolverProvider b/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/io.grpc.NameResolverProvider deleted file mode 100644 index 46b5718ff..000000000 --- a/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/io.grpc.NameResolverProvider +++ /dev/null @@ -1,21 +0,0 @@ -# -# 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. -# - -io.etcd.jetcd.resolver.DnsSrvResolverProvider -io.etcd.jetcd.resolver.HttpResolverProvider -io.etcd.jetcd.resolver.HttpsResolverProvider -io.etcd.jetcd.resolver.IPResolverProvider