Repository: asterixdb Updated Branches: refs/heads/master bf1aea2ac -> 6dde58257
[ASTERIXDB-2029][COMP]Remove "this" from dataset errors - user model changes: improves error message - storage format changes: no - interface changes: no details: - Error message for drop dataset operation had the word "this" as part of the error message. It was removed Change-Id: Ifc74edb44aef8bfac3cb73fb8192bf6c353a66de Reviewed-on: https://asterix-gerrit.ics.uci.edu/1928 Reviewed-by: abdullah alamoudi <bamou...@gmail.com> Integration-Tests: abdullah alamoudi <bamou...@gmail.com> Tested-by: abdullah alamoudi <bamou...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/6dde5825 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/6dde5825 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/6dde5825 Branch: refs/heads/master Commit: 6dde58257cdd56de5e85010636bf1493e8fceb81 Parents: bf1aea2 Author: Abdullah Alamoudi <bamou...@gmail.com> Authored: Tue Aug 8 18:49:55 2017 -0700 Committer: abdullah alamoudi <bamou...@gmail.com> Committed: Tue Aug 8 23:16:10 2017 -0700 ---------------------------------------------------------------------- .../org/apache/asterix/app/translator/QueryTranslator.java | 7 +++---- .../java/org/apache/asterix/common/exceptions/ErrorCode.java | 1 + .../src/main/resources/asx_errormsg/en.properties | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/6dde5825/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java index 28cb998..027fbbe 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java @@ -1162,8 +1162,8 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } // # check whether any function in current dataverse is being used by others - List<Function> functionsInDataverse = MetadataManager.INSTANCE.getDataverseFunctions(mdTxnCtx, - dataverseName); + List<Function> functionsInDataverse = + MetadataManager.INSTANCE.getDataverseFunctions(mdTxnCtx, dataverseName); for (Function function : functionsInDataverse) { if (checkWhetherFunctionIsBeingUsed(mdTxnCtx, function.getDataverseName(), function.getName(), function.getArity(), dataverseName)) { @@ -1331,8 +1331,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen MetadataManager.INSTANCE.commitTransaction(mdTxnCtx.getValue()); return; } else { - throw new AlgebricksException("There is no dataset with this name " + datasetName + " in dataverse " - + dataverseName + "."); + throw new AsterixException(ErrorCode.NO_DATASET_WITH_NAME, dataverseName, datasetName); } } ds.drop(metadataProvider, mdTxnCtx, jobsToExecute, bActiveTxn, progress, hcc, dropCorrespondingNodeGroup); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/6dde5825/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java index 5aed5f2..143f7d1 100644 --- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java +++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java @@ -121,6 +121,7 @@ public class ErrorCode { public static final int UPGRADE_FAILED_LOCK_WAS_NOT_ACQUIRED = 1047; public static final int DOWNGRADE_FAILED_LOCK_WAS_NOT_ACQUIRED = 1048; public static final int LOCK_WAS_ACQUIRED_DIFFERENT_OPERATION = 1049; + public static final int NO_DATASET_WITH_NAME = 1050; // Feed errors public static final int DATAFLOW_ILLEGAL_STATE = 3001; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/6dde5825/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties index a7a1990..715c27d 100644 --- a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties +++ b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties @@ -107,6 +107,7 @@ 1047 = Metadata lock cannot be upgraded! because it was not acquired before 1048 = Metadata lock cannot be downgraded! because it was not acquired before 1049 = Metadata lock cannot be acquired for %1$s since it is already acquired for %2$s +1050 = There is no dataset with name %2$s in dataverse %1$s # Feed Errors 3001 = Illegal state.
