From 7ccc8e270f8a8d7286c62a5ac2f872f206bd5351 Mon Sep 17 00:00:00 2001 From: jingjingwang Date: Fri, 20 Jan 2017 14:59:51 -0800 Subject: [PATCH] which dataset --- .../escience/myria/api/DatasetResource.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/edu/washington/escience/myria/api/DatasetResource.java b/src/edu/washington/escience/myria/api/DatasetResource.java index 4636c27de..dc4e863d7 100644 --- a/src/edu/washington/escience/myria/api/DatasetResource.java +++ b/src/edu/washington/escience/myria/api/DatasetResource.java @@ -103,11 +103,11 @@ public Response getDataset( @PathParam("programName") final String programName, @PathParam("relationName") final String relationName) throws DbException { - DatasetStatus status = - server.getDatasetStatus(RelationKey.of(userName, programName, relationName)); + RelationKey relationKey = RelationKey.of(userName, programName, relationName); + DatasetStatus status = server.getDatasetStatus(relationKey); if (status == null) { /* Not found, throw a 404 (Not Found) */ - throw new MyriaApiException(Status.NOT_FOUND, "That dataset was not found"); + throw new MyriaApiException(Status.NOT_FOUND, "Dataset " + relationKey + " was not found"); } status.setUri(getCanonicalResourcePath(uriInfo, status.getRelationKey())); /* Yay, worked! */ @@ -355,13 +355,12 @@ public Response deleteDataset( @PathParam("programName") final String programName, @PathParam("relationName") final String relationName) throws DbException { - DatasetStatus status = - server.getDatasetStatus(RelationKey.of(userName, programName, relationName)); + RelationKey relationKey = RelationKey.of(userName, programName, relationName); + DatasetStatus status = server.getDatasetStatus(relationKey); if (status == null) { /* Dataset not found, throw a 404 (Not Found) */ - throw new MyriaApiException(Status.NOT_FOUND, "That dataset was not found"); + throw new MyriaApiException(Status.NOT_FOUND, "Dataset " + relationKey + " was not found"); } - RelationKey relationKey = status.getRelationKey(); // delete command try { server.deleteDataset(relationKey); @@ -586,7 +585,7 @@ private Response doIngest( /* Check overwriting existing dataset. */ try { if (!MoreObjects.firstNonNull(overwrite, false) && server.getSchema(relationKey) != null) { - throw new MyriaApiException(Status.CONFLICT, "That dataset already exists."); + throw new MyriaApiException(Status.CONFLICT, "Dataset " + relationKey + " already exists."); } } catch (CatalogException e) { throw new DbException(e); @@ -662,7 +661,8 @@ public Response addDatasetToCatalog(final DatasetEncoding dataset, @Context fina if (!MoreObjects.firstNonNull(dataset.overwrite, Boolean.FALSE) && server.getSchema(dataset.relationKey) != null) { /* Found, throw a 409 (Conflict) */ - throw new MyriaApiException(Status.CONFLICT, "That dataset already exists."); + throw new MyriaApiException( + Status.CONFLICT, "Dataset " + dataset.relationKey + " already exists."); } } catch (CatalogException e) { throw new DbException(e);