You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2015/09/14 17:19:14 UTC
directory-fortress-core git commit: FC-118 - Review manager find
users does not limit correctly
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 7a6674bb3 -> b9510ef6f
FC-118 - Review manager find users does not limit correctly
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/b9510ef6
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/b9510ef6
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/b9510ef6
Branch: refs/heads/master
Commit: b9510ef6fa8fdf1277d551a396ef6142e92aaee5
Parents: 7a6674b
Author: Shawn McKinney <sm...@apache.org>
Authored: Mon Sep 14 10:18:37 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Mon Sep 14 10:18:37 2015 -0500
----------------------------------------------------------------------
.../fortress/core/impl/AdminRoleDAO.java | 2 +-
.../directory/fortress/core/impl/PermDAO.java | 2 +-
.../directory/fortress/core/impl/RoleDAO.java | 2 +-
.../directory/fortress/core/impl/UserDAO.java | 8 ++--
.../core/ldap/ApacheDsDataProvider.java | 39 +-------------------
5 files changed, 8 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/b9510ef6/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
index 3bba089..b9336e9 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
@@ -524,7 +524,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
+ ROLE_NM + "=" + searchVal + "*))";
ld = getAdminConnection();
SearchCursor searchResults = search( ld, roleRoot,
- SearchScope.ONELEVEL, filter, ROLE_NM_ATR, false, GlobalIds.BATCH_SIZE, limit );
+ SearchScope.ONELEVEL, filter, ROLE_NM_ATR, false, limit );
while ( searchResults.next() )
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/b9510ef6/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
index 05ceb82..377b895 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
@@ -1206,7 +1206,7 @@ final class PermDAO extends ApacheDsDataProvider
ld = getAdminConnection();
SearchCursor searchResults = search( ld, permRoot,
- SearchScope.SUBTREE, filterbuf.toString(), PERMISION_OBJ_ATRS, false, GlobalIds.BATCH_SIZE, maxLimit );
+ SearchScope.SUBTREE, filterbuf.toString(), PERMISION_OBJ_ATRS, false, maxLimit );
long sequence = 0;
while ( searchResults.next() )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/b9510ef6/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
index ec17bb7..5462482 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
@@ -488,7 +488,7 @@ final class RoleDAO extends ApacheDsDataProvider
+ ROLE_NM + "=" + searchVal + "*))";
ld = getAdminConnection();
SearchCursor searchResults = search( ld, roleRoot,
- SearchScope.ONELEVEL, filter, ROLE_NM_ATR, false, GlobalIds.BATCH_SIZE, limit );
+ SearchScope.ONELEVEL, filter, ROLE_NM_ATR, false, limit );
while ( searchResults.next() )
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/b9510ef6/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
index 72207a8..2c1b423 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
@@ -1225,8 +1225,7 @@ final class UserDAO extends ApacheDsDataProvider
ld = getAdminConnection();
SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), USERID,
- false, GlobalIds
- .BATCH_SIZE, limit );
+ false, limit );
while ( searchResults.next() )
{
@@ -1532,8 +1531,7 @@ final class UserDAO extends ApacheDsDataProvider
ld = getAdminConnection();
SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), USERID,
- false, GlobalIds
- .BATCH_SIZE, limit );
+ false, limit );
while ( searchResults.next() )
{
@@ -1649,7 +1647,7 @@ final class UserDAO extends ApacheDsDataProvider
ld = getAdminConnection();
SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), defaultAtrs, false,
- GlobalIds.BATCH_SIZE, maxLimit );
+ maxLimit );
long sequence = 0;
while ( searchResults.next() )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/b9510ef6/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java b/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
index 6276964..ed2b944 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
@@ -744,39 +744,6 @@ public abstract class ApacheDsDataProvider
/**
- * Perform normal ldap search specifying default batch size.
- *
- * @param connection is LdapConnection object used for all communication with host.
- * @param baseDn contains address of distinguished name to begin ldap search
- * @param scope indicates depth of search starting at basedn. 0 (base dn),
- * 1 (one level down) or 2 (infinite) are valid values.
- * @param filter contains the search criteria
- * @param attrs is the requested list of attributes to return from directory search.
- * @param attrsOnly if true pull back attribute names only.
- * @param batchSize Will block until this many entries are ready to return from server. 0 indicates to block
- * until all results are ready.
- * @return result set containing ldap entries returned from directory.
- * @throws LdapException thrown in the event of error in ldap client or server code.
- */
- protected SearchCursor search( LdapConnection connection, String baseDn, SearchScope scope, String filter,
- String[] attrs, boolean attrsOnly, int batchSize ) throws LdapException
- {
- COUNTERS.incrementSearch();
-
- SearchRequest searchRequest = new SearchRequestImpl();
-
- searchRequest.setBase( new Dn( baseDn ) );
- searchRequest.setFilter( filter );
- searchRequest.setScope( scope );
- searchRequest.setSizeLimit( batchSize );
- searchRequest.setTypesOnly( attrsOnly );
- searchRequest.addAttributes( attrs );
-
- return connection.search( searchRequest );
- }
-
-
- /**
* Perform normal ldap search specifying default batch size and max entries to return.
*
* @param connection is LdapConnection object used for all communication with host.
@@ -786,14 +753,12 @@ public abstract class ApacheDsDataProvider
* @param filter contains the search criteria
* @param attrs is the requested list of attritubutes to return from directory search.
* @param attrsOnly if true pull back attribute names only.
- * @param batchSize Will block until this many entries are ready to return from server. 0 indicates to block
- * until all results are ready.
* @param maxEntries specifies the maximum number of entries to return in this search query.
* @return result set containing ldap entries returned from directory.
* @throws LdapException thrown in the event of error in ldap client or server code.
*/
protected SearchCursor search( LdapConnection connection, String baseDn, SearchScope scope, String filter,
- String[] attrs, boolean attrsOnly, int batchSize, int maxEntries ) throws LdapException
+ String[] attrs, boolean attrsOnly, int maxEntries ) throws LdapException
{
COUNTERS.incrementSearch();
@@ -802,7 +767,7 @@ public abstract class ApacheDsDataProvider
searchRequest.setBase( new Dn( baseDn ) );
searchRequest.setFilter( filter );
searchRequest.setScope( scope );
- searchRequest.setSizeLimit( batchSize );
+ searchRequest.setSizeLimit( maxEntries );
searchRequest.setTypesOnly( attrsOnly );
searchRequest.addAttributes( attrs );