Xikui Wang has submitted this change and it was merged.

Change subject: [ASTERIXDB-2057][API] Add detailed error message for 500 in 
REST API
......................................................................


[ASTERIXDB-2057][API] Add detailed error message for 500 in REST API

- user model changes: no
- storage format changes: no
- interface changes: no

Details:
1. Add error message to 500 response.
2. Specify proper content type for Ansible query execution script, so
LIKE % can be parsed properly.
3. Add semicolons to statements in create.sqlpp.

Change-Id: I17759141116a1baf878abf7d5ec70295a18946e8
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1959
Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Reviewed-by: Yingyi Bu <buyin...@gmail.com>
---
M asterixdb/asterix-benchmark/src/main/resources/ansible/runquery.yml
M 
asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/setup/create.sqlpp
M 
hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerHandler.java
3 files changed, 11 insertions(+), 9 deletions(-)

Approvals:
  Yingyi Bu: Looks good to me, approved
  Jenkins: Verified; No violations found; 



diff --git 
a/asterixdb/asterix-benchmark/src/main/resources/ansible/runquery.yml 
b/asterixdb/asterix-benchmark/src/main/resources/ansible/runquery.yml
index ef3c2a5..a8af486 100644
--- a/asterixdb/asterix-benchmark/src/main/resources/ansible/runquery.yml
+++ b/asterixdb/asterix-benchmark/src/main/resources/ansible/runquery.yml
@@ -34,6 +34,8 @@
         url: "{{ service }}"
         method: POST
         body: "{{ lookup('file', query_file ) }}"
+        headers:
+          Content-Type: "text/plain"
         timeout: 3600
       register: response
 
diff --git 
a/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/setup/create.sqlpp
 
b/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/setup/create.sqlpp
index 2aa67c6..799f445 100644
--- 
a/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/setup/create.sqlpp
+++ 
b/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/setup/create.sqlpp
@@ -34,7 +34,7 @@
   l_shipinstruct: string,
   l_shipmode: string,
   l_comment: string
-}
+};
 
 create type OrderType as {
   o_orderkey: int64,
@@ -46,7 +46,7 @@
   o_clerk: string,
   o_shippriority: int32,
   o_comment: string
-}
+};
 
 create type CustomerType as {
   c_custkey: int64,
@@ -57,7 +57,7 @@
   c_acctbal: double,
   c_mktsegment: string,
   c_comment: string
-}
+};
 
 create type PartType as {
   p_partkey: int64,
@@ -69,7 +69,7 @@
   p_container: string,
   p_retailprice: double,
   p_comment: string
-}
+};
 
 create type PartSuppType as {
   ps_partkey: int64,
@@ -77,7 +77,7 @@
   ps_availqty: int32,
   ps_supplycost: double,
   ps_comment: string
-}
+};
 
 create type SupplierType as {
   s_suppkey: int64,
@@ -87,20 +87,20 @@
   s_phone: string,
   s_acctbal: double,
   s_comment: string
-}
+};
 
 create type NationType as {
   n_nationkey: int32,
   n_name: string,
   n_regionkey: int32,
   n_comment: string
-}
+};
 
 create type RegionType as {
   r_regionkey: int32,
   r_name: string,
   r_comment: string
-}
+};
 
 create dataset LineItem(LineItemType) primary key l_orderkey, l_linenumber;
 create dataset Orders(OrderType)      primary key o_orderkey;
diff --git 
a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerHandler.java
 
b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerHandler.java
index e89ed56..46b693b 100644
--- 
a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerHandler.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServerHandler.java
@@ -72,7 +72,7 @@
             }
         } catch (Exception e) {
             LOGGER.log(Level.SEVERE, "Failure Submitting HTTP Request", e);
-            respond(ctx, request.protocolVersion(), 
HttpResponseStatus.INTERNAL_SERVER_ERROR);
+            respond(ctx, request.protocolVersion(), new 
HttpResponseStatus(500, e.getMessage()));
         }
     }
 

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1959
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I17759141116a1baf878abf7d5ec70295a18946e8
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang <xkk...@gmail.com>
Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Xikui Wang <xkk...@gmail.com>
Gerrit-Reviewer: Yingyi Bu <buyin...@gmail.com>

Reply via email to