Skip to content

[cleanup][broker] Remove duplicate code in the SchemaRegistryServiceImpl that checks for existing schema and new schema types #19753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
315157973 merged 3 commits into from
Mar 16, 2023
Merged

[cleanup][broker] Remove duplicate code in the SchemaRegistryServiceImpl that checks for existing schema and new schema types #19753

315157973 merged 3 commits into from
Mar 16, 2023

Conversation

@Denovo1998
Copy link
Contributor

@Denovo1998 Denovo1998 commented Mar 8, 2023 •
edited
Loading

PR that may be relevant: #10367

Motivation

There is no need to double-check whether the type of the existing schema is different from that of the new schema.

pulsar/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java

Lines 468 to 480 in e973388

if (existingSchema.schema.getType() != schema.getType()) {
result.completeExceptionally(new IncompatibleSchemaException(
String.format("Incompatible schema: exists schema type %s, new schema type %s",
existingSchema.schema.getType(), schema.getType())));
} else {
try {
checkCompatible(existingSchema, schema, strategy);
result.complete(null);
} catch (IncompatibleSchemaException e) {
result.completeExceptionally(e);
}
}
return result;

pulsar/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java

Lines 349 to 363 in e973388

private void checkCompatible(SchemaAndMetadata existingSchema, SchemaData newSchema,
SchemaCompatibilityStrategy strategy) throws IncompatibleSchemaException {
SchemaHash existingHash = SchemaHash.of(existingSchema.schema);
SchemaHash newHash = SchemaHash.of(newSchema);
SchemaData existingSchemaData = existingSchema.schema;
if (newSchema.getType() != existingSchemaData.getType()) {
throw new IncompatibleSchemaException(String.format("Incompatible schema: "
+ "exists schema type %s, new schema type %s",
existingSchemaData.getType(), newSchema.getType()));
}
if (!newHash.equals(existingHash)) {
compatibilityChecks.getOrDefault(newSchema.getType(), SchemaCompatibilityCheck.DEFAULT)
.checkCompatible(existingSchemaData, newSchema, strategy);
}
}

Modifications

Remove type checks for existing schemas and new schemas outside org.apache.pulsar.broker.service.schema.SchemaRegistryServiceImpl#checkCompatible(SchemaAndMetadata, SchemaData, SchemaCompatibilityStrategy). And check at the beginning in checkCompatible.

Verifying this change

  • Make sure that the change passes the CI checks.

Does this pull request potentially affect one of the following parts:

If the box was checked, please highlight the changes

  • Dependencies (add or upgrade a dependency)
  • The public API
  • The schema
  • The default values of configurations
  • The threading model
  • The binary protocol
  • The REST endpoints
  • The admin CLI options
  • The metrics
  • Anything that affects deployment

Documentation

  • doc
  • doc-required
  • doc-not-needed
  • doc-complete

Matching PR in forked repository

PR in forked repository: Denovo1998#3

@Denovo1998
there is no need to double-check whether the type of the existing sch…
6f9bd4c 
…ema is different from that of the new schema.
@github-actions github-actions bot added the doc-not-needed Your PR changes do not impact docs label Mar 8, 2023
@Denovo1998 Denovo1998 mentioned this pull request Mar 8, 2023
Closed
@Denovo1998 Denovo1998 requested a review from 315157973 March 10, 2023 01:27
@315157973 315157973 closed this Mar 10, 2023
@315157973 315157973 reopened this Mar 10, 2023
@Denovo1998
Copy link
Contributor Author

Denovo1998 commented Mar 10, 2023

/pulsarbot run-failure-checks

@Denovo1998
Copy link
Contributor Author

Denovo1998 commented Mar 12, 2023

/pulsarbot run-failure-checks

@Denovo1998
Copy link
Contributor Author

Denovo1998 commented Mar 12, 2023

It's strange that upload to codecov always fails.

@Denovo1998
Copy link
Contributor Author

Denovo1998 commented Mar 13, 2023

/pulsarbot run-failure-checks

1 similar comment
@Denovo1998
Copy link
Contributor Author

Denovo1998 commented Mar 15, 2023

/pulsarbot run-failure-checks

@Denovo1998
Copy link
Contributor Author

Denovo1998 commented Mar 15, 2023

@315157973 I guess we can merge in now.

@315157973 315157973 merged commit 0ffa97e into apache:master Mar 16, 2023
@Denovo1998 Denovo1998 deleted the clean-schema-checkCompatible-code branch March 18, 2023 10:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@315157973 315157973 315157973 approved these changes

Assignees

@Denovo1998 Denovo1998

Labels

doc-not-needed Your PR changes do not impact docs ready-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Denovo1998 @315157973