Move window functions and base classes into own package

2e263d53 · Evgenij Ryazanov · e4f795c4 · 2e263d53 · 2e263d53 · 2e263d53
--- a/h2/src/main/org/h2/command/Parser.java
+++ b/h2/src/main/org/h2/command/Parser.java
@@ -175,16 +175,16 @@ import org.h2.expression.Wildcard;
 import org.h2.expression.aggregate.AbstractAggregate;
 import org.h2.expression.aggregate.Aggregate;
 import org.h2.expression.aggregate.Aggregate.AggregateType;
-import org.h2.expression.aggregate.DataAnalysisOperation;
 import org.h2.expression.aggregate.JavaAggregate;
-import org.h2.expression.aggregate.Window;
-import org.h2.expression.aggregate.WindowFrame;
-import org.h2.expression.aggregate.WindowFrameBound;
-import org.h2.expression.aggregate.WindowFrameBoundType;
-import org.h2.expression.aggregate.WindowFrameExclusion;
-import org.h2.expression.aggregate.WindowFrameUnits;
-import org.h2.expression.aggregate.WindowFunction;
-import org.h2.expression.aggregate.WindowFunctionType;
+import org.h2.expression.analysis.DataAnalysisOperation;
+import org.h2.expression.analysis.Window;
+import org.h2.expression.analysis.WindowFrame;
+import org.h2.expression.analysis.WindowFrameBound;
+import org.h2.expression.analysis.WindowFrameBoundType;
+import org.h2.expression.analysis.WindowFrameExclusion;
+import org.h2.expression.analysis.WindowFrameUnits;
+import org.h2.expression.analysis.WindowFunction;
+import org.h2.expression.analysis.WindowFunctionType;
 import org.h2.index.Index;
 import org.h2.message.DbException;
 import org.h2.result.SortOrder;

--- a/h2/src/main/org/h2/command/dml/Select.java
+++ b/h2/src/main/org/h2/command/dml/Select.java
@@ -26,7 +26,7 @@ import org.h2.expression.ExpressionVisitor;
 import org.h2.expression.Parameter;
 import org.h2.expression.Wildcard;
 import org.h2.expression.aggregate.Aggregate;
-import org.h2.expression.aggregate.Window;
+import org.h2.expression.analysis.Window;
 import org.h2.index.Cursor;
 import org.h2.index.Index;
 import org.h2.index.IndexType;

--- a/h2/src/main/org/h2/command/dml/SelectGroups.java
+++ b/h2/src/main/org/h2/command/dml/SelectGroups.java
@@ -14,8 +14,8 @@ import java.util.Map.Entry;

 import org.h2.engine.Session;
 import org.h2.expression.Expression;
-import org.h2.expression.aggregate.DataAnalysisOperation;
-import org.h2.expression.aggregate.PartitionData;
+import org.h2.expression.analysis.DataAnalysisOperation;
+import org.h2.expression.analysis.PartitionData;
 import org.h2.util.ValueHashMap;
 import org.h2.value.Value;
 import org.h2.value.ValueArray;

--- a/h2/src/main/org/h2/expression/aggregate/AbstractAggregate.java
+++ b/h2/src/main/org/h2/expression/aggregate/AbstractAggregate.java
@@ -14,6 +14,8 @@ import org.h2.command.dml.SelectGroups;
 import org.h2.command.dml.SelectOrderBy;
 import org.h2.engine.Session;
 import org.h2.expression.Expression;
+import org.h2.expression.analysis.DataAnalysisOperation;
+import org.h2.expression.analysis.WindowFrame;
 import org.h2.table.ColumnResolver;
 import org.h2.table.TableFilter;
 import org.h2.value.Value;

--- a/h2/src/main/org/h2/expression/aggregate/Aggregate.java
+++ b/h2/src/main/org/h2/expression/aggregate/Aggregate.java
@@ -19,6 +19,7 @@ import org.h2.engine.Session;
 import org.h2.expression.Expression;
 import org.h2.expression.ExpressionColumn;
 import org.h2.expression.ExpressionVisitor;
+import org.h2.expression.analysis.Window;
 import org.h2.index.Cursor;
 import org.h2.index.Index;
 import org.h2.message.DbException;

--- a/h2/src/main/org/h2/expression/aggregate/package.html
+++ b/h2/src/main/org/h2/expression/aggregate/package.html
@@ -9,6 +9,6 @@ Initial Developer: H2 Group
 Javadoc package documentation
 </title></head><body style="font: 9pt/130% Tahoma, Arial, Helvetica, sans-serif; font-weight: normal;"><p>

-Aggregate and window functions.
+Aggregate functions.

 </p></body></html>
