Skip to content

Commit 2762f2d

Browse files
codelipenghuicodelipenghui
authored
Using the consistent metadata store scheme name. (#13937)
Using the consistent metadata store scheme name. - RocksDB -> rocksdb: - ZooKeeper -> zk: - Memory -> memory: - Ectd -> etcd: Context: #13225 (comment)
1 parent 7c8f575 commit 2762f2d

File tree

18 files changed

+36
-35
lines changed

18 files changed

+36
-35
lines changed

‎managed-ledger/src/test/java/org/apache/bookkeeper/test/MockedBookKeeperTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public MockedBookKeeperTestCase(int numBookies) {
6767
public final void setUp(Method method) throws Exception {
6868
LOG.info(">>>>>> starting {}", method);
6969
metadataStore = new FaultInjectionMetadataStore(
70-
MetadataStoreExtended.create("memory://local", MetadataStoreConfig.builder().build()));
70+
MetadataStoreExtended.create("memory:local", MetadataStoreConfig.builder().build()));
7171

7272
try {
7373
// start bookkeeper service

‎pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/BookieRackAffinityMappingTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class BookieRackAffinityMappingTest {
4949

5050
@BeforeMethod
5151
public void setUp() throws Exception {
52-
store = MetadataStoreFactory.create("memory://local", MetadataStoreConfig.builder().build());
52+
store = MetadataStoreFactory.create("memory:local", MetadataStoreConfig.builder().build());
5353
BOOKIE1 = new BookieSocketAddress("127.0.0.1:3181");
5454
BOOKIE2 = new BookieSocketAddress("127.0.0.2:3181");
5555
BOOKIE3 = new BookieSocketAddress("127.0.0.3:3181");

‎pulsar-broker-common/src/test/java/org/apache/pulsar/bookie/rackawareness/IsolatedBookieEnsemblePlacementPolicyTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public class IsolatedBookieEnsemblePlacementPolicyTest {
7070
@BeforeMethod
7171
public void setUp() throws Exception {
7272
timer = new HashedWheelTimer();
73-
store = MetadataStoreFactory.create("memory://local", MetadataStoreConfig.builder().build());
73+
store = MetadataStoreFactory.create("memory:local", MetadataStoreConfig.builder().build());
7474

7575
writableBookies.add(new BookieSocketAddress(BOOKIE1).toBookieId());
7676
writableBookies.add(new BookieSocketAddress(BOOKIE2).toBookieId());

‎pulsar-broker/src/test/java/org/apache/pulsar/broker/cache/BundlesQuotasTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class BundlesQuotasTest {
4444

4545
@BeforeMethod
4646
public void setup() throws Exception {
47-
store = MetadataStoreFactory.create("memory://local", MetadataStoreConfig.builder().build());
47+
store = MetadataStoreFactory.create("memory:local", MetadataStoreConfig.builder().build());
4848

4949
PulsarService pulsar = mock(PulsarService.class);
5050
when(pulsar.getLocalMetadataStore()).thenReturn(mock(MetadataStoreExtended.class));

‎pulsar-broker/src/test/java/org/apache/pulsar/broker/service/DistributedIdGeneratorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class DistributedIdGeneratorTest {
4646

4747
@BeforeMethod(alwaysRun = true)
4848
public void setup() throws Exception {
49-
store = MetadataStoreExtended.create("memory://local", MetadataStoreConfig.builder().build());
49+
store = MetadataStoreExtended.create("memory:local", MetadataStoreConfig.builder().build());
5050
coordinationService = new CoordinationServiceImpl(store);
5151
}
5252

‎pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentDispatcherFailoverConsumerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public void setup() throws Exception {
125125
.when(pulsar).getBookKeeperClient();
126126
eventLoopGroup = new NioEventLoopGroup();
127127

128-
store = MetadataStoreFactory.create("memory://local", MetadataStoreConfig.builder().build());
128+
store = MetadataStoreFactory.create("memory:local", MetadataStoreConfig.builder().build());
129129
doReturn(store).when(pulsar).getLocalMetadataStore();
130130
doReturn(store).when(pulsar).getConfigurationMetadataStore();
131131

‎pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionMetadataStoreTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class PulsarFunctionMetadataStoreTest extends PulsarFunctionLocalRunTest
3434
protected WorkerConfig createWorkerConfig(ServiceConfiguration config) {
3535
WorkerConfig wc = super.createWorkerConfig(config);
3636
wc.setStateStorageProviderImplementation(PulsarMetadataStateStoreProviderImpl.class.getName());
37-
wc.setStateStorageServiceUrl("memory://local");
37+
wc.setStateStorageServiceUrl("memory:local");
3838
return wc;
3939
}
4040

‎pulsar-functions/instance/src/test/java/org/apache/pulsar/functions/instance/state/PulsarMetadataStateStoreImplTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class PulsarMetadataStateStoreImplTest {
5050

5151
@BeforeMethod
5252
public void setup() throws Exception {
53-
this.store = MetadataStoreFactory.create("memory://local", MetadataStoreConfig.builder().build());
53+
this.store = MetadataStoreFactory.create("memory:local", MetadataStoreConfig.builder().build());
5454
this.countersCache = store.getMetadataCache(Long.class);
5555
this.stateContext = new PulsarMetadataStateStoreImpl(store, "/prefix", TENANT, NS, NAME);
5656
}

‎pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/LocalMemoryMetadataStore.java

+4-11
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
package org.apache.pulsar.metadata.impl;
2020

2121
import com.google.common.collect.MapMaker;
22-
import java.net.URI;
23-
import java.net.URISyntaxException;
2422
import java.util.ArrayList;
2523
import java.util.EnumSet;
2624
import java.util.HashSet;
@@ -51,6 +49,8 @@
5149
@Slf4j
5250
public class LocalMemoryMetadataStore extends AbstractMetadataStore implements MetadataStoreExtended {
5351

52+
static final String MEMORY_SCHEME_IDENTIFIER = "memory:";
53+
5454
@Data
5555
private static class Value {
5656
final long version;
@@ -73,20 +73,13 @@ private static class Value {
7373

7474
public LocalMemoryMetadataStore(String metadataURL, MetadataStoreConfig metadataStoreConfig)
7575
throws MetadataStoreException {
76-
URI uri;
77-
try {
78-
uri = new URI(metadataURL);
79-
} catch (URISyntaxException e) {
80-
throw new MetadataStoreException(e);
81-
}
82-
76+
String name = metadataURL.substring(MEMORY_SCHEME_IDENTIFIER.length());
8377
// Local means a private data set
84-
if ("local".equals(uri.getHost())) {
78+
if ("local".equals(name)) {
8579
map = new TreeMap<>();
8680
sequentialIdGenerator = new AtomicLong();
8781
} else {
8882
// Use a reference from a shared data set
89-
String name = uri.getHost();
9083
map = STATIC_MAPS.computeIfAbsent(name, __ -> new TreeMap<>());
9184
STATIC_INSTANCE.compute(name, (key, value) -> {
9285
if (value == null) {

‎pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/MetadataStoreFactoryImpl.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,15 @@ private static MetadataStore newInstance(String metadataURL, MetadataStoreConfig
4646
boolean enableSessionWatcher)
4747
throws MetadataStoreException {
4848

49-
if (metadataURL.startsWith("memory://")) {
49+
if (metadataURL.startsWith(LocalMemoryMetadataStore.MEMORY_SCHEME_IDENTIFIER)) {
5050
return new LocalMemoryMetadataStore(metadataURL, metadataStoreConfig);
51-
} else if (metadataURL.startsWith("rocksdb://")) {
51+
} else if (metadataURL.startsWith(RocksdbMetadataStore.ROCKSDB_SCHEME_IDENTIFIER)) {
5252
return RocksdbMetadataStore.get(metadataURL, metadataStoreConfig);
5353
} else if (metadataURL.startsWith(EtcdMetadataStore.ETCD_SCHEME_IDENTIFIER)) {
5454
return new EtcdMetadataStore(metadataURL, metadataStoreConfig, enableSessionWatcher);
55+
} else if (metadataURL.startsWith(ZKMetadataStore.ZK_SCHEME_IDENTIFIER)) {
56+
return new ZKMetadataStore(metadataURL.substring(ZKMetadataStore.ZK_SCHEME_IDENTIFIER.length()),
57+
metadataStoreConfig, enableSessionWatcher);
5558
} else {
5659
return new ZKMetadataStore(metadataURL, metadataStoreConfig, enableSessionWatcher);
5760
}

‎pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/RocksdbMetadataStore.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@
7272
*/
7373
@Slf4j
7474
public class RocksdbMetadataStore extends AbstractMetadataStore {
75+
76+
static final String ROCKSDB_SCHEME_IDENTIFIER = "rocksdb:";
77+
7578
private static final byte[] SEQUENTIAL_ID_KEY = toBytes("__metadata_sequentialId_key");
7679
private static final byte[] INSTANCE_ID_KEY = toBytes("__metadata_instanceId_key");
7780

@@ -200,7 +203,7 @@ static long toLong(byte[] bytes) {
200203
private final String metadataUrl;
201204

202205
/**
203-
* @param metadataURL format "rocksdb://{storePath}"
206+
* @param metadataURL format "rocksdb:{storePath}"
204207
* @param metadataStoreConfig
205208
* @throws MetadataStoreException
206209
*/
@@ -213,7 +216,7 @@ private RocksdbMetadataStore(String metadataURL, MetadataStoreConfig metadataSto
213216
throw new MetadataStoreException("Failed to load RocksDB JNI library", t);
214217
}
215218

216-
String dataDir = metadataURL.substring("rocksdb://".length());
219+
String dataDir = metadataURL.substring("rocksdb:".length());
217220
Path dataPath = FileSystems.getDefault().getPath(dataDir);
218221
try {
219222
Files.createDirectories(dataPath);

‎pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/ZKMetadataStore.java

+2
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@
6868
public class ZKMetadataStore extends AbstractBatchedMetadataStore
6969
implements MetadataStoreExtended, MetadataStoreLifecycle {
7070

71+
static final String ZK_SCHEME_IDENTIFIER = "zk:";
72+
7173
private final String metadataURL;
7274
private final MetadataStoreConfig metadataStoreConfig;
7375
private final boolean isZkManaged;

‎pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public Object[][] implementations() {
7575
// Supplier<String> lambda is used for providing the value.
7676
return new Object[][]{
7777
{ "ZooKeeper", stringSupplier(() -> zks.getConnectionString()) },
78-
{ "Memory", stringSupplier(() -> "memory://" + UUID.randomUUID()) },
79-
{ "RocksDB", stringSupplier(() -> "rocksdb://" + createTempFolder()) },
78+
{ "Memory", stringSupplier(() -> "memory:" + UUID.randomUUID()) },
79+
{ "RocksDB", stringSupplier(() -> "rocksdb:" + createTempFolder()) },
8080
{"Etcd", stringSupplier(() -> "etcd:" + etcdCluster.getClientEndpoints().stream().map(x -> x.toString())
8181
.collect(Collectors.joining(",")))},
8282
};

‎pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/LocalMemoryMetadataStoreTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ public class LocalMemoryMetadataStoreTest {
3535
@Test
3636
public void testPrivateInstance() throws Exception {
3737
@Cleanup
38-
MetadataStore store1 = MetadataStoreFactory.create("memory://local",
38+
MetadataStore store1 = MetadataStoreFactory.create("memory:local",
3939
MetadataStoreConfig.builder().build());
4040

4141
@Cleanup
42-
MetadataStore store2 = MetadataStoreFactory.create("memory://local",
42+
MetadataStore store2 = MetadataStoreFactory.create("memory:local",
4343
MetadataStoreConfig.builder().build());
4444

4545
store1.put("/test", "value".getBytes(StandardCharsets.UTF_8), Optional.empty()).join();
@@ -50,7 +50,7 @@ public void testPrivateInstance() throws Exception {
5050

5151
@Test
5252
public void testSharedInstance() throws Exception {
53-
String url = "memory://" + UUID.randomUUID();
53+
String url = "memory:" + UUID.randomUUID();
5454

5555
@Cleanup
5656
MetadataStore store1 = MetadataStoreFactory.create(url,

‎pulsar-metadata/src/test/java/org/apache/pulsar/metadata/impl/RocksdbMetadataStoreTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void testOpenDbWithConfigFile() throws Exception {
7070
String optionFilePath =
7171
getClass().getClassLoader().getResource("rocksdb_option_file_example.ini").getPath();
7272
log.info("optionFilePath={}", optionFilePath);
73-
store = MetadataStoreFactory.create("rocksdb://" + tempDir.toAbsolutePath(),
73+
store = MetadataStoreFactory.create("rocksdb:" + tempDir.toAbsolutePath(),
7474
MetadataStoreConfig.builder().configFilePath(optionFilePath).build());
7575
Assert.assertTrue(store instanceof RocksdbMetadataStore);
7676

@@ -97,7 +97,7 @@ public void testOpenDbWithConfigFile() throws Exception {
9797

9898
//reopen db
9999
store.close();
100-
store = MetadataStoreFactory.create("rocksdb://" + tempDir.toAbsolutePath(),
100+
store = MetadataStoreFactory.create("rocksdb:" + tempDir.toAbsolutePath(),
101101
MetadataStoreConfig.builder().configFilePath(optionFilePath).build());
102102

103103
//test get
@@ -118,10 +118,10 @@ public void testMultipleInstances() throws Exception {
118118

119119
Path tempDir = Files.createTempDirectory("RocksdbMetadataStoreTest");
120120
log.info("Temp dir:{}", tempDir.toAbsolutePath());
121-
MetadataStore store1 = MetadataStoreFactory.create("rocksdb://" + tempDir.toAbsolutePath(),
121+
MetadataStore store1 = MetadataStoreFactory.create("rocksdb:" + tempDir.toAbsolutePath(),
122122
MetadataStoreConfig.builder().build());
123123

124-
MetadataStore store2 = MetadataStoreFactory.create("rocksdb://" + tempDir.toAbsolutePath(),
124+
MetadataStore store2 = MetadataStoreFactory.create("rocksdb:" + tempDir.toAbsolutePath(),
125125
MetadataStoreConfig.builder().build());
126126

127127
// We should get the same instance

‎pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/bookkeeper/test/MockedBookKeeperTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public MockedBookKeeperTestCase(int numBookies) {
7070
@BeforeMethod(alwaysRun = true)
7171
public void setUp(Method method) throws Exception {
7272
LOG.info(">>>>>> starting {}", method);
73-
metadataStore = new FaultInjectionMetadataStore(MetadataStoreExtended.create("memory://local",
73+
metadataStore = new FaultInjectionMetadataStore(MetadataStoreExtended.create("memory:local",
7474
MetadataStoreConfig.builder().build()));
7575
try {
7676
// start bookkeeper service

‎pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/test/MockedBookKeeperTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public MockedBookKeeperTestCase(int numBookies) {
7070
@BeforeMethod(alwaysRun = true)
7171
public void setUp(Method method) throws Exception {
7272
LOG.info(">>>>>> starting {}", method);
73-
metadataStore = new FaultInjectionMetadataStore(MetadataStoreExtended.create("memory://local",
73+
metadataStore = new FaultInjectionMetadataStore(MetadataStoreExtended.create("memory:local",
7474
MetadataStoreConfig.builder().build()));
7575
try {
7676
// start bookkeeper service

‎pulsar-websocket/src/test/resources/websocket.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
### --- Web Socket proxy settings --- ###
2121

2222
# Configuration Store connection string
23-
configurationStoreServers=memory://127.0.0.1:2181
23+
configurationStoreServers=memory:127.0.0.1:2181
2424

2525
# Zookeeper session timeout in milliseconds
2626
zooKeeperSessionTimeoutMillis=30000

0 commit comments

Comments
 (0)