Merge pull request #30 from openstandia/improve-perf

fix: improve performance
openstandia · Mar 8, 2023 · e0bd2ac · e0bd2ac
2 parents 17bf9eb + aee535c
commit e0bd2ac
Show file tree

Hide file tree

Showing 8 changed files with 716 additions and 91 deletions.
diff --git a/handler_search_generic.go b/handler_search_generic.go
@@ -81,19 +81,18 @@ func handleSearch(s *Server, w ldap.ResponseWriter, m *ldap.Message) {
 	}
 
 	// Phase 4: execute SQL and return entries
-	// TODO configurable default pageSize
-	var pageSize int32 = 500
+	var pageSize int32 = s.config.DefaultPageSize
 	if pageControl != nil {
 		pageSize = pageControl.Size()
 	}
 
 	sessionMap := getPageSession(m)
-	var offset int32
+	var cusor int64
 	if pageControl != nil {
 		reqCookie := pageControl.Cookie()
 		if reqCookie != "" {
 			var ok bool
-			if offset, ok = sessionMap[reqCookie]; ok {
+			if cusor, ok = sessionMap[reqCookie]; ok {
 				log.Printf("debug: paged results cookie is ok")
 
 				// clear cookie
@@ -114,13 +113,13 @@ func handleSearch(s *Server, w ldap.ResponseWriter, m *ldap.Message) {
 		Scope:                      scope,
 		Filter:                     r.Filter(),
 		PageSize:                   pageSize,
-		Offset:                     offset,
+		Cursor:                     &cusor,
 		RequestedAssocation:        getRequestedMemberAttrs(r),
 		IsMemberOfRequested:        isMemberOfRequested(r),
 		IsHasSubordinatesRequested: isHasSubOrdinatesRequested(r),
 	}
 
-	maxCount, limittedCount, err := s.Repo().Search(ctx, baseDN, option, func(searchEntry *SearchEntry) error {
+	count, nextId, err := s.Repo().Search(ctx, baseDN, option, func(searchEntry *SearchEntry) error {
 		responseEntry(s, w, m, r, searchEntry)
 		return nil
 	})
@@ -129,7 +128,7 @@ func handleSearch(s *Server, w ldap.ResponseWriter, m *ldap.Message) {
 		return
 	}
 
-	if maxCount == 0 {
+	if count == 0 {
 		log.Printf("debug: Not found")
 
 		// Must return success if no hit
@@ -140,19 +139,19 @@ func handleSearch(s *Server, w ldap.ResponseWriter, m *ldap.Message) {
 
 	var nextCookie string
 
-	if limittedCount+offset < maxCount {
+	if count == option.PageSize+1 {
 		uuid, _ := uuid.NewRandom()
 		nextCookie = uuid.String()
 
 		sessionMap := getPageSession(m)
-		sessionMap[nextCookie] = offset + pageSize
+		sessionMap[nextCookie] = nextId
 	}
 
 	res := ldap.NewSearchResultDoneResponse(ldap.LDAPResultSuccess)
 
 	if pageControl != nil {
 		// https://www.ietf.org/rfc/rfc2696.txt
-		control := message.NewSimplePagedResultsControl(maxCount, false, nextCookie)
+		control := message.NewSimplePagedResultsControl(0, false, nextCookie)
 		var controls message.Controls = []message.Control{control}
 
 		w.WriteControls(res, &controls)