Skip to content

[improve][schema]Improve the getSchema() method in SchemaRegistryServiceImpl.java #23354

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

Open
nikam14 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[improve][schema]Improve the getSchema() method in SchemaRegistryServiceImpl.java #23354

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f8f1d69
improve method
nikam14 Sep 24, 2024
c30ec3d
Optimised
nikam14 Sep 24, 2024
d7fa608
Update SchemaRegistryServiceImpl.java
nikam14 Sep 25, 2024
6b0df58
code-ql check
nikam14 Sep 25, 2024
917430d
fixing changes
nikam14 Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions ...oker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,7 @@ public class SchemaRegistryServiceImpl implements SchemaRegistryService {
@Override
@NotNull
public CompletableFuture<SchemaAndMetadata> getSchema(String schemaId) {
return getSchema(schemaId, SchemaVersion.Latest).thenApply((schema) -> {
if (schema != null && schema.schema.isDeleted()) {
return null;
} else {
return schema;
}
});
return getSchema(schemaId, SchemaVersion.Latest);
}

@Override
Expand Down Expand Up @@ -133,7 +127,17 @@ public CompletableFuture<SchemaAndMetadata> getSchema(String schemaId, SchemaVer
} else {
return Functions.bytesToSchemaInfo(stored.data)
.thenApply(Functions::schemaInfoToSchema)
.thenApply(schema -> new SchemaAndMetadata(schemaId, schema, stored.version));
.thenApply(schema -> new SchemaAndMetadata(schemaId, schema, stored.version))
.thenApply((schema) -> {
if (version == SchemaVersion.Latest) {
Copy link
Contributor

@BewareMyPower BewareMyPower Sep 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a test to show the changes make sense

Copy link
Contributor Author

@nikam14 nikam14 Sep 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes are covered in SchemaServiceTest.java

Copy link
Member

@lhotari lhotari Oct 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes are covered in SchemaServiceTest.java

@nikam14 Please add a test that shows that this change was needed. I don't see any test changes in this PR, so that is missing.

if (schema != null && schema.schema.isDeleted()) {
return null;
} else {
return schema;
}
}
return schema;
});
}
})
.whenComplete((v, t) -> {
Expand Down