refactor: pass channelSize to be able to controll buffered channel by the caller go-ldap#319

Author: t2y

examples_test.go

@@ -70,7 +70,7 @@ func ExampleConn_SearchWithChannel() {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	ch := l.SearchWithChannel(ctx, searchRequest)
+	ch := l.SearchWithChannel(ctx, searchRequest, 64)
 	for res := range ch {
 		if res.Error != nil {
 			log.Fatalf("Error searching: %s", res.Error)

ldap_test.go

@@ -362,7 +362,7 @@ func TestSearchWithChannel(t *testing.T) {
 
 	srs := make([]*Entry, 0)
 	ctx := context.Background()
-	for sr := range l.SearchWithChannel(ctx, searchRequest) {
+	for sr := range l.SearchWithChannel(ctx, searchRequest, 64) {
 		if sr.Error != nil {
 			t.Fatal(err)
 		}
@@ -390,7 +390,7 @@ func TestSearchWithChannelAndCancel(t *testing.T) {
 	srs := make([]*Entry, 0)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	ch := l.SearchWithChannel(ctx, searchRequest)
+	ch := l.SearchWithChannel(ctx, searchRequest, 0)
 	for i := 0; i < 10; i++ {
 		sr := <-ch
 		if sr.Error != nil {

search.go

@@ -587,8 +587,13 @@ func (l *Conn) Search(searchRequest *SearchRequest) (*SearchResult, error) {
 // all results until an error happens (or the search successfully finished),
 // e.g. for size / time limited requests all are recieved via the channel
 // until the limit is reached.
-func (l *Conn) SearchWithChannel(ctx context.Context, searchRequest *SearchRequest) <-chan *SearchSingleResult {
-	ch := make(chan *SearchSingleResult)
+func (l *Conn) SearchWithChannel(ctx context.Context, searchRequest *SearchRequest, channelSize int) <-chan *SearchSingleResult {
+	var ch chan *SearchSingleResult
+	if channelSize > 0 {
+		ch = make(chan *SearchSingleResult, channelSize)
+	} else {
+		ch = make(chan *SearchSingleResult)
+	}
 	go func() {
 		defer close(ch)
 		if l.IsClosing() {

v3/examples_test.go

@@ -70,7 +70,7 @@ func ExampleConn_SearchWithChannel() {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	ch := l.SearchWithChannel(ctx, searchRequest)
+	ch := l.SearchWithChannel(ctx, searchRequest, 64)
 	for res := range ch {
 		if res.Error != nil {
 			log.Fatalf("Error searching: %s", res.Error)

v3/ldap_test.go

@@ -362,7 +362,7 @@ func TestSearchWithChannel(t *testing.T) {
 
 	srs := make([]*Entry, 0)
 	ctx := context.Background()
-	for sr := range l.SearchWithChannel(ctx, searchRequest) {
+	for sr := range l.SearchWithChannel(ctx, searchRequest, 64) {
 		if sr.Error != nil {
 			t.Fatal(err)
 		}
@@ -390,7 +390,7 @@ func TestSearchWithChannelAndCancel(t *testing.T) {
 	srs := make([]*Entry, 0)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	ch := l.SearchWithChannel(ctx, searchRequest)
+	ch := l.SearchWithChannel(ctx, searchRequest, 0)
 	for i := 0; i < 10; i++ {
 		sr := <-ch
 		if sr.Error != nil {

v3/search.go

@@ -589,8 +589,13 @@ func (l *Conn) Search(searchRequest *SearchRequest) (*SearchResult, error) {
 // all results until an error happens (or the search successfully finished),
 // e.g. for size / time limited requests all are recieved via the channel
 // until the limit is reached.
-func (l *Conn) SearchWithChannel(ctx context.Context, searchRequest *SearchRequest) <-chan *SearchSingleResult {
-	ch := make(chan *SearchSingleResult)
+func (l *Conn) SearchWithChannel(ctx context.Context, searchRequest *SearchRequest, channelSize int) <-chan *SearchSingleResult {
+	var ch chan *SearchSingleResult
+	if channelSize > 0 {
+		ch = make(chan *SearchSingleResult, channelSize)
+	} else {
+		ch = make(chan *SearchSingleResult)
+	}
 	go func() {
 		defer close(ch)
 		if l.IsClosing() {