Fixed default cert-find filter.

To improve the performance the default LDAP filter generated by
cert-find has been changed to (certStatus=*) to match an existing
VLV index.

https://fedorahosted.org/pki/ticket/1449

1 files changed, 8 insertions, 8 deletions

diff --git a/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java b/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java
index ee974d446..e43909bbb 100644
--- a/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java
+++ b/base/ca/src/org/dogtagpki/server/ca/rest/CertService.java
@@ -367,15 +367,13 @@ public class CertService extends PKIService implements CertResource {
     }
 
     private String createSearchFilter(String status) {
-        String filter = "";
+        String filter;
 
-        if ((status == null)) {
-            filter = "(serialno=*)";
-            return filter;
-        }
+        if (status == null) {
+            filter = "(certstatus=*)"; // allCerts VLV
 
-        if (status != null) {
-            filter += "(certStatus=" + LDAPUtil.escapeFilter(status) + ")";
+        } else  {
+            filter = "(certStatus=" + LDAPUtil.escapeFilter(status) + ")";
         }
 
         return filter;
@@ -398,7 +396,7 @@ public class CertService extends PKIService implements CertResource {
         size       = size == null ? DEFAULT_SIZE : size;
 
         String filter = createSearchFilter(status);
-        CMS.debug("listCerts: filter is " + filter);
+        CMS.debug("CertService.listCerts: filter: " + filter);
 
         CertDataInfos infos = new CertDataInfos();
         try {
@@ -450,7 +448,9 @@ public class CertService extends PKIService implements CertResource {
 
         start = start == null ? 0 : start;
         size = size == null ? DEFAULT_SIZE : size;
+
         String filter = createSearchFilter(data);
+        CMS.debug("CertService.searchCerts: filter: " + filter);
 
         CertDataInfos infos = new CertDataInfos();
         try {