Move aggregate functions into own package

h2/src/main/org/h2/command/Parser.java

@@ -145,8 +145,6 @@ import org.h2.engine.SysProperties;
 import org.h2.engine.User;
 import org.h2.engine.UserAggregate;
 import org.h2.engine.UserDataType;
-import org.h2.expression.Aggregate;
-import org.h2.expression.Aggregate.AggregateType;
 import org.h2.expression.Alias;
 import org.h2.expression.BinaryOperation;
 import org.h2.expression.BinaryOperation.OpType;
@@ -163,7 +161,6 @@ import org.h2.expression.ExpressionColumn;
 import org.h2.expression.ExpressionList;
 import org.h2.expression.Function;
 import org.h2.expression.FunctionCall;
-import org.h2.expression.JavaAggregate;
 import org.h2.expression.JavaFunction;
 import org.h2.expression.Parameter;
 import org.h2.expression.Rownum;
@@ -174,6 +171,9 @@ import org.h2.expression.UnaryOperation;
 import org.h2.expression.ValueExpression;
 import org.h2.expression.Variable;
 import org.h2.expression.Wildcard;
+import org.h2.expression.aggregate.Aggregate;
+import org.h2.expression.aggregate.Aggregate.AggregateType;
+import org.h2.expression.aggregate.JavaAggregate;
 import org.h2.index.Index;
 import org.h2.message.DbException;
 import org.h2.result.SortOrder;

h2/src/main/org/h2/expression/Aggregate.java → h2/src/main/org/h2/expression/aggregate/Aggregate.java

@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.h2.expression;
+package org.h2.expression.aggregate;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -13,6 +13,9 @@ import org.h2.api.ErrorCode;
 import org.h2.command.dml.Select;
 import org.h2.command.dml.SelectOrderBy;
 import org.h2.engine.Session;
+import org.h2.expression.Expression;
+import org.h2.expression.ExpressionColumn;
+import org.h2.expression.ExpressionVisitor;
 import org.h2.index.Cursor;
 import org.h2.index.Index;
 import org.h2.message.DbException;

h2/src/main/org/h2/expression/AggregateData.java → h2/src/main/org/h2/expression/aggregate/AggregateData.java

@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.h2.expression;
+package org.h2.expression.aggregate;
 
 import org.h2.engine.Database;
-import org.h2.expression.Aggregate.AggregateType;
+import org.h2.expression.aggregate.Aggregate.AggregateType;
 import org.h2.value.Value;
 
 /**

h2/src/main/org/h2/expression/AggregateDataCollecting.java → h2/src/main/org/h2/expression/aggregate/AggregateDataCollecting.java

@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.h2.expression;
+package org.h2.expression.aggregate;
 
 import java.util.ArrayList;
 import java.util.Collection;

h2/src/main/org/h2/expression/AggregateDataCount.java → h2/src/main/org/h2/expression/aggregate/AggregateDataCount.java

@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.h2.expression;
+package org.h2.expression.aggregate;
 
 import org.h2.engine.Database;
 import org.h2.util.ValueHashMap;

h2/src/main/org/h2/expression/AggregateDataCountAll.java → h2/src/main/org/h2/expression/aggregate/AggregateDataCountAll.java

@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.h2.expression;
+package org.h2.expression.aggregate;
 
 import org.h2.engine.Database;
 import org.h2.message.DbException;

h2/src/main/org/h2/expression/AggregateDataDefault.java → h2/src/main/org/h2/expression/aggregate/AggregateDataDefault.java

@@ -3,10 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.h2.expression;
+package org.h2.expression.aggregate;
 
 import org.h2.engine.Database;
-import org.h2.expression.Aggregate.AggregateType;
+import org.h2.expression.aggregate.Aggregate.AggregateType;
 import org.h2.message.DbException;
 import org.h2.util.ValueHashMap;
 import org.h2.value.DataType;

h2/src/main/org/h2/expression/AggregateDataHistogram.java → h2/src/main/org/h2/expression/aggregate/AggregateDataHistogram.java

@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.h2.expression;
+package org.h2.expression.aggregate;
 
 import java.util.Arrays;
 import java.util.Comparator;

h2/src/main/org/h2/expression/AggregateDataMedian.java → h2/src/main/org/h2/expression/aggregate/AggregateDataMedian.java

@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.h2.expression;
+package org.h2.expression.aggregate;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -14,6 +14,8 @@ import org.h2.engine.Database;
 import org.h2.engine.Mode;
 import org.h2.engine.Session;
 import org.h2.engine.SysProperties;
+import org.h2.expression.Expression;
+import org.h2.expression.ExpressionColumn;
 import org.h2.index.Cursor;
 import org.h2.index.Index;
 import org.h2.result.SearchRow;

h2/src/main/org/h2/expression/AggregateDataSelectivity.java → h2/src/main/org/h2/expression/aggregate/AggregateDataSelectivity.java

@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.h2.expression;
+package org.h2.expression.aggregate;
 
 import org.h2.engine.Constants;
 import org.h2.engine.Database;

h2/src/main/org/h2/expression/JavaAggregate.java → h2/src/main/org/h2/expression/aggregate/JavaAggregate.java

@@ -3,7 +3,7 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.h2.expression;
+package org.h2.expression.aggregate;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -13,6 +13,8 @@ import org.h2.command.Parser;
 import org.h2.command.dml.Select;
 import org.h2.engine.Session;
 import org.h2.engine.UserAggregate;
+import org.h2.expression.Expression;
+import org.h2.expression.ExpressionVisitor;
 import org.h2.message.DbException;
 import org.h2.table.ColumnResolver;
 import org.h2.table.TableFilter;

h2/src/main/org/h2/expression/aggregate/package.html

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+Copyright 2004-2018 H2 Group. Multiple-Licensed under the MPL 2.0, Version 1.0,
+and under the Eclipse Public License, Version 1.0
+Initial Developer: H2 Group
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head><meta http-equiv="Content-Type" content="text/html;charset=utf-8" /><title>
+Javadoc package documentation
+</title></head><body style="font: 9pt/130% Tahoma, Arial, Helvetica, sans-serif; font-weight: normal;"><p>
+
+Aggregate functions.
+
+</p></body></html>
\ No newline at end of file