Fix potential issues of ChannelQueue.

Author: johnteee

queue.go

@@ -100,35 +100,30 @@ func (q ChannelQueue[T]) Put(val T) error {
 }
 
 // PutWithTimeout Put the T val(blocking), with timeout
-func (q ChannelQueue[T]) PutWithTimeout(val T, timeout *time.Duration) error {
-	if timeout == nil {
-		return q.Put(val)
-	}
-
+func (q ChannelQueue[T]) PutWithTimeout(val T, timeout time.Duration) error {
 	select {
 	case q <- val:
 		return nil
-	case <-time.After(*timeout):
+	case <-time.After(timeout):
 		return ErrQueuePutTimeout
 	}
 }
 
 // Take Take the T val(blocking)
 func (q ChannelQueue[T]) Take() (T, error) {
-	val := <-q
+	val, ok := <-q
+	if !ok {
+		return *new(T), ErrQueueIsClosed
+	}
 	return val, nil
 }
 
 // TakeWithTimeout Take the T val(blocking), with timeout
-func (q ChannelQueue[T]) TakeWithTimeout(timeout *time.Duration) (T, error) {
-	if timeout == nil {
-		return q.Take()
-	}
-
+func (q ChannelQueue[T]) TakeWithTimeout(timeout time.Duration) (T, error) {
 	select {
 	case val := <-q:
 		return val, nil
-	case <-time.After(*timeout):
+	case <-time.After(timeout):
 		return *new(T), ErrQueueTakeTimeout
 	}
 }

queue_test.go

@@ -44,38 +44,38 @@ func TestChannelQueue(t *testing.T) {
 	result = 0
 	timeout = 1 * time.Millisecond
 	go func() {
-		result, err = channelQueue.TakeWithTimeout(&timeout)
+		result, err = channelQueue.TakeWithTimeout(timeout)
 		assert.Equal(t, nil, err)
 		assert.Equal(t, 1, result)
-		result, err = channelQueue.TakeWithTimeout(&timeout)
+		result, err = channelQueue.TakeWithTimeout(timeout)
 		assert.Equal(t, nil, err)
 		assert.Equal(t, 2, result)
-		result, err = channelQueue.TakeWithTimeout(&timeout)
+		result, err = channelQueue.TakeWithTimeout(timeout)
 		assert.Equal(t, nil, err)
 		assert.Equal(t, 3, result)
-		result, err = channelQueue.TakeWithTimeout(&timeout)
+		result, err = channelQueue.TakeWithTimeout(timeout)
 		assert.NotEqual(t, 4, result)
 		assert.NotEqual(t, nil, err)
 		assert.Equal(t, 0, result)
 		assert.Equal(t, ErrQueueTakeTimeout, err)
 	}()
 	go func() {
-		err = channelQueue.PutWithTimeout(1, &timeout)
+		err = channelQueue.PutWithTimeout(1, timeout)
 		assert.Equal(t, nil, err)
-		err = channelQueue.PutWithTimeout(2, &timeout)
+		err = channelQueue.PutWithTimeout(2, timeout)
 		assert.Equal(t, nil, err)
-		err = channelQueue.PutWithTimeout(3, &timeout)
+		err = channelQueue.PutWithTimeout(3, timeout)
 		assert.Equal(t, nil, err)
 
 		time.Sleep(3 * timeout / 2)
 
-		err = channelQueue.PutWithTimeout(4, &timeout)
+		err = channelQueue.PutWithTimeout(4, timeout)
 		assert.Equal(t, nil, err)
-		err = channelQueue.PutWithTimeout(5, &timeout)
+		err = channelQueue.PutWithTimeout(5, timeout)
 		assert.Equal(t, nil, err)
-		err = channelQueue.PutWithTimeout(6, &timeout)
+		err = channelQueue.PutWithTimeout(6, timeout)
 		assert.Equal(t, nil, err)
-		err = channelQueue.PutWithTimeout(7, &timeout)
+		err = channelQueue.PutWithTimeout(7, timeout)
 		assert.NotEqual(t, nil, err)
 		assert.Equal(t, ErrQueuePutTimeout, err)
 	}()