>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17966 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
......................................................................
Merge branch 'gerrit/trinity' into 'master'
Change-Id: I7e0d18ecfdd8d1ea72078f13997c1754fdb8b1cd
---
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitorJson.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java
M
asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/profile/sleep/sleep.5.profile.sqlpp
4 files changed, 17 insertions(+), 17 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/66/17966/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java
index 3bdddad..9bd65a6 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java
@@ -205,16 +205,10 @@
}
public JobSpecification compileQuery(IClusterInfoCollector
clusterInfoCollector, MetadataProvider metadataProvider,
-<<<<<<< HEAD (9b6164 [NO ISSUE][OTH] Update warning test for SqlppAnalyzed)
Query query, int varCounter, String outputDatasetName,
SessionOutput output, ICompiledStatement statement,
Map<VarIdentifier, IAObject> externalVars, IResponsePrinter
printer, IWarningCollector warningCollector,
- IRequestParameters requestParameters) throws AlgebricksException,
ACIDException {
-=======
- Query query, int varCounter, String outputDatasetName,
SessionOutput output,
- ICompiledDmlStatement statement, Map<VarIdentifier, IAObject>
externalVars, IResponsePrinter printer,
- IWarningCollector warningCollector, IRequestParameters
requestParameters, EnumSet<JobFlag> runtimeFlags)
+ IRequestParameters requestParameters, EnumSet<JobFlag>
runtimeFlags)
throws AlgebricksException, ACIDException {
->>>>>>> BRANCH (6c1e84 [ASTERIXDB-3313][COMP] Defuse profile when not
profiling)
// establish facts
final boolean isQuery = query != null;
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/profile/sleep/sleep.5.profile.sqlpp
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/profile/sleep/sleep.5.profile.sqlpp
index de32f82..6c35376 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/profile/sleep/sleep.5.profile.sqlpp
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/profile/sleep/sleep.5.profile.sqlpp
@@ -24,8 +24,4 @@
FROM Customers c
WHERE c.age <65
GROUP BY c.address.city
-<<<<<<< HEAD (9b6164 [NO ISSUE][OTH] Update warning test for SqlppAnalyzed)
-ORDER BY sleep(city,1667);
-=======
-ORDER BY sleep(city,1700);
->>>>>>> BRANCH (6c1e84 [ASTERIXDB-3313][COMP] Defuse profile when not
profiling)
+ORDER BY sleep(city,1700);
\ No newline at end of file
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 0268aab..d1a356c 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
@@ -81,12 +81,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 (9b6164 [NO ISSUE][OTH] Update warning test for SqlppAnalyzed)
-import org.apache.hyracks.api.dataflow.ActivityId;
-=======
-import
org.apache.hyracks.algebricks.core.algebra.operators.logical.WriteResultOperator;
import org.apache.hyracks.api.dataflow.OperatorDescriptorId;
->>>>>>> BRANCH (6c1e84 [ASTERIXDB-3313][COMP] Defuse profile when not
profiling)
import org.apache.hyracks.api.exceptions.ErrorCode;
import com.fasterxml.jackson.core.JsonFactory;
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17966
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: I7e0d18ecfdd8d1ea72078f13997c1754fdb8b1cd
Gerrit-Change-Number: 17966
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
