modify Add method

Author: torchcc

queue/interface_collection.go

@@ -100,30 +100,12 @@ type Collection interface {
 	ContainsAll(c Collection) bool
 
 	/**
-	 * Adds all of the elements in the specified collection to this collection
-	 * (optional operation).  The behavior of this operation is undefined if
-	 * the specified collection is modified while the operation is in progress.
-	 * (This implies that the behavior of this call is undefined if the
-	 * specified collection is this collection, and this collection is
-	 * nonempty.)
-	 *
-	 * @param c collection containing elements to be added to this collection
-	 * @return <tt>true</tt> if this collection changed as a result of the call
-	 * @throws UnsupportedOperationException if the <tt>addAll</tt> operation
-	 *         is not supported by this collection
-	 * @throws ClassCastException if the class of an element of the specified
-	 *         collection prevents it from being added to this collection
-	 * @throws NullPointerException if the specified collection contains a
-	 *         null element and this collection does not permit null elements,
-	 *         or if the specified collection is null
-	 * @throws IllegalArgumentException if some property of an element of the
-	 *         specified collection prevents it from being added to this
-	 *         collection
-	 * @throws IllegalStateException if not all the elements can be added at
-	 *         this time due to insertion restrictions
-	 * @see #add(Object)
+	 * @Description:
+	 * @param c
+	 * @return bool indicate whether c has changed or not when the method return
+	 * @return error indicate error happened during adding.
 	 */
-	AddAll(c Collection) bool
+	AddAll(c Collection) (bool, error)
 
 	/**
 	 * Removes all of this collection's elements that are also contained in the
@@ -151,10 +133,10 @@ type Collection interface {
 	RemoveAll(c Collection) bool
 
 	/**
-     * Removes all of the elements of this collection that satisfy the given
-     * predicate.  Errors or runtime exceptions thrown during iteration or by
-     * the predicate are relayed to the caller.
-     *
+	 * Removes all of the elements of this collection that satisfy the given
+	 * predicate.  Errors or runtime exceptions thrown during iteration or by
+	 * the predicate are relayed to the caller.
+	 *
 	 */
 	RemoveIf(filter func(value interface{}) bool) bool
 

queue/linked_blocking_queue.go

@@ -352,21 +352,37 @@ func (q *LinkedBlockingQueue) ContainsAll(c Collection) bool {
 	return containsAll
 }
 
-func (q *LinkedBlockingQueue) AddAll(c Collection) bool {
+/**
+* @Description: if q's capacity is not enough,  it will add all non-nil element of Collection c to q until q is full.
+ 				 nil element in c will be skipped . it'll return FullError/ NilPointerError to indicate error.
+* @receiver q
+* @param c  if c is nil, it'll panic NilPointerError, if c is
+* @return bool indicates whether the origin queue has been changed or not when the func return
+*/
+func (q *LinkedBlockingQueue) AddAll(c Collection) (modified bool, err error) {
 	if c == nil {
-		panic(NilPointerError)
+		return false, NilPointerError
 	}
-	if toAdd, ok := c.(*LinkedBlockingQueue); ok && toAdd == q {
-		panic(IllegalArgumentError)
-	}
-	modified := false
+	q.fullyLock()
+	defer q.fullyUnlock()
+	remainingCapacity := int64(q.RemainingCapacity())
+	var n int64
 	c.Range(func(value interface{}) bool {
-		if q.Add(value) {
-			modified = true
+		if value == nil {
+			err = NilPointerError
+			return true
 		}
+		if n == remainingCapacity {
+			err = FullError
+			return false
+		}
+		modified = true
+		q.head.PushBack(value)
+		n++
 		return true
 	})
-	return modified
+	atomic.AddInt64(&q.length, n)
+	return
 }
 
 func (q *LinkedBlockingQueue) RemoveAll(c Collection) bool {