Merge pull request #7 from eapache/shortcircuit-batcher

batcher: short-circuit when timeout is 0

batcher/batcher.go

@@ -22,7 +22,9 @@ type Batcher struct {
 }
 
 // New constructs a new batcher that will batch all calls to Run that occur within
-// `timeout` time before calling doWork just once for the entire batch.
+// `timeout` time before calling doWork just once for the entire batch. The doWork
+// function must be safe to run concurrently with itself as this may occur, especially
+// when the timeout is small.
 func New(timeout time.Duration, doWork func([]interface{}) error) *Batcher {
 	return &Batcher{
 		timeout: timeout,
@@ -40,6 +42,10 @@ func (b *Batcher) Run(param interface{}) error {
 		}
 	}
 
+	if b.timeout == 0 {
+		return b.doWork([]interface{}{param})
+	}
+
 	w := &work{
 		param:  param,
 		future: make(chan error, 1),

batcher/batcher_test.go

@@ -32,6 +32,13 @@ func TestBatcherSuccess(t *testing.T) {
 		}()
 	}
 	wg.Wait()
+
+	b = New(0, returnsSuccess)
+	for i := 0; i < 10; i++ {
+		if err := b.Run(nil); err != nil {
+			t.Error(err)
+		}
+	}
 }
 
 func TestBatcherError(t *testing.T) {