Return-Path: 
 <derby-commits-return-16687-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
X-Original-To: apmail-db-derby-commits-archive@www.apache.org
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 50179FE22
	for <apmail-db-derby-commits-archive@www.apache.org>;
 Fri, 22 Mar 2013 15:19:36 +0000 (UTC)
Received: (qmail 81742 invoked by uid 500); 22 Mar 2013 15:19:36 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 81715 invoked by uid 500); 22 Mar 2013 15:19:36 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 81708 invoked by uid 99); 22 Mar 2013 15:19:36 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Mar 2013 15:19:36 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Mar 2013 15:19:33 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id DF8AD238889B;
	Fri, 22 Mar 2013 15:19:12 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1459839 - in /db/derby/code/branches/10.10: ./
 java/engine/org/apache/derby/agg/Aggregator.java
Date: Fri, 22 Mar 2013 15:19:12 -0000
To: derby-commits@db.apache.org
From: rhillegas@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130322151912.DF8AD238889B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rhillegas
Date: Fri Mar 22 15:19:12 2013
New Revision: 1459839

URL: http://svn.apache.org/r1459839
Log:
DERBY-672: Port 1459837 from trunk to 10.10 branch.

Modified:
    db/derby/code/branches/10.10/   (props changed)
    db/derby/code/branches/10.10/java/engine/org/apache/derby/agg/Aggregator.java

Propchange: db/derby/code/branches/10.10/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1459837

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/agg/Aggregator.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/agg/Aggregator.java?rev=1459839&r1=1459838&r2=1459839&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/agg/Aggregator.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/agg/Aggregator.java Fri Mar 22 15:19:12 2013
@@ -39,10 +39,22 @@ public interface Aggregator<V,R,A extend
     public  void    accumulate( V value );
 
     /**
+     * <p>
      * For merging another partial result into this Aggregator.
      * This lets the SQL interpreter divide the incoming rows into
      * subsets, aggregating each subset in isolation, and then merging
-     * the partial results together.
+     * the partial results together. This method can be called when
+     * performing a grouped aggregation with a large number of groups.
+     * While processing such a query, Derby may write intermediate grouped
+     * results to disk. The intermediate results may be retrieved and merged
+     * with later results if Derby encounters later rows which belong to groups
+     * whose intermediate results have been written to disk. This situation can
+     * occur with a query like the following:
+     * </p>
+     *
+     * <pre>
+     * select a, mode( b ) from mode_inputs group by a order by a
+     * </pre>
      */
     public  void    merge( A otherAggregator );