You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by pr...@apache.org on 2015/06/24 01:32:50 UTC
incubator-asterixdb git commit: Fix for issue 872
Repository: incubator-asterixdb
Updated Branches:
refs/heads/master 0bae16118 -> 735bc4eda
Fix for issue 872
Change-Id: If8cf621b8b89302cb28bd34f63e23f9c5f684351
Reviewed-on: https://asterix-gerrit.ics.uci.edu/290
Reviewed-by: Ildar Absalyamov <il...@gmail.com>
Reviewed-by: Ian Maxon <im...@apache.org>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/735bc4ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/735bc4ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/735bc4ed
Branch: refs/heads/master
Commit: 735bc4eda6ec0fa1ccb913e4484a4b52a6562062
Parents: 0bae161
Author: Eldon Carman <ec...@ucr.edu>
Authored: Thu Jun 18 19:14:07 2015 -0700
Committer: Preston Carman <ec...@ucr.edu>
Committed: Tue Jun 23 16:30:44 2015 -0700
----------------------------------------------------------------------
.../main/java/edu/uci/ics/asterix/api/common/APIFramework.java | 6 +++---
asterix-app/src/main/resources/webui/querytemplate.html | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/735bc4ed/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java
----------------------------------------------------------------------
diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java b/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java
index 0ce15ed..2d91d90 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java
@@ -157,7 +157,7 @@ public class APIFramework {
public static Pair<Query, Integer> reWriteQuery(List<FunctionDecl> declaredFunctions,
AqlMetadataProvider metadataProvider, Query q, SessionConfig conf) throws AsterixException {
- if (conf.is(SessionConfig.FORMAT_ONLY_PHYSICAL_OPS) && conf.is(SessionConfig.OOB_EXPR_TREE)) {
+ if (!conf.is(SessionConfig.FORMAT_ONLY_PHYSICAL_OPS) && conf.is(SessionConfig.OOB_EXPR_TREE)) {
conf.out().println();
if (conf.is(SessionConfig.FORMAT_HTML)) {
@@ -186,7 +186,7 @@ public class APIFramework {
SessionConfig conf, ICompiledDmlStatement statement) throws AsterixException, AlgebricksException,
JSONException, RemoteException, ACIDException {
- if (conf.is(SessionConfig.FORMAT_ONLY_PHYSICAL_OPS) && conf.is(SessionConfig.OOB_REWRITTEN_EXPR_TREE)) {
+ if (!conf.is(SessionConfig.FORMAT_ONLY_PHYSICAL_OPS) && conf.is(SessionConfig.OOB_REWRITTEN_EXPR_TREE)) {
conf.out().println();
if (conf.is(SessionConfig.FORMAT_HTML)) {
@@ -219,7 +219,7 @@ public class APIFramework {
}
LogicalOperatorPrettyPrintVisitor pvisitor = new LogicalOperatorPrettyPrintVisitor();
- if (conf.is(SessionConfig.FORMAT_ONLY_PHYSICAL_OPS) && conf.is(SessionConfig.OOB_LOGICAL_PLAN)) {
+ if (!conf.is(SessionConfig.FORMAT_ONLY_PHYSICAL_OPS) && conf.is(SessionConfig.OOB_LOGICAL_PLAN)) {
conf.out().println();
if (conf.is(SessionConfig.FORMAT_HTML)) {
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/735bc4ed/asterix-app/src/main/resources/webui/querytemplate.html
----------------------------------------------------------------------
diff --git a/asterix-app/src/main/resources/webui/querytemplate.html b/asterix-app/src/main/resources/webui/querytemplate.html
index bcd177c..fb0a1cc 100644
--- a/asterix-app/src/main/resources/webui/querytemplate.html
+++ b/asterix-app/src/main/resources/webui/querytemplate.html
@@ -197,10 +197,10 @@ $(document).ready(function() {
<div>
<label class="checkbox optlabel"> Output Format:<br/>
<select name="output-format" class="btn">
- <option selected value="JSON">JSON</option>
- <option value="ADM">ADM</option>
+ <option selected value="ADM">ADM</option>
<option value="CSV">CSV (no header)</option>
<option value="CSV-Header">CSV (with header)</option>
+ <option value="JSON">JSON</option>
</select>
</label>
<label class="checkbox optlabel"><input type="checkbox" name="print-expr-tree" value="true" /> Print parsed expressions</label>