Change in asterixdb[master]: Handle error conditions in the /query/status API

[Till Westmann (Code Review)]

Till Westmann has submitted this change and it was merged.

Change subject: Handle error conditions in the /query/status API
..


Handle error conditions in the /query/status API

Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1522
Tested-by: Jenkins 
Reviewed-by: Yingyi Bu 
Integration-Tests: Jenkins 
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryStatusApiServlet.java
R 
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/APIExecutionTest.java
A asterixdb/asterix-app/src/test/resources/runtimets/api.xml
A asterixdb/asterix-app/src/test/resources/runtimets/only_api.xml
D asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries/api/query_status_1/query_status_1.1.get.http
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries/api/query_status_2/query_status_2.1.get.http
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries/api/query_status_3/query_status_3.1.get.http
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries/api/query_status_4/query_status_4.1.get.http
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties
M 
hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetReader.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java
M 
hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCSystem.java
15 files changed, 278 insertions(+), 94 deletions(-)

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

Objections:
  Jenkins: Violations found; Violations found



diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryStatusApiServlet.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryStatusApiServlet.java
index 5a62eaa..1c3f4c7 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryStatusApiServlet.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryStatusApiServlet.java
@@ -29,6 +29,7 @@
 
 import org.apache.asterix.app.result.ResultReader;
 import org.apache.hyracks.api.client.IHyracksClientConnection;
+import org.apache.hyracks.api.dataset.DatasetJobRecord;
 import org.apache.hyracks.api.dataset.IHyracksDataset;
 import org.apache.hyracks.api.dataset.ResultSetId;
 import org.apache.hyracks.api.job.JobId;
@@ -38,11 +39,11 @@
 import org.apache.hyracks.http.server.AbstractServlet;
 import org.apache.hyracks.http.server.utils.HttpUtil;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpResponseStatus;
 
 public class QueryStatusApiServlet extends AbstractServlet {
@@ -56,7 +57,7 @@
 protected void get(IServletRequest request, IServletResponse response) {
 response.setStatus(HttpResponseStatus.OK);
 try {
-HttpUtil.setContentType(response, HttpUtil.ContentType.TEXT_HTML, 
HttpUtil.Encoding.UTF8);
+HttpUtil.setContentType(response, HttpUtil.ContentType.TEXT_PLAIN, 
HttpUtil.Encoding.UTF8);
 } catch (IOException e) {
 LOGGER.log(Level.WARNING, "Failure setting content type", e);
 response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR);
@@ -65,6 +66,15 @@
 String strHandle = request.getParameter("handle");
 PrintWriter out = response.writer();
 try {
+ObjectMapper om = new ObjectMapper();
+JsonNode handle = parseHandle(om, strHandle, LOGGER);
+if (handle == null) {
+response.setStatus(HttpResponseStatus.BAD_REQUEST);
+return;
+}
+JobId jobId = new JobId(handle.get(0).asLong());
+ResultSetId rsId = new ResultSetId(handle.get(1).asLong());
+
 IHyracksDataset hds = (IHyracksDataset) 
ctx.get(HYRACKS_DATASET_ATTR);
 if (hds == null) {
 synchronized (ctx) {
@@ -76,12 +86,6 @@
 }
 }
 }
-ObjectMapper om = new ObjectMapper();
-JsonNode handleObj = om.readTree(strHandle);
-JsonNode handle = handleObj.get("handle");
-JobId 

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 5: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1998/ 
: SUCCESS

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Yingyi Bu (Code Review)]

Yingyi Bu has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 5: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 5:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1998/

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 5:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1996/

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 5: BAD-1

BAD Compatibility Tests Failed

https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/630/ : FAILURE

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 5:

BAD Compatibility Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/630/

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 5:

WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN:
* asterixdb
* hyracks-fullstack

PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES!

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 5:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/4432/

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Yingyi Bu 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 4: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1983/ 
: SUCCESS

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 4:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1983/

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 4: BAD-1

BAD Compatibility Tests Failed

https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/618/ : FAILURE

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 4:

BAD Compatibility Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/618/

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 4:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/4412/

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 4:

WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN:
* asterixdb
* hyracks-fullstack

PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES!

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Till Westmann (Code Review)]

Hello Jenkins,

I'd like you to reexamine a change.  Please visit

https://asterix-gerrit.ics.uci.edu/1522

to look at the new patch set (#4).

Change subject: Handle error conditions in the /query/status API
..

Handle error conditions in the /query/status API

Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryStatusApiServlet.java
R 
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/APIExecutionTest.java
A asterixdb/asterix-app/src/test/resources/runtimets/api.xml
A asterixdb/asterix-app/src/test/resources/runtimets/only_api.xml
D asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries/api/query_status_1/query_status_1.1.get.http
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries/api/query_status_2/query_status_2.1.get.http
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries/api/query_status_3/query_status_3.1.get.http
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries/api/query_status_4/query_status_4.1.get.http
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties
M 
hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetReader.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java
M 
hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCSystem.java
15 files changed, 278 insertions(+), 94 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/22/1522/4
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1522
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 3:

WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN:
* asterixdb
* hyracks-fullstack

PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES!

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 3:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/4407/

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Till Westmann (Code Review)]

Hello Jenkins,

I'd like you to reexamine a change.  Please visit

https://asterix-gerrit.ics.uci.edu/1522

