-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HBASE-28547 Support specifying connection configuration through queri…
…es of the connection uri (#5853) Signed-off-by: Nick Dimiduk <ndimiduk@apache.org> (cherry picked from commit 2dc7e15)
- Loading branch information
Showing
4 changed files
with
238 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
...nt/src/test/java/org/apache/hadoop/hbase/client/TestConnectionFactoryApplyURIQueries.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| * 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.hadoop.hbase.client; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.mockito.ArgumentMatchers.any; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.mockStatic; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| import java.net.URI; | ||
| import java.util.concurrent.CompletableFuture; | ||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.hbase.HBaseClassTestRule; | ||
| import org.apache.hadoop.hbase.HBaseConfiguration; | ||
| import org.apache.hadoop.hbase.testclassification.ClientTests; | ||
| import org.apache.hadoop.hbase.testclassification.SmallTests; | ||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.ClassRule; | ||
| import org.junit.Test; | ||
| import org.junit.experimental.categories.Category; | ||
| import org.mockito.ArgumentCaptor; | ||
| import org.mockito.MockedStatic; | ||
|
|
||
| @Category({ ClientTests.class, SmallTests.class }) | ||
| public class TestConnectionFactoryApplyURIQueries { | ||
|
|
||
| @ClassRule | ||
| public static final HBaseClassTestRule CLASS_RULE = | ||
| HBaseClassTestRule.forClass(TestConnectionFactoryApplyURIQueries.class); | ||
|
|
||
| private Configuration conf; | ||
|
|
||
| private MockedStatic<ConnectionRegistryFactory> mockedConnectionRegistryFactory; | ||
|
|
||
| private ConnectionRegistry registry; | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| conf = HBaseConfiguration.create(); | ||
| mockedConnectionRegistryFactory = mockStatic(ConnectionRegistryFactory.class); | ||
| registry = mock(ConnectionRegistry.class); | ||
| mockedConnectionRegistryFactory | ||
| .when(() -> ConnectionRegistryFactory.create(any(), any(), any())).thenReturn(registry); | ||
| when(registry.getClusterId()).thenReturn(CompletableFuture.completedFuture("cluster")); | ||
| } | ||
|
|
||
| @After | ||
| public void tearDown() { | ||
| mockedConnectionRegistryFactory.closeOnDemand(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testApplyURIQueries() throws Exception { | ||
| ConnectionFactory.createConnection(new URI("hbase+rpc://server:16010?a=1&b=2&c"), conf); | ||
| ArgumentCaptor<Configuration> captor = ArgumentCaptor.forClass(Configuration.class); | ||
| mockedConnectionRegistryFactory | ||
| .verify(() -> ConnectionRegistryFactory.create(any(), captor.capture(), any())); | ||
| Configuration c = captor.getValue(); | ||
| assertEquals("1", c.get("a")); | ||
| assertEquals("2", c.get("b")); | ||
| assertEquals("", c.get("c")); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestStrings.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| /* | ||
| * 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.hadoop.hbase.util; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertNull; | ||
| import static org.junit.Assert.assertThrows; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| import java.net.URI; | ||
| import java.net.URLEncoder; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.util.Map; | ||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.hbase.HBaseClassTestRule; | ||
| import org.apache.hadoop.hbase.testclassification.SmallTests; | ||
| import org.junit.ClassRule; | ||
| import org.junit.Test; | ||
| import org.junit.experimental.categories.Category; | ||
|
|
||
| @Category({ SmallTests.class }) | ||
| public class TestStrings { | ||
|
|
||
| @ClassRule | ||
| public static final HBaseClassTestRule CLASS_RULE = | ||
| HBaseClassTestRule.forClass(TestStrings.class); | ||
|
|
||
| @Test | ||
| public void testAppendKeyValue() { | ||
| assertEquals("foo, bar=baz", | ||
| Strings.appendKeyValue(new StringBuilder("foo"), "bar", "baz").toString()); | ||
| assertEquals("bar->baz", | ||
| Strings.appendKeyValue(new StringBuilder(), "bar", "baz", "->", "| ").toString()); | ||
| assertEquals("foo, bar=baz", | ||
| Strings.appendKeyValue(new StringBuilder("foo"), "bar", "baz", "=", ", ").toString()); | ||
| assertEquals("foo| bar->baz", | ||
| Strings.appendKeyValue(new StringBuilder("foo"), "bar", "baz", "->", "| ").toString()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testDomainNamePointerToHostName() { | ||
| assertNull(Strings.domainNamePointerToHostName(null)); | ||
| assertEquals("foo", Strings.domainNamePointerToHostName("foo")); | ||
| assertEquals("foo.com", Strings.domainNamePointerToHostName("foo.com")); | ||
| assertEquals("foo.bar.com", Strings.domainNamePointerToHostName("foo.bar.com")); | ||
| assertEquals("foo.bar.com", Strings.domainNamePointerToHostName("foo.bar.com.")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testPadFront() { | ||
| assertEquals("ddfoo", Strings.padFront("foo", 'd', 5)); | ||
| assertThrows(IllegalArgumentException.class, () -> Strings.padFront("foo", 'd', 1)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testParseURIQueries() throws Exception { | ||
| Map<String, | ||
| String> queries = Strings.parseURIQueries(new URI("hbase+rpc://server01:123?a=1&b=2&a=3&" | ||
| + URLEncoder.encode("& ?", StandardCharsets.UTF_8.name()) + "=&" | ||
| + URLEncoder.encode("===", StandardCharsets.UTF_8.name()))); | ||
| assertEquals("1", queries.get("a")); | ||
| assertEquals("2", queries.get("b")); | ||
| assertEquals("", queries.get("& ?")); | ||
| assertEquals("", queries.get("===")); | ||
| assertEquals(4, queries.size()); | ||
|
|
||
| assertTrue(Strings.parseURIQueries(new URI("hbase+zk://zk1:2181/")).isEmpty()); | ||
| assertTrue(Strings.parseURIQueries(new URI("hbase+zk://zk1:2181/?")).isEmpty()); | ||
| assertTrue(Strings.parseURIQueries(new URI("hbase+zk://zk1:2181/?#anchor")).isEmpty()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testApplyURIQueriesToConf() throws Exception { | ||
| Configuration conf = new Configuration(); | ||
| Strings.applyURIQueriesToConf(new URI("hbase+zk://aaa:2181/root?a=1&b=2&c"), conf); | ||
| assertEquals("1", conf.get("a")); | ||
| assertEquals("2", conf.get("b")); | ||
| assertEquals("", conf.get("c")); | ||
| } | ||
| } |