Ian Maxon has posted comments on this change. Change subject: ASTERIXDB-1714: Eliminate dependency on org.json ......................................................................
Patch Set 13: (90 comments) https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java: Line 316: .println(new ObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(spec.toJSON())); > Indeed. Could we split this into 2 lines? Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java: Line 74: ObjectNode json; > Could we move this declaration into the try { ... }? Done Line 75: ObjectMapper om = new ObjectMapper(); > This ObjectMapper seems to be unused. Is it? Done Line 136: json = ClusterStateManager.INSTANCE.getClusterStateDescription(); > Put those 2 lines into 1 line? Done Line 160: json.put("cc", cc); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterCCDetailsAPIServlet.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterCCDetailsAPIServlet.java: Line 45: ObjectNode json; > Move this down into the try{....}? Done Line 68: ObjectMapper om = new ObjectMapper(); > Create the ObjectMapper just before the switch? Done Line 96: ObjectMapper om = new ObjectMapper(); > Move this down? Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterNodeDetailsAPIServlet.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterNodeDetailsAPIServlet.java: Line 59: json.put("ncs", getClusterStateJSON(request, "../").get("ncs")); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 81: ObjectMapper om = new ObjectMapper(); > Move this down to where it's used? Done Line 91: ObjectNode json = (ObjectNode) ncs.get(i); > Pull this into the if (...)? Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ConnectorAPIServlet.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ConnectorAPIServlet.java: Line 131: String primaryKeys, boolean temp, Map<String, NodeControllerInfo> nodeMap) throws Exception { > Yes, please. Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/DiagnosticsAPIServlet.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/DiagnosticsAPIServlet.java: Line 82: ccFutureData.put("threaddump", executor.submit(() -> fixupKeys((ObjectNode)om.readTree(hcc.getThreadDump(null))))); > Yes, please. Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java: Line 78: nc.put(PID, details.get(PID)); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 83: jsonObject.put("cluster", clusterState); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 85: writer.print(om.writeValueAsString(jsonObject)); > Replace by I think it is different (besides not stringifying, of course). https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java: Line 161: try { > Move the try-catch into "displayRecord"? Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultUtil.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultUtil.java: Line 105: errorResp.put("error-code", errorArray); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionAPIServletTest.java File asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionAPIServletTest.java: Line 110: for(Map.Entry<String,String> e: propMap.entrySet()){ > Some spaces around the parens? Are there suppose to be? I ran the formatter on it but it didn't change that https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/any-object/any-object.2.query.sqlpp File asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/types/any-object/any-object.2.query.sqlpp: Line 20: select element x from Metadata.Datatype as x; > Will this return consistent results without "order by"? Is there only one r I thought this was not order by before? I changed it so I thought I was changing it back https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-client-helper/pom.xml File asterixdb/asterix-client-helper/pom.xml: Line 113: <version>2.8.1</version> > This is a different version that in another pom - could we have just one (s Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-common/pom.xml File asterixdb/asterix-common/pom.xml: Line 313: <version>2.8.1</version> > Again, a shared version. Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/JSONUtil.java File asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/JSONUtil.java: Line 94: } > Pull this into a private method for reuse in appendAry? It's not quite the same, one uses a string, the other an int. https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ResultExtractor.java File asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ResultExtractor.java: Line 125: res.put("handle", handle); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/SingleLinePrettyPrinter.java File asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/SingleLinePrettyPrinter.java: Line 330: // if (!_objectIndenter.isInline()) { > Should we remove the commented code? Done Line 344: // if (!_arrayIndenter.isInline()) { > Should we remove the commented code? Done Line 374: // if (!_arrayIndenter.isInline()) { > Should we remove the commented code? Done Line 386: // gen.writeRaw(' '); > Should we remove the commented code? Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java File asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java: Line 34: import java.util.*; > Could you revert this change? Done, hate that intellij does that sometimes. Line 1027: if(nodePid <=1 ){ > fix space? Done Line 1134: for (int i=0;i<result.size();i++) { > fix ws? Done Line 1136: if(json != null) { > fix ws? Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml File asterixdb/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml: Line 53: <version>2.8.1</version> > Align version? Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ACircle.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ACircle.java: Line 90: circle.put("center", center.toJSON()); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 92: json.put("ACircle", circle); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADayTimeDuration.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADayTimeDuration.java: Line 52: json.put("ADuration", duration); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADuration.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADuration.java: Line 128: json.put("ADuration", duration); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ALine.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ALine.java: Line 83: line.put("p1", p1.toJSON()); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 84: line.put("p2", p2.toJSON()); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 85: json.put("ALine", line); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AOrderedList.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AOrderedList.java: Line 137: json.put("AOrderedList", list); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APoint.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APoint.java: Line 84: json.put("APoint", point); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APoint3D.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APoint3D.java: Line 92: json.put("APoint3D", point); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APolygon.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/APolygon.java: Line 106: json.put("APolygon", polygon); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ARecord.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ARecord.java: Line 115: item.put(type.getFieldNames()[i], fields[i].toJSON()); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 118: json.put("ARecord", record); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ARectangle.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ARectangle.java: Line 83: rectangle.put("p1", p1.toJSON()); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 84: rectangle.put("p2", p2.toJSON()); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 85: json.put("ARectangle", rectangle); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AUnorderedList.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AUnorderedList.java: Line 128: json.put("AUnorderedList", list); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AYearMonthDuration.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AYearMonthDuration.java: Line 60: json.put("ADuration", duration); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/AOrderedListType.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/AOrderedListType.java: Line 83: type.put("item-type", itemType.toJSON()); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/ARecordType.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/ARecordType.java: Line 344: field.put(fieldNames[i], fieldTypes[i].toJSON()); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 348: type.put("fields", fields); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/AUnionType.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/AUnionType.java: Line 221: type.put("fields", fields); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/AUnorderedListType.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/AUnorderedListType.java: Line 84: type.put("item-type", itemType.toJSON()); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/util/ClusterStateManager.java File asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/util/ClusterStateManager.java: Line 644: stateDescription.put("ncs",ncs); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/asterixdb/pom.xml File asterixdb/pom.xml: Line 71: <jacoco.version>0.7.6.201602180812</jacoco.version> > add jackson here? I am not sure I should do that, I remember talking with Mike B about this and somehow I remember forming the opinion that this wasn't good to continue doing, though I don't remember why Line 809: </dependency> > add jackson here? Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/hyracks-fullstack/algebricks/algebricks-runtime/pom.xml File hyracks-fullstack/algebricks/algebricks-runtime/pom.xml: Line 78: <version>2.8.1</version> > Shared version? Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/hyracks-fullstack/algebricks/algebricks-tests/pom.xml File hyracks-fullstack/algebricks/algebricks-tests/pom.xml: Line 164: <version>2.8.1</version> > Shared version? Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/hyracks-fullstack/hyracks/hyracks-api/pom.xml File hyracks-fullstack/hyracks/hyracks-api/pom.xml: Line 96: <version>2.8.1</version> > Shared version? Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/ActivityCluster.java File hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/ActivityCluster.java: Line 208: jan.put("inputs", jInputs); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 220: jan.put("outputs", jOutputs); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 229: jan.put("depends-on", jDeps); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 233: jac.put("activities", jans); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobSpecification.java File hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobSpecification.java: Line 379: pcObject.put("location", pleObject); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 382: op.put("partition-constraints", pcObject); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/hyracks-fullstack/hyracks/hyracks-client/pom.xml File hyracks-fullstack/hyracks/hyracks-client/pom.xml: Line 112: <version>2.8.1</version> > Shared version? Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml: Line 117: <version>2.8.1</version> > Shared version? Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobRun.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobRun.java: Line 259: acJSON.put("activities", activitiesJSON); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 265: acJSON.put("dependencies", dependenciesJSON); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 289: entry.put("input-partition-counts", inPartCountsJSON); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 298: entry.put("output-partition-counts", outPartCountsJSON); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 324: planJSON.put("activities", acTasks); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 335: c.put("tasks", tasksAry); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 341: c.put("produced-partitions", prodParts); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 347: c.put("required-partitions", reqdParts); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 379: attempt.put("task-attempts", taskAttempts); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 384: c.put("attempts", attempts); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 388: planJSON.put("task-clusters", tClusters); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 390: acJSON.put("plan", planJSON); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/scheduler/JobScheduler.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/scheduler/JobScheduler.java: Line 740: jobLogObject.put("activity-cluster-graph", acg.toJSON()); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 741: jobLogObject.put("job-run", run.toJSON()); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobCleanupWork.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobCleanupWork.java: Line 129: jobLogObject.put("activity-cluster-graph", acg.toJSON()); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done Line 130: jobLogObject.put("job-run", run.toJSON()); > Replace "put" with "set"? "put" is deprecated (for JsonNode), Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/pom.xml: Line 73: <version>2.8.1</version> > Shared version? Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml File hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml: Line 91: <version>2.8.1</version> > Shared version? Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml File hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml: Line 153: <version>2.8.1</version> > Shared version? Done https://asterix-gerrit.ics.uci.edu/#/c/1392/13/hyracks-fullstack/hyracks/hyracks-server/pom.xml File hyracks-fullstack/hyracks/hyracks-server/pom.xml: Line 184: <version>2.8.1</version> > Shared version? Done -- To view, visit https://asterix-gerrit.ics.uci.edu/1392 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie9c5400fd134ae75d43385255af7794e968b1c7e Gerrit-PatchSet: 13 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]> Gerrit-HasComments: Yes
