From f8f1d69731cf8c349c48c60c112679c214e361d6 Mon Sep 17 00:00:00 2001 From: maheshnikam <55378196+nikam14@users.noreply.github.com> Date: Tue, 24 Sep 2024 15:39:40 +0530 Subject: [PATCH 1/5] improve method --- .../broker/service/schema/SchemaRegistryServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java index c1a394dcfbbb7..26be4c621ab22 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java @@ -133,7 +133,14 @@ public CompletableFuture 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 (schema != null && schema.schema.isDeleted()) { + return null; + } else { + return schema; + } + }); } }) .whenComplete((v, t) -> { From c30ec3d548c7829de0a4f488e66b955d6b38c592 Mon Sep 17 00:00:00 2001 From: maheshnikam <55378196+nikam14@users.noreply.github.com> Date: Tue, 24 Sep 2024 23:49:53 +0530 Subject: [PATCH 2/5] Optimised --- .../service/schema/SchemaRegistryServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java index 26be4c621ab22..c68013769d1f0 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java @@ -135,11 +135,14 @@ public CompletableFuture getSchema(String schemaId, SchemaVer .thenApply(Functions::schemaInfoToSchema) .thenApply(schema -> new SchemaAndMetadata(schemaId, schema, stored.version)) .thenApply((schema) -> { - if (schema != null && schema.schema.isDeleted()) { - return null; - } else { - return schema; + if(version == SchemaVersion.Latest){ + if (schema != null && schema.schema.isDeleted()) { + return null; + } else { + return schema; + } } + return schema; }); } }) From d7fa60801da58564e496c20e1c1588c7b41c80d0 Mon Sep 17 00:00:00 2001 From: maheshnikam <55378196+nikam14@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:48:02 +0530 Subject: [PATCH 3/5] Update SchemaRegistryServiceImpl.java --- .../pulsar/broker/service/schema/SchemaRegistryServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java index c68013769d1f0..b3050848ef30d 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java @@ -135,7 +135,7 @@ public CompletableFuture getSchema(String schemaId, SchemaVer .thenApply(Functions::schemaInfoToSchema) .thenApply(schema -> new SchemaAndMetadata(schemaId, schema, stored.version)) .thenApply((schema) -> { - if(version == SchemaVersion.Latest){ + if (version == SchemaVersion.Latest) { if (schema != null && schema.schema.isDeleted()) { return null; } else { From 6b0df5863d0ca04ca05e2531f8dfc27f8e57f79e Mon Sep 17 00:00:00 2001 From: maheshnikam <55378196+nikam14@users.noreply.github.com> Date: Wed, 25 Sep 2024 12:02:04 +0530 Subject: [PATCH 4/5] code-ql check --- .../pulsar/broker/service/schema/SchemaRegistryServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java index b3050848ef30d..f4de0fd00bcc7 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java @@ -142,7 +142,7 @@ public CompletableFuture getSchema(String schemaId, SchemaVer return schema; } } - return schema; + return schema; }); } }) From 917430d6c7a0261d80fd17919ecfe397cd526d00 Mon Sep 17 00:00:00 2001 From: maheshnikam <55378196+nikam14@users.noreply.github.com> Date: Sat, 28 Sep 2024 15:44:29 +0530 Subject: [PATCH 5/5] fixing changes --- .../broker/service/schema/SchemaRegistryServiceImpl.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java index f4de0fd00bcc7..286d0e3ca7368 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java @@ -89,13 +89,7 @@ public class SchemaRegistryServiceImpl implements SchemaRegistryService { @Override @NotNull public CompletableFuture 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