\ No newline at end of file
--- a/h2/src/main/org/h2/expression/aggregate/DataAnalysisOperation.java
+++ b/h2/src/main/org/h2/expression/aggregate/DataAnalysisOperation.java
@@ -3,7 +3,7 @@
 * and the EPL 1.0 (http://h2database.com/html/license.html).
 * Initial Developer: H2 Group
 */
-package org.h2.expression.aggregate;
+package org.h2.expression.analysis;

 import java.util.ArrayList;
 import java.util.Collections;
@@ -16,6 +16,7 @@ import org.h2.command.dml.SelectOrderBy;
 import org.h2.engine.Session;
 import org.h2.expression.Expression;
 import org.h2.expression.ExpressionVisitor;
+import org.h2.expression.aggregate.Aggregate;
 import org.h2.message.DbException;
 import org.h2.result.SortOrder;
 import org.h2.table.ColumnResolver;
@@ -49,7 +50,7 @@ public abstract class DataAnalysisOperation extends Expression {
        return new SortOrder(session.getDatabase(), index, sortType, null);
    }

-    DataAnalysisOperation(Select select) {
+    protected DataAnalysisOperation(Select select) {
        this.select = select;
    }

@@ -76,7 +77,7 @@ public abstract class DataAnalysisOperation extends Expression {
     *
     * @return the sort order for OVER clause
     */
-    SortOrder getOverOrderBySort() {
+    protected SortOrder getOverOrderBySort() {
        return overOrderBySort;
    }


--- a/h2/src/main/org/h2/expression/aggregate/PartitionData.java
+++ b/h2/src/main/org/h2/expression/aggregate/PartitionData.java
@@ -3,7 +3,7 @@
 * and the EPL 1.0 (http://h2database.com/html/license.html).
 * Initial Developer: H2 Group
 */
-package org.h2.expression.aggregate;
+package org.h2.expression.analysis;

 import java.util.HashMap;


--- a/h2/src/main/org/h2/expression/aggregate/Window.java
+++ b/h2/src/main/org/h2/expression/aggregate/Window.java
@@ -3,7 +3,7 @@
 * and the EPL 1.0 (http://h2database.com/html/license.html).
 * Initial Developer: H2 Group
 */
-package org.h2.expression.aggregate;
+package org.h2.expression.analysis;

 import java.util.ArrayList;

@@ -32,12 +32,14 @@ public final class Window {
    private String parent;

    /**
+     * Appends ORDER BY clause to the specified builder.
+     *
     * @param builder
     *            string builder
     * @param orderBy
     *            ORDER BY clause, or null
     */
-    static void appendOrderBy(StringBuilder builder, ArrayList<SelectOrderBy> orderBy) {
+    public static void appendOrderBy(StringBuilder builder, ArrayList<SelectOrderBy> orderBy) {
        if (orderBy != null && !orderBy.isEmpty()) {
            if (builder.charAt(builder.length() - 1) != '(') {
                builder.append(' ');

--- a/h2/src/main/org/h2/expression/aggregate/WindowFrame.java
+++ b/h2/src/main/org/h2/expression/aggregate/WindowFrame.java
@@ -3,7 +3,7 @@
 * and the EPL 1.0 (http://h2database.com/html/license.html).
 * Initial Developer: H2 Group
 */
-package org.h2.expression.aggregate;
+package org.h2.expression.analysis;

 import java.util.ArrayList;
 import java.util.Collections;

--- a/h2/src/main/org/h2/expression/aggregate/WindowFrameBound.java
+++ b/h2/src/main/org/h2/expression/aggregate/WindowFrameBound.java
@@ -3,7 +3,7 @@
 * and the EPL 1.0 (http://h2database.com/html/license.html).
 * Initial Developer: H2 Group
 */
-package org.h2.expression.aggregate;
+package org.h2.expression.analysis;

 import org.h2.expression.Expression;


--- a/h2/src/main/org/h2/expression/aggregate/WindowFrameBoundType.java
+++ b/h2/src/main/org/h2/expression/aggregate/WindowFrameBoundType.java
@@ -3,7 +3,7 @@
 * and the EPL 1.0 (http://h2database.com/html/license.html).
 * Initial Developer: H2 Group
 */
-package org.h2.expression.aggregate;
+package org.h2.expression.analysis;

 /**
 * Window frame bound type.

--- a/h2/src/main/org/h2/expression/aggregate/WindowFrameExclusion.java
+++ b/h2/src/main/org/h2/expression/aggregate/WindowFrameExclusion.java
@@ -3,7 +3,7 @@
 * and the EPL 1.0 (http://h2database.com/html/license.html).
 * Initial Developer: H2 Group
 */
-package org.h2.expression.aggregate;
+package org.h2.expression.analysis;

 /**
 * Window frame exclusion clause.

--- a/h2/src/main/org/h2/expression/aggregate/WindowFrameUnits.java
+++ b/h2/src/main/org/h2/expression/aggregate/WindowFrameUnits.java
@@ -3,7 +3,7 @@
 * and the EPL 1.0 (http://h2database.com/html/license.html).
 * Initial Developer: H2 Group
 */
-package org.h2.expression.aggregate;
+package org.h2.expression.analysis;

 /**
 * Window frame units.

--- a/h2/src/main/org/h2/expression/aggregate/WindowFunction.java
+++ b/h2/src/main/org/h2/expression/aggregate/WindowFunction.java
@@ -3,7 +3,7 @@
 * and the EPL 1.0 (http://h2database.com/html/license.html).
 * Initial Developer: H2 Group
 */
-package org.h2.expression.aggregate;
+package org.h2.expression.analysis;

 import java.util.ArrayList;
 import java.util.HashMap;

--- a/h2/src/main/org/h2/expression/aggregate/WindowFunctionType.java
+++ b/h2/src/main/org/h2/expression/aggregate/WindowFunctionType.java
@@ -3,7 +3,7 @@
 * and the EPL 1.0 (http://h2database.com/html/license.html).
 * Initial Developer: H2 Group
 */
-package org.h2.expression.aggregate;
+package org.h2.expression.analysis;

 /**
 * A type of a window function.

--- a/h2/src/main/org/h2/expression/analysis/package.html
+++ b/h2/src/main/org/h2/expression/analysis/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>
+
+Base classes for data analysis operations and implementations of window functions.
+
+</p></body></html>
\ No newline at end of file