modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java | 1 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/SavedSearchResultCountRecalculationJob.java | 3 +++ 2 files changed, 4 insertions(+)
New commits: commit 7b7bb8dcdf742c99d10550917ab7d2bd30d9b9ad Author: Joseph Marques joseph@redhat.com Date: Tue Jan 4 16:19:56 2011 -0500
make recalculation of the saved search patterns efficient
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/SavedSearchResultCountRecalculationJob.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/SavedSearchResultCountRecalculationJob.java index 621cd33..17968a0 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/SavedSearchResultCountRecalculationJob.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/SavedSearchResultCountRecalculationJob.java @@ -29,6 +29,7 @@ import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.criteria.SavedSearchCriteria; +import org.rhq.core.domain.criteria.Criteria.Restriction; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.search.SavedSearch; @@ -69,6 +70,7 @@ public class SavedSearchResultCountRecalculationJob extends AbstractStatefulJob
if (next.getSearchSubsystem() == SearchSubsystem.RESOURCE) { ResourceCriteria criteria = new ResourceCriteria(); + criteria.setRestriction(Restriction.COUNT_ONLY); criteria.setSearchExpression(next.getPattern());
totalMillis -= System.currentTimeMillis(); @@ -81,6 +83,7 @@ public class SavedSearchResultCountRecalculationJob extends AbstractStatefulJob
} else if (next.getSearchSubsystem() == SearchSubsystem.GROUP) { ResourceGroupCriteria criteria = new ResourceGroupCriteria(); + criteria.setRestriction(Restriction.COUNT_ONLY); criteria.setSearchExpression(next.getPattern());
totalMillis -= System.currentTimeMillis();
commit ff057c90540d9968626bdaeddfd11ad266802bda Author: Joseph Marques joseph@redhat.com Date: Tue Jan 4 15:23:58 2011 -0500
no longer on an active saved search after deleting it
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java index 5af90c6..928e448 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java @@ -434,6 +434,7 @@ public class FlexSearchBar extends AbstractSearchBar { @Override public void onSuccess(Void result) { CoreGUI.getMessageCenter().notify(new Message("Saved search deletion success", Severity.Info)); + currentSearchId = 0; } }); }
rhq-commits@lists.fedorahosted.org