[groovy] branch master updated: Revert "Conceal the non-standard aggregate function `agg` of GINQ"

[su...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new 902493d  Revert "Conceal the non-standard aggregate function `agg` of GINQ"
902493d is described below

commit 902493d2d832ece4b39049620eeb0c8ad3f9ede9
Author: Daniel Sun <su...@apache.org>
AuthorDate: Tue Jul 20 07:47:30 2021 +0800

    Revert "Conceal the non-standard aggregate function `agg` of GINQ"
    
    This reverts commit e60f28cb
---
 subprojects/groovy-ginq/src/spec/doc/ginq-userguide.adoc | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/subprojects/groovy-ginq/src/spec/doc/ginq-userguide.adoc b/subprojects/groovy-ginq/src/spec/doc/ginq-userguide.adoc
index cc5c708..a0368ff 100644
--- a/subprojects/groovy-ginq/src/spec/doc/ginq-userguide.adoc
+++ b/subprojects/groovy-ginq/src/spec/doc/ginq-userguide.adoc
@@ -354,10 +354,10 @@ GINQ provides some built-in aggregate functions:
 |java.math.BigDecimal
 |the statistical variance for the population for all non-null values
 
-//|agg(_expression_)
-//|any
-//|any
-//|customizes the aggregation logic in _expression_ and returns single value
+|agg(_expression_)
+|any
+|any
+|customizes the aggregation logic in _expression_ and returns single value
 
 |===
 
@@ -391,7 +391,6 @@ include::../test/org/apache/groovy/ginq/GinqTest.groovy[tags=ginq_grouping_11,in
 include::../test/org/apache/groovy/ginq/GinqTest.groovy[tags=ginq_grouping_12,indent=0]
 ----
 
-////
 [source, sql]
 ----
 include::../test/org/apache/groovy/ginq/GinqTest.groovy[tags=ginq_grouping_03,indent=0]
@@ -399,7 +398,7 @@ include::../test/org/apache/groovy/ginq/GinqTest.groovy[tags=ginq_grouping_03,in
 [NOTE]
 `_g` is an implicit variable for `agg` aggregate function,
 it represents the grouped `Queryable` object and its record(e.g. `r`) could reference the data source by alias(e.g. `n`)
-////
+
 
 Also, we could apply the aggregate functions for the whole GINQ result, i.e. no `groupby` clause is needed:
 [source, groovy]
@@ -407,12 +406,10 @@ Also, we could apply the aggregate functions for the whole GINQ result, i.e. no
 include::../test/org/apache/groovy/ginq/GinqTest.groovy[tags=ginq_aggfunction_02,indent=0]
 ----
 
-////
 [source, groovy]
 ----
 include::../test/org/apache/groovy/ginq/GinqTest.groovy[tags=ginq_aggfunction_01,indent=0]
 ----
-////
 
 [source, groovy]
 ----