ArafatKhan2198 commented on code in PR #6500:
URL: https://github.com/apache/ozone/pull/6500#discussion_r1590254561
##########
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerMetadataInspector.java:
##########
@@ -181,55 +180,53 @@ public String process(ContainerData containerData,
DatanodeStore store,
return null;
}
- JsonObject containerJson = inspectContainer(kvData, store);
+ ObjectNode containerJson = inspectContainer(kvData, store);
boolean correct = checkAndRepair(containerJson, kvData, store);
- Gson gson = new GsonBuilder()
- .setPrettyPrinting()
- .serializeNulls()
- .create();
- String jsonReport = gson.toJson(containerJson);
+ String jsonReport = null;
+ jsonReport = JsonUtils.toJsonStringWIthIndent(containerJson);
Review Comment:
Done!
##########
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerMetadataInspector.java:
##########
@@ -181,55 +180,53 @@ public String process(ContainerData containerData,
DatanodeStore store,
return null;
}
- JsonObject containerJson = inspectContainer(kvData, store);
+ ObjectNode containerJson = inspectContainer(kvData, store);
boolean correct = checkAndRepair(containerJson, kvData, store);
- Gson gson = new GsonBuilder()
- .setPrettyPrinting()
- .serializeNulls()
- .create();
- String jsonReport = gson.toJson(containerJson);
+ String jsonReport = null;
+ jsonReport = JsonUtils.toJsonStringWIthIndent(containerJson);
if (log != null) {
if (correct) {
log.trace(jsonReport);
} else {
log.error(jsonReport);
}
}
+
return jsonReport;
}
- static JsonObject inspectContainer(KeyValueContainerData containerData,
+ static ObjectNode inspectContainer(KeyValueContainerData containerData,
DatanodeStore store) {
- JsonObject containerJson = new JsonObject();
+ ObjectNode containerJson = JsonUtils.createObjectNode(null);
try {
// Build top level container properties.
- containerJson.addProperty("containerID", containerData.getContainerID());
+ containerJson.put("containerID", containerData.getContainerID());
String schemaVersion = containerData.getSchemaVersion();
- containerJson.addProperty("schemaVersion", schemaVersion);
- containerJson.addProperty("containerState",
- containerData.getState().toString());
- containerJson.addProperty("currentDatanodeID",
+ containerJson.put("schemaVersion", schemaVersion);
+ containerJson.put("containerState", containerData.getState().toString());
+ containerJson.put("currentDatanodeID",
containerData.getVolume().getDatanodeUuid());
- containerJson.addProperty("originDatanodeID",
- containerData.getOriginNodeId());
+ containerJson.put("originDatanodeID", containerData.getOriginNodeId());
// Build DB metadata values.
- Table<String, Long> metadataTable = store.getMetadataTable();
- JsonObject dBMetadata = getDBMetadataJson(metadataTable, containerData);
- containerJson.add("dBMetadata", dBMetadata);
+ // Assuming getDBMetadataJson and getAggregateValues methods return
ObjectNode and are refactored to use Jackson
+ ObjectNode dBMetadata =
+ getDBMetadataJson(store.getMetadataTable(), containerData);
Review Comment:
Done!
##########
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerMetadataInspector.java:
##########
@@ -181,55 +180,53 @@ public String process(ContainerData containerData,
DatanodeStore store,
return null;
}
- JsonObject containerJson = inspectContainer(kvData, store);
+ ObjectNode containerJson = inspectContainer(kvData, store);
boolean correct = checkAndRepair(containerJson, kvData, store);
- Gson gson = new GsonBuilder()
- .setPrettyPrinting()
- .serializeNulls()
- .create();
- String jsonReport = gson.toJson(containerJson);
+ String jsonReport = null;
+ jsonReport = JsonUtils.toJsonStringWIthIndent(containerJson);
if (log != null) {
if (correct) {
log.trace(jsonReport);
} else {
log.error(jsonReport);
}
}
+
return jsonReport;
}
- static JsonObject inspectContainer(KeyValueContainerData containerData,
+ static ObjectNode inspectContainer(KeyValueContainerData containerData,
DatanodeStore store) {
- JsonObject containerJson = new JsonObject();
+ ObjectNode containerJson = JsonUtils.createObjectNode(null);
try {
// Build top level container properties.
- containerJson.addProperty("containerID", containerData.getContainerID());
+ containerJson.put("containerID", containerData.getContainerID());
String schemaVersion = containerData.getSchemaVersion();
- containerJson.addProperty("schemaVersion", schemaVersion);
- containerJson.addProperty("containerState",
- containerData.getState().toString());
- containerJson.addProperty("currentDatanodeID",
+ containerJson.put("schemaVersion", schemaVersion);
+ containerJson.put("containerState", containerData.getState().toString());
+ containerJson.put("currentDatanodeID",
containerData.getVolume().getDatanodeUuid());
- containerJson.addProperty("originDatanodeID",
- containerData.getOriginNodeId());
+ containerJson.put("originDatanodeID", containerData.getOriginNodeId());
// Build DB metadata values.
- Table<String, Long> metadataTable = store.getMetadataTable();
- JsonObject dBMetadata = getDBMetadataJson(metadataTable, containerData);
- containerJson.add("dBMetadata", dBMetadata);
+ // Assuming getDBMetadataJson and getAggregateValues methods return
ObjectNode and are refactored to use Jackson
+ ObjectNode dBMetadata =
+ getDBMetadataJson(store.getMetadataTable(), containerData);
+ containerJson.set("dBMetadata", dBMetadata);
// Build aggregate values.
- JsonObject aggregates = getAggregateValues(store,
- containerData, schemaVersion);
- containerJson.add("aggregates", aggregates);
+ ObjectNode aggregates =
+ getAggregateValues(store, containerData, schemaVersion);
Review Comment:
Done!
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
