codelipenghui commented on a change in pull request #13938:
URL: https://github.com/apache/pulsar/pull/13938#discussion_r791528701
##########
File path:
pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
##########
@@ -643,17 +643,26 @@ protected void setSchemaCompatibilityStrategy(Policies
policies) {
if (SystemTopicClient.isSystemTopic(TopicName.get(this.topic))) {
schemaCompatibilityStrategy =
brokerService.pulsar().getConfig().getSystemTopicSchemaCompatibilityStrategy();
- } else if (policies.schema_compatibility_strategy ==
SchemaCompatibilityStrategy.UNDEFINED) {
- schemaCompatibilityStrategy = brokerService.pulsar()
- .getConfig().getSchemaCompatibilityStrategy();
- if (schemaCompatibilityStrategy ==
SchemaCompatibilityStrategy.UNDEFINED) {
- schemaCompatibilityStrategy =
SchemaCompatibilityStrategy.fromAutoUpdatePolicy(
- policies.schema_auto_update_compatibility_strategy);
- }
- } else {
- schemaCompatibilityStrategy =
policies.schema_compatibility_strategy;
+ return;
+ }
+
+ schemaCompatibilityStrategy = policies.schema_compatibility_strategy;
+ if
(!SchemaCompatibilityStrategy.isUndefined(schemaCompatibilityStrategy)) {
+ return;
+ }
+
+ schemaCompatibilityStrategy =
SchemaCompatibilityStrategy.fromAutoUpdatePolicy(
+ policies.schema_auto_update_compatibility_strategy);
+ if
(!SchemaCompatibilityStrategy.isUndefined(schemaCompatibilityStrategy)) {
+ return;
+ }
+
+ schemaCompatibilityStrategy =
brokerService.pulsar().getConfig().getSchemaCompatibilityStrategy();
+ if
(SchemaCompatibilityStrategy.isUndefined(schemaCompatibilityStrategy)) {
+ schemaCompatibilityStrategy = SchemaCompatibilityStrategy.FULL;
Review comment:
We can simply to change the default value of the broker configuration to
FULL, without checking if the broker level is undefined.
##########
File path:
pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
##########
@@ -2342,15 +2342,19 @@ protected SchemaCompatibilityStrategy
internalGetSchemaCompatibilityStrategy() {
validateNamespacePolicyOperation(namespaceName,
PolicyName.SCHEMA_COMPATIBILITY_STRATEGY,
PolicyOperation.READ);
Policies policies = getNamespacePolicies(namespaceName);
+
SchemaCompatibilityStrategy schemaCompatibilityStrategy =
policies.schema_compatibility_strategy;
- if (schemaCompatibilityStrategy ==
SchemaCompatibilityStrategy.UNDEFINED) {
- schemaCompatibilityStrategy =
pulsar().getConfig().getSchemaCompatibilityStrategy();
- if (schemaCompatibilityStrategy ==
SchemaCompatibilityStrategy.UNDEFINED) {
- schemaCompatibilityStrategy = SchemaCompatibilityStrategy
-
.fromAutoUpdatePolicy(policies.schema_auto_update_compatibility_strategy);
- }
+ if
(!SchemaCompatibilityStrategy.isUndefined(schemaCompatibilityStrategy)) {
+ return schemaCompatibilityStrategy;
}
- return schemaCompatibilityStrategy;
+
+ schemaCompatibilityStrategy =
+
SchemaCompatibilityStrategy.fromAutoUpdatePolicy(policies.schema_auto_update_compatibility_strategy);
+ if
(!SchemaCompatibilityStrategy.isUndefined(schemaCompatibilityStrategy)) {
+ return schemaCompatibilityStrategy;
+ }
+
+ return pulsar().getConfig().getSchemaCompatibilityStrategy();
Review comment:
For getting the namespace policy, we should not return the broker-level
configuration.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