to look at the new patch set (#3).

Change subject: Handle error conditions in the /query/status API
..

Handle error conditions in the /query/status API

Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryStatusApiServlet.java
R 
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/APIExecutionTest.java
A asterixdb/asterix-app/src/test/resources/runtimets/api.xml
D asterixdb/asterix-app/src/test/resources/runtimets/cluster_state.xml
R asterixdb/asterix-app/src/test/resources/runtimets/only_api.xml
D asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries/api/query_status_1/query_status_1.1.get.http
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries/api/query_status_2/query_status_2.1.get.http
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries/api/query_status_3/query_status_3.1.get.http
A 
asterixdb/asterix-app/src/test/resources/runtimets/queries/api/query_status_4/query_status_4.1.get.http
M asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties
M 
hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetReader.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java
M 
hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCSystem.java
16 files changed, 253 insertions(+), 122 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/22/1522/3
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1522
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 1: Integration-Tests-1

Integration Tests Timed Out

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1976/ 
: ABORTED

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 1: BAD-1

BAD Compatibility Tests Failed

https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/611/ : FAILURE

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 1:

BAD Compatibility Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/611/

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Till Westmann (Code Review)]

Hello Jenkins,

I'd like you to reexamine a change.  Please visit

https://asterix-gerrit.ics.uci.edu/1522

to look at the new patch set (#2).

Change subject: Handle error conditions in the /query/status API
..

Handle error conditions in the /query/status API

Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryStatusApiServlet.java
A 
asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/QueryStatusApiServletTest.java
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties
M 
hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetReader.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java
M 
hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCSystem.java
7 files changed, 171 insertions(+), 22 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/22/1522/2
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1522
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 1:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1976/

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 1:

WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN:
* asterixdb
* hyracks-fullstack

PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES!

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Handle error conditions in the /query/status API
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/4395/

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: Handle error conditions in the /query/status API

[Till Westmann (Code Review)]

Till Westmann has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1522

Change subject: Handle error conditions in the /query/status API
..

Handle error conditions in the /query/status API

Change-Id: I30176c5c70dcc5f7f6605ad79dd0e41967373d9c
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryStatusApiServlet.java
A 
asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/QueryStatusApiServletTest.java
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java
M 
hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties
M 
hyracks-fullstack/hyracks/hyracks-client/src/main/java/org/apache/hyracks/client/dataset/HyracksDatasetReader.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java
M 
hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCSystem.java
7 files changed, 167 insertions(+), 16 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/22/1522/1

diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryStatusApiServlet.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryStatusApiServlet.java
index 5a62eaa..2a5c1f6 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryStatusApiServlet.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryStatusApiServlet.java
@@ -29,6 +29,7 @@
 
 import org.apache.asterix.app.result.ResultReader;
 import org.apache.hyracks.api.client.IHyracksClientConnection;
+import org.apache.hyracks.api.dataset.DatasetJobRecord;
 import org.apache.hyracks.api.dataset.IHyracksDataset;
 import org.apache.hyracks.api.dataset.ResultSetId;
 import org.apache.hyracks.api.job.JobId;
@@ -38,11 +39,11 @@
 import org.apache.hyracks.http.server.AbstractServlet;
 import org.apache.hyracks.http.server.utils.HttpUtil;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpResponseStatus;
 
 public class QueryStatusApiServlet extends AbstractServlet {
@@ -63,6 +64,11 @@
 return;
 }
 String strHandle = request.getParameter("handle");
+if (strHandle == null) {
+LOGGER.log(Level.WARNING, "No handle provided");
+response.setStatus(HttpResponseStatus.BAD_REQUEST);
+return;
+}
 PrintWriter out = response.writer();
 try {
 IHyracksDataset hds = (IHyracksDataset) 
ctx.get(HYRACKS_DATASET_ATTR);
@@ -77,8 +83,11 @@
 }
 }
 ObjectMapper om = new ObjectMapper();
-JsonNode handleObj = om.readTree(strHandle);
-JsonNode handle = handleObj.get("handle");
+JsonNode handle = parseHandle(om, strHandle);
+if (handle == null) {
+response.setStatus(HttpResponseStatus.BAD_REQUEST);
+return;
+}
 JobId jobId = new JobId(handle.get(0).asLong());
 ResultSetId rsId = new ResultSetId(handle.get(1).asLong());
 
@@ -89,7 +98,13 @@
 resultReader.open(jobId, rsId);
 
 ObjectNode jsonResponse = om.createObjectNode();
-jsonResponse.put("status", resultReader.getStatus().name());
+final DatasetJobRecord.Status status = resultReader.getStatus();
+if (status == null) {
+LOGGER.log(Level.INFO, "No results for: \"" + strHandle + 
"\"");
+response.setStatus(HttpResponseStatus.NOT_FOUND);
+return;
+}
+jsonResponse.put("status", status.name());
 out.write(jsonResponse.toString());
 
 } catch (Exception e) {
@@ -99,4 +114,13 @@
 }
 }
 
+private JsonNode parseHandle(ObjectMapper om, String strHandle) throws 
IOException {
+try {
+JsonNode handleObj = om.readTree(strHandle);
+return handleObj.get("handle");
+} catch (JsonProcessingException e) {
+LOGGER.log(Level.WARNING, "Invalid handle: \"" + strHandle + "\"");
+return null;
+}
+}
 }
diff --git 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/QueryStatusApiServletTest.java
 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/QueryStatusApiServletTest.java
new file mode 100644
index 000..4da384f
--- /dev/null
+++