Alissa Bonas has uploaded a new change for review. Change subject: core: refactor SearchQuery class ......................................................................
core: refactor SearchQuery class Small refactorings - simplify expression, remove redundant local var and move assignment next to its usage. Change-Id: Ie4c2e8dcc0e611dbba1667709e9601337979a136 Signed-off-by: Alissa Bonas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/27736/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java index 5d5e378..6de9e3e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java @@ -301,8 +301,6 @@ String searchKey = ""; try { String searchText = getParameters().getSearchPattern(); - // find if this is a trivial search expression (like 'Vms:' etc). - isSafe = SearchObjects.isSafeExpression(searchText); if (useCache) { // first lets check the cache of queries. searchKey = String.format("%1$s,%2$s,%3$s", searchText, getParameters().getMaxCount(), getParameters().getCaseSensitive()); @@ -344,9 +342,8 @@ SyntaxContainer searchObj = curSyntaxChecker.analyzeSyntaxState(searchText, true); // set the case-sensitive flag searchObj.setCaseSensitive(getParameters().getCaseSensitive()); - int maxValue = Integer.MAX_VALUE; // If a number > maxValue is given then maxValue will be used - searchObj.setMaxCount(getParameters().getMaxCount() == -1 ? maxValue : Math.min(maxValue, getParameters().getMaxCount())); + searchObj.setMaxCount(getParameters().getMaxCount() == -1 ? Integer.MAX_VALUE : Math.min(Integer.MAX_VALUE, getParameters().getMaxCount())); // setting FromSearch value searchObj.setSearchFrom(getParameters().getSearchFrom()); @@ -370,10 +367,12 @@ getQueryReturnValue().setExceptionString(error); return null; } - if (searchObj.getvalid() != true) { + if (!searchObj.getvalid()) { log.warnFormat("ResourceManager::searchBusinessObjects - Invalid search text - ''{0}''", searchText); return null; } + // find if this is a trivial search expression (like 'Vms:' etc). + isSafe = SearchObjects.isSafeExpression(searchText); // An expression is considered safe if matches a trivial search. data = new QueryData(curSyntaxChecker.generateQueryFromSyntaxContainer(searchObj, isSafe), -- To view, visit http://gerrit.ovirt.org/27736 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4c2e8dcc0e611dbba1667709e9601337979a136 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
