Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove VLV search from RequestNotifier #4792

Merged
merged 1 commit into from
Jun 27, 2024
Merged

Remove VLV search from RequestNotifier #4792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions base/server/src/main/java/com/netscape/cmscore/dbs/DBSSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,9 @@ public LDAPSearchResults persistentSearch(
* @param attrs selected attributes
* @return search results in virtual list
* @exception EBaseException failed to search
* @deprecated As of release 11.6.0, replaced by {@link createPagedSearch}
*/
@Deprecated(since = "11.6.0", forRemoval = true)
public <T extends IDBObj> DBVirtualList<T> createVirtualList(
String base,
String filter,
Expand All @@ -343,7 +345,9 @@ public <T extends IDBObj> DBVirtualList<T> createVirtualList(
* @param pageSize page size in the virtual list
* @return search results in virtual list
* @exception EBaseException failed to search
* @deprecated As of release 11.6.0, replaced by {@link createPagedSearch}
*/
@Deprecated(since = "11.6.0", forRemoval = true)
public <T extends IDBObj> DBVirtualList<T> createVirtualList(
String base,
String filter,
Expand All @@ -364,7 +368,9 @@ public <T extends IDBObj> DBVirtualList<T> createVirtualList(
* @param pageSize page size in the virtual list
* @return search results in virtual list
* @exception EBaseException failed to search
* @deprecated As of release 11.6.0, replaced by {@link createPagedSearch}
*/
@Deprecated(since = "11.6.0", forRemoval = true)
public <T extends IDBObj> DBVirtualList<T> createVirtualList(
String base,
String filter,
Expand All @@ -386,7 +392,9 @@ public <T extends IDBObj> DBVirtualList<T> createVirtualList(
* @param pageSize page size in the virtual list
* @return search results in virtual list
* @exception EBaseException failed to search
* @deprecated As of release 11.6.0, replaced by {@link createPagedSearch}
*/
@Deprecated(since = "11.6.0", forRemoval = true)
public <T extends IDBObj> DBVirtualList<T> createVirtualList(
String base,
String filter,
Expand Down
42 changes: 13 additions & 29 deletions base/server/src/main/java/com/netscape/cmscore/request/RequestNotifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@
import java.math.BigInteger;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Vector;

import com.netscape.certsrv.base.EBaseException;
import com.netscape.certsrv.request.IRequestVirtualList;
import com.netscape.certsrv.request.RequestId;
import com.netscape.certsrv.request.RequestListener;
import com.netscape.cmscore.apps.CMSEngine;
import com.netscape.cmscore.dbs.RecordPagedList;

/**
* The RequestNotifier can be registered with a RequestQueue,
Expand Down Expand Up @@ -227,32 +228,26 @@ public synchronized Request getRequest() {

if (id != null && requestRepository != null) {
logger.debug("getRequest request id=" + id);

IRequestVirtualList list;
String filter = "(& (requestID >= " + new RequestId(id) + ")(requeststate=complete))";
RecordPagedList<RequestRecord> list;
try {
list = requestRepository.getPagedRequestsByFilter(
new RequestId(id),
false,
"(requeststate=complete)",
filter,
mMaxRequests,
"requestId");

} catch (EBaseException e) {
throw new RuntimeException(e);
}
Iterator<RequestRecord> itReqRecs = list.iterator();

int s = list.getSize() - list.getCurrentIndex();
logger.debug("getRequest list size: " + s);
for (int i = 0; i < s; i++) {
r = null;
while (itReqRecs.hasNext() && mRequests.size() < mMaxRequests) {
RequestRecord reqRec = itReqRecs.next();
try {
r = list.getElementAt(i);
r = reqRec.toRequest();
} catch (Exception e) {
// handled below
}
if (r == null) {
continue;
}
String requestType = r.getRequestType();
if (requestType == null) {
continue;
Expand All @@ -264,22 +259,11 @@ public synchronized Request getRequest() {
requestType.equals(Request.UNREVOCATION_REQUEST))) {
continue;
}
if (i == 0 && id.equals(r.getRequestId().toString())) {
if (s == 1) {
break;
}
continue;
}
if (mRequests.size() < mMaxRequests) {
mRequests.addElement(r.getRequestId().toString());
logger.debug("getRequest added "
+ r.getRequestType() + " request " + r.getRequestId().toString() +
" to mRequests: " + mRequests.size() + " (" + mMaxRequests + ")");
} else {
break;
}
mRequests.addElement(r.getRequestId().toString());
logger.debug("getRequest added {} request {} to mRequests: {} ({})",
r.getRequestType(), r.getRequestId().toString(), mRequests.size(), mMaxRequests);
}
logger.debug("getRequest done with adding requests to mRequests: " + mRequests.size());
logger.debug("getRequest done with adding requests to mRequests: {}", mRequests.size());
} else {
logger.warn("getRequest has no access to the request queue");
}
Expand Down
2 changes: 2 additions & 0 deletions base/server/src/main/java/com/netscape/cmscore/request/RequestRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ public int getTotalRequestsByFilter(
* @param pageSize page size
* @param sortKey the attributes to sort by
* @return request list
* @deprecated As of release 11.6.0
*/
@Deprecated(since = "11.6.0", forRemoval = true)
public IRequestVirtualList getPagedRequestsByFilter(
RequestId fromID,
boolean jumpToEnd,
Expand Down
Loading