>From Ian Maxon <ima...@uci.edu>: Ian Maxon has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17752 )
Change subject: Merge branch 'trinity' into 'master' ...................................................................... Merge branch 'trinity' into 'master' Change-Id: I2ae5ee216050cf34c91c33a14a3bf5645a46b049 --- M hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitorJson.java 2 files changed, 15 insertions(+), 4 deletions(-) Approvals: Jenkins: Verified; Verified Ian Maxon: Looks good to me, approved diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitorJson.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitorJson.java index c41220b..6f65a9d 100644 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitorJson.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitorJson.java @@ -80,11 +80,7 @@ import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.WindowOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.WriteOperator; -<<<<<<< HEAD (46efaa [ASTERIXDB-3253][STO] Fix deleting uncached files) -======= -import org.apache.hyracks.algebricks.core.algebra.operators.logical.WriteResultOperator; import org.apache.hyracks.api.dataflow.ActivityId; ->>>>>>> BRANCH (2678d1 [ASTERIXDB-3239][API] Add profile summary to plan) import org.apache.hyracks.api.exceptions.ErrorCode; import com.fasterxml.jackson.core.JsonFactory; -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17752 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I2ae5ee216050cf34c91c33a14a3bf5645a46b049 Gerrit-Change-Number: 17752 Gerrit-PatchSet: 2 Gerrit-Owner: Ian Maxon <ima...@uci.edu> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Ian Maxon <ima...@uci.edu> Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Gerrit-MessageType: merged
