You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by si...@apache.org on 2018/06/04 22:04:01 UTC
[bookkeeper] 07/09: [TABLE SERVICE] cleanup : cleanup protobuf
definitions
This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch branch-4.7
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit d8f7cc01c8af9465082c23080715893f4ebc277c
Author: Sijie Guo <si...@apache.org>
AuthorDate: Wed May 30 23:26:08 2018 -0700
[TABLE SERVICE] cleanup : cleanup protobuf definitions
Descriptions of the changes in this PR:
*Motivation*
There are some unused fields and some fields that were not renamed correctly from col to namespace.
*Solution*
This is a cleanup PR to remove unused fields and rename "col" to "ns" or "namespace".
Author: Sijie Guo <si...@apache.org>
Reviewers: Enrico Olivelli <eo...@gmail.com>, Jia Zhai <None>
This closes #1457 from sijie/cleanup_fields
---
.../clients/impl/internal/RootRangeClientImpl.java | 4 +-
.../TestRootRangeClientCreateNamespaceRpc.java | 2 +-
.../TestRootRangeClientGetNamespaceRpc.java | 2 +-
.../stream/protocol/util/ProtoUtils.java | 66 +++++++++++-----------
stream/proto/src/main/proto/storage.proto | 14 ++---
stream/proto/src/main/proto/stream.proto | 16 ++++--
.../stream/protocol/util/TestProtoUtils.java | 24 +++++---
.../storage/impl/metadata/RootRangeStoreImpl.java | 27 ++++-----
.../impl/TestStorageContainerStoreImpl.java | 2 +-
.../impl/grpc/TestGrpcRootRangeService.java | 35 ++++--------
.../impl/metadata/TestRootRangeStoreImpl.java | 27 +++++----
11 files changed, 108 insertions(+), 111 deletions(-)
diff --git a/stream/clients/java/base/src/main/java/org/apache/bookkeeper/clients/impl/internal/RootRangeClientImpl.java b/stream/clients/java/base/src/main/java/org/apache/bookkeeper/clients/impl/internal/RootRangeClientImpl.java
index 72bb0e1..a8e2603 100644
--- a/stream/clients/java/base/src/main/java/org/apache/bookkeeper/clients/impl/internal/RootRangeClientImpl.java
+++ b/stream/clients/java/base/src/main/java/org/apache/bookkeeper/clients/impl/internal/RootRangeClientImpl.java
@@ -123,7 +123,7 @@ class RootRangeClientImpl implements RootRangeClient {
CompletableFuture<NamespaceProperties> createNamespaceFuture) {
StatusCode code = response.getCode();
if (StatusCode.SUCCESS == code) {
- createNamespaceFuture.complete(response.getColProps());
+ createNamespaceFuture.complete(response.getNsProps());
return;
}
createNamespaceFuture.completeExceptionally(createRootRangeException(namespace, code));
@@ -161,7 +161,7 @@ class RootRangeClientImpl implements RootRangeClient {
CompletableFuture<NamespaceProperties> getFuture) {
StatusCode code = response.getCode();
if (StatusCode.SUCCESS == code) {
- getFuture.complete(response.getColProps());
+ getFuture.complete(response.getNsProps());
return;
}
getFuture.completeExceptionally(createRootRangeException(namespace, code));
diff --git a/stream/clients/java/base/src/test/java/org/apache/bookkeeper/clients/impl/internal/TestRootRangeClientCreateNamespaceRpc.java b/stream/clients/java/base/src/test/java/org/apache/bookkeeper/clients/impl/internal/TestRootRangeClientCreateNamespaceRpc.java
index 4c605d1..111ac66 100644
--- a/stream/clients/java/base/src/test/java/org/apache/bookkeeper/clients/impl/internal/TestRootRangeClientCreateNamespaceRpc.java
+++ b/stream/clients/java/base/src/test/java/org/apache/bookkeeper/clients/impl/internal/TestRootRangeClientCreateNamespaceRpc.java
@@ -82,7 +82,7 @@ public class TestRootRangeClientCreateNamespaceRpc extends RootRangeClientImplTe
StreamObserver<CreateNamespaceResponse> responseObserver) {
responseObserver.onNext(CreateNamespaceResponse.newBuilder()
.setCode(StatusCode.SUCCESS)
- .setColProps(colProps)
+ .setNsProps(colProps)
.build());
responseObserver.onCompleted();
}
diff --git a/stream/clients/java/base/src/test/java/org/apache/bookkeeper/clients/impl/internal/TestRootRangeClientGetNamespaceRpc.java b/stream/clients/java/base/src/test/java/org/apache/bookkeeper/clients/impl/internal/TestRootRangeClientGetNamespaceRpc.java
index 9301995..edbfeec 100644
--- a/stream/clients/java/base/src/test/java/org/apache/bookkeeper/clients/impl/internal/TestRootRangeClientGetNamespaceRpc.java
+++ b/stream/clients/java/base/src/test/java/org/apache/bookkeeper/clients/impl/internal/TestRootRangeClientGetNamespaceRpc.java
@@ -82,7 +82,7 @@ public class TestRootRangeClientGetNamespaceRpc extends RootRangeClientImplTestB
StreamObserver<GetNamespaceResponse> responseObserver) {
responseObserver.onNext(GetNamespaceResponse.newBuilder()
.setCode(StatusCode.SUCCESS)
- .setColProps(colProps)
+ .setNsProps(colProps)
.build());
responseObserver.onCompleted();
}
diff --git a/stream/proto/src/main/java/org/apache/bookkeeper/stream/protocol/util/ProtoUtils.java b/stream/proto/src/main/java/org/apache/bookkeeper/stream/protocol/util/ProtoUtils.java
index 687388f..46de480 100644
--- a/stream/proto/src/main/java/org/apache/bookkeeper/stream/protocol/util/ProtoUtils.java
+++ b/stream/proto/src/main/java/org/apache/bookkeeper/stream/protocol/util/ProtoUtils.java
@@ -19,6 +19,7 @@ package org.apache.bookkeeper.stream.protocol.util;
import static com.google.common.base.Preconditions.checkArgument;
+import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import java.util.List;
import org.apache.bookkeeper.common.util.Revisioned;
@@ -42,7 +43,6 @@ import org.apache.bookkeeper.stream.proto.storage.OneStorageContainerEndpointReq
import org.apache.bookkeeper.stream.proto.storage.OneStorageContainerEndpointResponse;
import org.apache.bookkeeper.stream.proto.storage.StatusCode;
import org.apache.bookkeeper.stream.proto.storage.StorageContainerEndpoint;
-import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
/**
@@ -89,37 +89,37 @@ public class ProtoUtils {
}
/**
- * Validate namespace characters are [a-zA-Z_0-9].
+ * Validate namespace name.
*
* @return true if it is a valid namespace name. otherwise false.
*/
public static boolean validateNamespaceName(String name) {
- if (StringUtils.isBlank(name)) {
- return false;
- }
- for (int i = 0; i < name.length(); i++) {
- if (Character.isLetterOrDigit(name.charAt(i)) || name.charAt(i) == '_') {
- continue;
- }
- return false;
- }
- return true;
+ return validateStreamName(name);
}
/**
- * Validate namespace characters are [a-zA-Z_0-9].
+ * Validate stream name.
+ *
+ * <p>follow the rules that dlog uses for validating stream name.
*
* @return true if it is a valid namespace name. otherwise false.
*/
public static boolean validateStreamName(String name) {
- if (StringUtils.isBlank(name)) {
+ if (Strings.isNullOrEmpty(name)) {
return false;
}
for (int i = 0; i < name.length(); i++) {
- if (Character.isLetterOrDigit(name.charAt(i)) || name.charAt(i) == '_') {
- continue;
+ char c = name.charAt(i);
+ if (c == 0
+ || c == ' '
+ || c == '<'
+ || c == '>'
+ || c > '\u0000' && c < '\u001f'
+ || c > '\u007f' && c < '\u009f'
+ || c > '\ud800' && c < '\uf8ff'
+ || c > '\ufff0' && c < '\uffff') {
+ return false;
}
- return false;
}
return true;
}
@@ -243,15 +243,15 @@ public class ProtoUtils {
/**
* Create a {@link CreateNamespaceRequest}.
*
- * @param colName namespace name
- * @param colConf namespace conf
+ * @param nsName namespace name
+ * @param nsConf namespace conf
* @return a create namespace request.
*/
- public static CreateNamespaceRequest createCreateNamespaceRequest(String colName,
- NamespaceConfiguration colConf) {
+ public static CreateNamespaceRequest createCreateNamespaceRequest(String nsName,
+ NamespaceConfiguration nsConf) {
return CreateNamespaceRequest.newBuilder()
- .setName(colName)
- .setColConf(colConf)
+ .setName(nsName)
+ .setNsConf(nsConf)
.build();
}
@@ -286,16 +286,16 @@ public class ProtoUtils {
/**
* Create a {@link CreateStreamRequest}.
*
- * @param colName namespace name
+ * @param nsName namespace name
* @param streamName stream name
* @param streamConf stream configuration
* @return a create stream request.
*/
- public static CreateStreamRequest createCreateStreamRequest(String colName,
+ public static CreateStreamRequest createCreateStreamRequest(String nsName,
String streamName,
StreamConfiguration streamConf) {
return CreateStreamRequest.newBuilder()
- .setColName(colName)
+ .setNsName(nsName)
.setName(streamName)
.setStreamConf(streamConf)
.build();
@@ -304,14 +304,15 @@ public class ProtoUtils {
/**
* Create a {@link GetStreamRequest}.
*
- * @param colName namespace name
+ * @param nsName namespace name
* @param streamName stream name
* @return a create stream request.
*/
- public static GetStreamRequest createGetStreamRequest(String colName, String streamName) {
+ public static GetStreamRequest createGetStreamRequest(String nsName,
+ String streamName) {
return GetStreamRequest.newBuilder()
.setStreamName(StreamName.newBuilder()
- .setColName(colName)
+ .setNamespaceName(nsName)
.setStreamName(streamName))
.build();
}
@@ -331,14 +332,15 @@ public class ProtoUtils {
/**
* Create a {@link DeleteStreamRequest}.
*
- * @param colName namespace name
+ * @param nsName namespace name
* @param streamName stream name
* @return a create stream request.
*/
- public static DeleteStreamRequest createDeleteStreamRequest(String colName, String streamName) {
+ public static DeleteStreamRequest createDeleteStreamRequest(String nsName,
+ String streamName) {
return DeleteStreamRequest.newBuilder()
.setName(streamName)
- .setColName(colName)
+ .setNsName(nsName)
.build();
}
diff --git a/stream/proto/src/main/proto/storage.proto b/stream/proto/src/main/proto/storage.proto
index 7570d29..e33ecbe 100644
--- a/stream/proto/src/main/proto/storage.proto
+++ b/stream/proto/src/main/proto/storage.proto
@@ -112,13 +112,13 @@ service MetaRangeService {
//
message CreateNamespaceRequest {
- string name = 1;
- stream.NamespaceConfiguration col_conf = 2;
+ string name = 1;
+ stream.NamespaceConfiguration ns_conf = 2;
}
message CreateNamespaceResponse {
- StatusCode code = 1;
- stream.NamespaceProperties col_props = 2;
+ StatusCode code = 1;
+ stream.NamespaceProperties ns_props = 2;
}
message DeleteNamespaceRequest {
@@ -135,11 +135,11 @@ message GetNamespaceRequest {
message GetNamespaceResponse {
StatusCode code = 1;
- stream.NamespaceProperties col_props = 2;
+ stream.NamespaceProperties ns_props = 2;
}
message CreateStreamRequest {
- string col_name = 1;
+ string ns_name = 1;
string name = 2;
stream.StreamConfiguration stream_conf = 3;
}
@@ -150,7 +150,7 @@ message CreateStreamResponse {
}
message DeleteStreamRequest {
- string col_name = 1;
+ string ns_name = 1;
string name = 2;
}
diff --git a/stream/proto/src/main/proto/stream.proto b/stream/proto/src/main/proto/stream.proto
index 2477b51..150e30f 100644
--- a/stream/proto/src/main/proto/stream.proto
+++ b/stream/proto/src/main/proto/stream.proto
@@ -55,7 +55,7 @@ message RangeProperties {
enum RangeKeyType {
NULL = 0;
HASH = 1;
- RAW = 2;
+ RAW = 2; // reserved, not implemented yet
}
message RangeMetadata {
@@ -85,6 +85,15 @@ message ParentRangesList {
// Stream
//
+// since stream and table are similar and exchangable,
+// from the beginning, we shared the metadata management
+// between streams and tables and distinguish them using
+// a flag that recorded in metadata.
+enum StorageType {
+ STREAM = 0;
+ TABLE = 1;
+}
+
enum SplitPolicyType {
FIXED = 0;
BANDWIDTH = 1;
@@ -139,8 +148,7 @@ message StreamConfiguration {
SplitPolicy split_policy = 4;
SegmentRollingPolicy rolling_policy = 5;
RetentionPolicy retention_policy = 6;
- string backend_service_url = 7;
- bool is_readonly = 8;
+ StorageType storage_type = 7;
}
message StreamProperties {
@@ -151,7 +159,7 @@ message StreamProperties {
}
message StreamName {
- string col_name = 1;
+ string namespace_name = 1;
string stream_name = 2;
}
diff --git a/stream/proto/src/test/java/org/apache/bookkeeper/stream/protocol/util/TestProtoUtils.java b/stream/proto/src/test/java/org/apache/bookkeeper/stream/protocol/util/TestProtoUtils.java
index 88cc995..9d1b728 100644
--- a/stream/proto/src/test/java/org/apache/bookkeeper/stream/protocol/util/TestProtoUtils.java
+++ b/stream/proto/src/test/java/org/apache/bookkeeper/stream/protocol/util/TestProtoUtils.java
@@ -56,8 +56,13 @@ public class TestProtoUtils {
assertTrue(validateNamespaceName("namespace_name"));
assertTrue(validateNamespaceName("NamespaceName"));
assertTrue(validateNamespaceName("9NamespaceName"));
- assertFalse(validateNamespaceName("namespace-name"));
- assertFalse(validateNamespaceName("!namespace_name"));
+ assertTrue(validateNamespaceName("namespace-name"));
+ assertTrue(validateNamespaceName("!namespace_name"));
+ assertFalse(validateNamespaceName(" namespace_name"));
+ assertFalse(validateNamespaceName("<namespace_name"));
+ assertFalse(validateNamespaceName(">namespace_name"));
+ assertFalse(validateNamespaceName(""));
+ assertFalse(validateNamespaceName(null));
}
@Test
@@ -65,8 +70,13 @@ public class TestProtoUtils {
assertTrue(validateStreamName("stream_name"));
assertTrue(validateStreamName("StreamName"));
assertTrue(validateStreamName("9StreamName"));
- assertFalse(validateStreamName("stream-name"));
- assertFalse(validateStreamName("!stream_name"));
+ assertTrue(validateStreamName("stream-name"));
+ assertTrue(validateStreamName("!stream_name"));
+ assertFalse(validateNamespaceName(" stream_name"));
+ assertFalse(validateNamespaceName("<stream_name"));
+ assertFalse(validateNamespaceName(">stream_name"));
+ assertFalse(validateNamespaceName(""));
+ assertFalse(validateNamespaceName(null));
}
@Test
@@ -184,14 +194,14 @@ public class TestProtoUtils {
@Test
public void testCreateCreateNamespaceRequest() {
- NamespaceConfiguration colConf = NamespaceConfiguration.newBuilder()
+ NamespaceConfiguration nsConf = NamespaceConfiguration.newBuilder()
.setDefaultStreamConf(DEFAULT_STREAM_CONF)
.build();
CreateNamespaceRequest request = createCreateNamespaceRequest(
name.getMethodName(),
- colConf);
+ nsConf);
assertEquals(name.getMethodName(), request.getName());
- assertEquals(colConf, request.getColConf());
+ assertEquals(nsConf, request.getNsConf());
}
@Test
diff --git a/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/metadata/RootRangeStoreImpl.java b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/metadata/RootRangeStoreImpl.java
index 00863b6..4314bce 100644
--- a/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/metadata/RootRangeStoreImpl.java
+++ b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/metadata/RootRangeStoreImpl.java
@@ -22,7 +22,6 @@ import static com.google.common.base.Charsets.UTF_8;
import static org.apache.bookkeeper.stream.protocol.ProtocolConstants.MIN_DATA_STREAM_ID;
import static org.apache.bookkeeper.stream.protocol.util.ProtoUtils.validateNamespaceName;
import static org.apache.bookkeeper.stream.protocol.util.ProtoUtils.validateStreamName;
-import static org.apache.commons.lang3.StringUtils.isBlank;
import com.google.protobuf.InvalidProtocolBufferException;
import java.net.URI;
@@ -220,7 +219,7 @@ public class RootRangeStoreImpl
.setProps(NamespaceProperties.newBuilder()
.setNamespaceId(namespaceId)
.setNamespaceName(nsName)
- .setDefaultStreamConf(request.getColConf().getDefaultStreamConf()))
+ .setDefaultStreamConf(request.getNsConf().getDefaultStreamConf()))
.build();
byte[] nsNameKey = getNamespaceNameKey(nsName);
@@ -246,7 +245,7 @@ public class RootRangeStoreImpl
CreateNamespaceResponse.Builder respBuilder = CreateNamespaceResponse.newBuilder();
if (txnResult.isSuccess()) {
respBuilder.setCode(StatusCode.SUCCESS);
- respBuilder.setColProps(metadata.getProps());
+ respBuilder.setNsProps(metadata.getProps());
} else {
// TODO: differentiate the error code
respBuilder.setCode(StatusCode.INTERNAL_SERVER_ERROR);
@@ -341,7 +340,7 @@ public class RootRangeStoreImpl
nsRespBuilder.setCode(StatusCode.NAMESPACE_NOT_FOUND);
} else {
nsRespBuilder.setCode(StatusCode.SUCCESS);
- nsRespBuilder.setColProps(nsMetadata.getProps());
+ nsRespBuilder.setNsProps(nsMetadata.getProps());
}
return nsRespBuilder.build();
});
@@ -379,7 +378,7 @@ public class RootRangeStoreImpl
@Override
public CompletableFuture<CreateStreamResponse> createStream(CreateStreamRequest request) {
String streamName = request.getName();
- String nsName = request.getColName();
+ String nsName = request.getNsName();
StatusCode code = verifyStreamRequest(nsName, streamName);
if (StatusCode.SUCCESS != code) {
@@ -457,19 +456,11 @@ public class RootRangeStoreImpl
long scId = placementPolicy.placeStreamRange(streamId, 0L);
- StreamConfiguration newStreamConf = streamConf;
- // no backend service url is provided, use the default service url
- if (isBlank(streamConf.getBackendServiceUrl())) {
- newStreamConf = StreamConfiguration.newBuilder(streamConf)
- .setBackendServiceUrl(defaultServiceUri.toString())
- .build();
- }
-
StreamProperties streamProps = StreamProperties.newBuilder()
.setStreamId(streamId)
.setStreamName(streamName)
.setStorageContainerId(scId)
- .setStreamConf(newStreamConf)
+ .setStreamConf(streamConf)
.build();
byte[] nsIdKey = getNamespaceIdKey(nsId);
@@ -519,7 +510,7 @@ public class RootRangeStoreImpl
@Override
public CompletableFuture<DeleteStreamResponse> deleteStream(DeleteStreamRequest request) {
String streamName = request.getName();
- String nsName = request.getColName();
+ String nsName = request.getNsName();
StatusCode code = verifyStreamRequest(nsName, streamName);
if (StatusCode.SUCCESS != code) {
@@ -599,12 +590,14 @@ public class RootRangeStoreImpl
public CompletableFuture<GetStreamResponse> getStream(GetStreamRequest request) {
StreamName streamName = request.getStreamName();
- StatusCode code = verifyStreamRequest(streamName.getColName(), streamName.getStreamName());
+ StatusCode code = verifyStreamRequest(
+ streamName.getNamespaceName(),
+ streamName.getStreamName());
if (StatusCode.SUCCESS != code) {
return FutureUtils.value(GetStreamResponse.newBuilder().setCode(code).build());
}
- byte[] nsNameKey = getNamespaceNameKey(streamName.getColName());
+ byte[] nsNameKey = getNamespaceNameKey(streamName.getNamespaceName());
GetStreamResponse.Builder respBuilder = GetStreamResponse.newBuilder();
return store.get(nsNameKey)
.thenCompose(nsIdBytes -> {
diff --git a/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/TestStorageContainerStoreImpl.java b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/TestStorageContainerStoreImpl.java
index 9293117..b9d5e69 100644
--- a/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/TestStorageContainerStoreImpl.java
+++ b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/TestStorageContainerStoreImpl.java
@@ -112,7 +112,7 @@ public class TestStorageContainerStoreImpl {
private static StreamName createStreamName(String name) {
return StreamName.newBuilder()
- .setColName(name + "_col")
+ .setNamespaceName(name + "_col")
.setStreamName(name + "_stream")
.build();
}
diff --git a/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/TestGrpcRootRangeService.java b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/TestGrpcRootRangeService.java
index 8a6c7a9..f22e52a 100644
--- a/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/TestGrpcRootRangeService.java
+++ b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/grpc/TestGrpcRootRangeService.java
@@ -15,21 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-/*
- * Licensed 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.bookkeeper.stream.storage.impl.grpc;
import static org.apache.bookkeeper.stream.protocol.ProtocolConstants.DEFAULT_STREAM_CONF;
@@ -112,7 +97,7 @@ public class TestGrpcRootRangeService {
GrpcRootRangeService grpcService = new GrpcRootRangeService(rangeService);
CreateNamespaceResponse createResp = CreateNamespaceResponse.newBuilder()
.setCode(StatusCode.SUCCESS)
- .setColProps(namespaceProps)
+ .setNsProps(namespaceProps)
.build();
CreateNamespaceRequest createReq = createCreateNamespaceRequest(nsName, namespaceConf);
when(rangeService.createNamespace(createReq)).thenReturn(
@@ -140,7 +125,7 @@ public class TestGrpcRootRangeService {
grpcService.createNamespace(
CreateNamespaceRequest.newBuilder()
.setName(nsName)
- .setColConf(namespaceConf)
+ .setNsConf(namespaceConf)
.build(),
streamObserver);
latch.await();
@@ -183,7 +168,7 @@ public class TestGrpcRootRangeService {
grpcService.createNamespace(
CreateNamespaceRequest.newBuilder()
.setName(nsName)
- .setColConf(namespaceConf)
+ .setNsConf(namespaceConf)
.build(),
streamObserver);
latch.await();
@@ -283,7 +268,7 @@ public class TestGrpcRootRangeService {
GrpcRootRangeService grpcService = new GrpcRootRangeService(rangeService);
GetNamespaceResponse getResp = GetNamespaceResponse.newBuilder()
.setCode(StatusCode.SUCCESS)
- .setColProps(namespaceProps)
+ .setNsProps(namespaceProps)
.build();
GetNamespaceRequest getReq = createGetNamespaceRequest(nsName);
when(rangeService.getNamespace(getReq)).thenReturn(
@@ -399,7 +384,7 @@ public class TestGrpcRootRangeService {
};
grpcService.createStream(
CreateStreamRequest.newBuilder()
- .setColName(nsName)
+ .setNsName(nsName)
.setName(streamName)
.setStreamConf(DEFAULT_STREAM_CONF)
.build(),
@@ -443,7 +428,7 @@ public class TestGrpcRootRangeService {
};
grpcService.createStream(
CreateStreamRequest.newBuilder()
- .setColName(nsName)
+ .setNsName(nsName)
.setName(streamName)
.setStreamConf(DEFAULT_STREAM_CONF)
.build(),
@@ -487,7 +472,7 @@ public class TestGrpcRootRangeService {
};
grpcService.deleteStream(
DeleteStreamRequest.newBuilder()
- .setColName(nsName)
+ .setNsName(nsName)
.setName(streamName)
.build(),
streamObserver);
@@ -530,7 +515,7 @@ public class TestGrpcRootRangeService {
};
grpcService.deleteStream(
DeleteStreamRequest.newBuilder()
- .setColName(nsName)
+ .setNsName(nsName)
.setName(streamName)
.build(),
streamObserver);
@@ -575,7 +560,7 @@ public class TestGrpcRootRangeService {
grpcService.getStream(
GetStreamRequest.newBuilder()
.setStreamName(StreamName.newBuilder()
- .setColName(nsName)
+ .setNamespaceName(nsName)
.setStreamName(streamName))
.build(),
streamObserver);
@@ -619,7 +604,7 @@ public class TestGrpcRootRangeService {
grpcService.getStream(
GetStreamRequest.newBuilder()
.setStreamName(StreamName.newBuilder()
- .setColName(nsName)
+ .setNamespaceName(nsName)
.setStreamName(streamName))
.build(),
streamObserver);
diff --git a/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/metadata/TestRootRangeStoreImpl.java b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/metadata/TestRootRangeStoreImpl.java
index 8179d62..93a9e47 100644
--- a/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/metadata/TestRootRangeStoreImpl.java
+++ b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/metadata/TestRootRangeStoreImpl.java
@@ -66,7 +66,6 @@ public class TestRootRangeStoreImpl extends MVCCAsyncStoreTestBase {
private final StreamConfiguration streamConf =
StreamConfiguration.newBuilder(DEFAULT_STREAM_CONF)
- .setBackendServiceUrl(DEFAULT_SERVICE_URI)
.build();
@@ -136,9 +135,9 @@ public class TestRootRangeStoreImpl extends MVCCAsyncStoreTestBase {
createCreateNamespaceRequest(nsName, namespaceConf));
CreateNamespaceResponse response = FutureUtils.result(createFuture);
assertEquals(StatusCode.SUCCESS, response.getCode());
- assertEquals(expectedNsId, response.getColProps().getNamespaceId());
- assertEquals(nsName, response.getColProps().getNamespaceName());
- assertEquals(namespaceConf.getDefaultStreamConf(), response.getColProps().getDefaultStreamConf());
+ assertEquals(expectedNsId, response.getNsProps().getNamespaceId());
+ assertEquals(nsName, response.getNsProps().getNamespaceName());
+ assertEquals(namespaceConf.getDefaultStreamConf(), response.getNsProps().getDefaultStreamConf());
return response;
}
@@ -149,8 +148,8 @@ public class TestRootRangeStoreImpl extends MVCCAsyncStoreTestBase {
CompletableFuture<GetNamespaceResponse> getFuture = rootRangeStore.getNamespace(
createGetNamespaceRequest(nsName));
GetNamespaceResponse getResp = FutureUtils.result(getFuture);
- assertEquals(expectedNsId, getResp.getColProps().getNamespaceId());
- assertEquals(streamConf, getResp.getColProps().getDefaultStreamConf());
+ assertEquals(expectedNsId, getResp.getNsProps().getNamespaceId());
+ assertEquals(streamConf, getResp.getNsProps().getDefaultStreamConf());
}
@Test
@@ -170,7 +169,7 @@ public class TestRootRangeStoreImpl extends MVCCAsyncStoreTestBase {
CreateNamespaceResponse response = createNamespaceAndVerify(nsName, 0L);
- verifyNamespaceExists(nsName, response.getColProps().getNamespaceId());
+ verifyNamespaceExists(nsName, response.getNsProps().getNamespaceId());
verifyNamespaceId(0L);
}
@@ -180,7 +179,7 @@ public class TestRootRangeStoreImpl extends MVCCAsyncStoreTestBase {
// create first namespace
CreateNamespaceResponse response = createNamespaceAndVerify(nsName, 0L);
- verifyNamespaceExists(nsName, response.getColProps().getNamespaceId());
+ verifyNamespaceExists(nsName, response.getNsProps().getNamespaceId());
verifyNamespaceId(0L);
// create the namespace with same name will fail
@@ -215,11 +214,11 @@ public class TestRootRangeStoreImpl extends MVCCAsyncStoreTestBase {
String nsName = name.getMethodName();
CreateNamespaceResponse createResp = createNamespaceAndVerify(nsName, 0L);
- verifyNamespaceExists(nsName, createResp.getColProps().getNamespaceId());
+ verifyNamespaceExists(nsName, createResp.getNsProps().getNamespaceId());
verifyNamespaceId(0L);
deleteNamespaceAndVerify(nsName);
- verifyNamespaceNotExists(nsName, createResp.getColProps().getNamespaceId());
+ verifyNamespaceNotExists(nsName, createResp.getNsProps().getNamespaceId());
verifyNamespaceId(0L);
}
@@ -333,7 +332,7 @@ public class TestRootRangeStoreImpl extends MVCCAsyncStoreTestBase {
createStreamAndVerify(nsName, streamName, MIN_DATA_STREAM_ID);
verifyStreamExists(
- createResp.getColProps().getNamespaceId(),
+ createResp.getNsProps().getNamespaceId(),
streamName,
MIN_DATA_STREAM_ID);
verifyStreamId(MIN_DATA_STREAM_ID);
@@ -348,7 +347,7 @@ public class TestRootRangeStoreImpl extends MVCCAsyncStoreTestBase {
createStreamAndVerify(nsName, streamName, MIN_DATA_STREAM_ID);
verifyStreamExists(
- createResp.getColProps().getNamespaceId(),
+ createResp.getNsProps().getNamespaceId(),
streamName,
MIN_DATA_STREAM_ID);
verifyStreamId(MIN_DATA_STREAM_ID);
@@ -392,7 +391,7 @@ public class TestRootRangeStoreImpl extends MVCCAsyncStoreTestBase {
createStreamAndVerify(nsName, streamName, MIN_DATA_STREAM_ID);
verifyStreamExists(
- createResp.getColProps().getNamespaceId(),
+ createResp.getNsProps().getNamespaceId(),
streamName,
MIN_DATA_STREAM_ID);
verifyStreamId(MIN_DATA_STREAM_ID);
@@ -403,7 +402,7 @@ public class TestRootRangeStoreImpl extends MVCCAsyncStoreTestBase {
assertEquals(StatusCode.SUCCESS, deleteResp.getCode());
verifyStreamNotExists(
- createResp.getColProps().getNamespaceId(),
+ createResp.getNsProps().getNamespaceId(),
streamName,
MIN_DATA_STREAM_ID);
verifyStreamId(MIN_DATA_STREAM_ID);
--
To stop receiving notification emails like this one, please contact
sijie@apache.org.