代码重构: db模块与表达式相关的代码移到sql模块，独立出optimizer子模块

lealone-db/src/main/java/org/lealone/db/expression/Expression.java → lealone-common/src/main/java/org/lealone/sql/IExpression.java

@@ -15,16 +15,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.db.expression;
+package org.lealone.sql;
 
-import org.lealone.db.ServerSession;
-import org.lealone.db.table.ColumnResolver;
-import org.lealone.db.table.TableFilter;
+import java.util.Set;
+
+import org.lealone.db.Session;
 import org.lealone.db.value.Value;
 
-public interface Expression extends org.lealone.sql.Expression {
+public interface IExpression {
+
+    interface Evaluator {
+
+        IExpression optimizeExpression(Session session, IExpression e);
+
+        Value getExpressionValue(Session session, IExpression e, Object data);
+    }
+
+    int getType();
+
+    String getSQL();
 
-    Value getValue(ServerSession session);
+    IExpression optimize(Session session);
+
+    Value getValue(Session session);
 
     String getAlias();
 
@@ -36,9 +49,6 @@ public interface Expression extends org.lealone.sql.Expression {
 
     String getColumnName();
 
-    @Override
-    int getType();
-
     long getPrecision();
 
     int getNullable();
@@ -47,27 +57,13 @@ public interface Expression extends org.lealone.sql.Expression {
 
     int getScale();
 
-    @Override
-    String getSQL();
-
     String getSQL(boolean isDistributed);
 
-    Expression getNonAliasExpression();
+    IExpression getNonAliasExpression();
 
     boolean isConstant();
 
-    boolean isEverything(ExpressionVisitor visitor);
-
-    void setEvaluatable(TableFilter tableFilter, boolean value);
-
-    Expression optimize(ServerSession session);
-
-    void addFilterConditions(TableFilter filter, boolean outerJoin);
-
-    void mapColumns(ColumnResolver resolver, int level);
-
-    void createIndexConditions(ServerSession session, TableFilter filter);
-
-    Boolean getBooleanValue(ServerSession session);
+    void getDependencies(Set<?> dependencies);
 
+    void getColumns(Set<?> columns);
 }

lealone-db/src/main/java/org/lealone/db/expression/Query.java → lealone-common/src/main/java/org/lealone/sql/IQuery.java

@@ -15,39 +15,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.db.expression;
+package org.lealone.sql;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 
 import org.lealone.db.CommandParameter;
 import org.lealone.db.result.Result;
-import org.lealone.db.table.Table;
 
-public interface Query {
+public interface IQuery {
 
     Result query(int maxRows);
 
     String getPlanSQL();
 
-    boolean isEverything(ExpressionVisitor visitor);
-
     ArrayList<? extends CommandParameter> getParameters();
 
-    void addGlobalCondition(CommandParameter param, int columnId, int comparisonType);
+    void addGlobalCondition(CommandParameter param, int columnId, int indexConditionType);
 
     void disableCache();
 
     double getCost();
 
-    HashSet<Table> getTables();
+    HashSet<?> getTables();
 
     boolean allowGlobalConditions();
 
     int getColumnCount();
 
-    ArrayList<? extends Expression> getExpressions();
+    ArrayList<? extends IExpression> getExpressions();
 
     long getMaxDataModificationId();
 
+    boolean isDeterministic();
+
 }

lealone-db/src/main/java/org/lealone/db/expression/SelectUnion.java → lealone-common/src/main/java/org/lealone/sql/ISelectUnion.java

@@ -15,38 +15,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.lealone.db.expression;
+package org.lealone.sql;
 
-import org.lealone.db.result.LocalResult;
+import org.lealone.db.result.Result;
 
-public interface SelectUnion {
+public interface ISelectUnion {
 
     /**
-     * The type of a UNION statement.
-     */
+    * The type of a UNION statement.
+    */
     public static final int UNION = 0;
 
     /**
-     * The type of a UNION ALL statement.
-     */
+    * The type of a UNION ALL statement.
+    */
     public static final int UNION_ALL = 1;
 
     /**
-     * The type of an EXCEPT statement.
-     */
+    * The type of an EXCEPT statement.
+    */
     public static final int EXCEPT = 2;
 
     /**
-     * The type of an INTERSECT statement.
-     */
+    * The type of an INTERSECT statement.
+    */
     public static final int INTERSECT = 3;
 
     int getUnionType();
 
-    Query getLeft();
+    IQuery getLeft();
 
-    Query getRight();
+    IQuery getRight();
 
-    LocalResult getEmptyResult();
+    Result getEmptyResult();
 
 }

lealone-common/src/main/java/org/lealone/sql/SQLEngine.java

@@ -30,10 +30,10 @@ public interface SQLEngine extends PluggableEngine {
 
     CommandParameter createParameter(int index);
 
-    Expression createValueExpression(Value value);
+    IExpression createValueExpression(Value value);
 
-    Expression createSequenceValue(Object sequence);
+    IExpression createSequenceValue(Object sequence);
 
-    Expression createConditionAndOr(boolean and, Expression left, Expression right);
+    IExpression createConditionAndOr(boolean and, IExpression left, IExpression right);
 
 }

lealone-common/src/main/java/org/lealone/sql/SQLParser.java

@@ -21,7 +21,7 @@ public interface SQLParser {
 
     void setRightsChecked(boolean rightsChecked);
 
-    Expression parseExpression(String sql);
+    IExpression parseExpression(String sql);
 
     ParsedStatement parse(String sql);
 

lealone-db/src/main/java/org/lealone/db/constraint/Constraint.java

@@ -6,12 +6,13 @@
 package org.lealone.db.constraint;
 
 import java.util.HashSet;
+import java.util.Set;
 
 import org.lealone.common.exceptions.DbException;
 import org.lealone.common.trace.Trace;
+import org.lealone.db.DbObject;
 import org.lealone.db.DbObjectType;
 import org.lealone.db.ServerSession;
-import org.lealone.db.expression.ExpressionVisitor;
 import org.lealone.db.index.Index;
 import org.lealone.db.result.Row;
 import org.lealone.db.schema.Schema;
@@ -175,15 +176,7 @@ public boolean isHidden() {
         return table.isHidden();
     }
 
-    /**
-     * Visit all elements in the constraint.
-     *
-     * @param visitor the visitor
-     * @return true if every visited expression returned true, or if there are
-     *         no expressions
-     */
-    public boolean isEverything(ExpressionVisitor visitor) {
-        return true;
+    public void getDependencies(Set<DbObject> dependencies) {
     }
 
 }

lealone-db/src/main/java/org/lealone/db/constraint/ConstraintCheck.java

@@ -7,29 +7,29 @@
 
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Set;
 
 import org.lealone.common.exceptions.DbException;
 import org.lealone.common.util.New;
 import org.lealone.common.util.StringUtils;
+import org.lealone.db.DbObject;
 import org.lealone.db.ServerSession;
 import org.lealone.db.api.ErrorCode;
-import org.lealone.db.expression.Expression;
-import org.lealone.db.expression.ExpressionVisitor;
 import org.lealone.db.index.Index;
 import org.lealone.db.result.Result;
 import org.lealone.db.result.Row;
 import org.lealone.db.schema.Schema;
 import org.lealone.db.table.Column;
 import org.lealone.db.table.Table;
-import org.lealone.db.table.TableFilter;
+import org.lealone.sql.IExpression;
 
 /**
  * A check constraint.
  */
 public class ConstraintCheck extends Constraint {
 
-    private TableFilter filter;
-    private Expression expr;
+    private IExpression.Evaluator exprEvaluator;
+    private IExpression expr;
 
     public ConstraintCheck(Schema schema, int id, String name, Table table) {
         super(schema, id, name, table);
@@ -40,11 +40,11 @@ public String getConstraintType() {
         return Constraint.CHECK;
     }
 
-    public void setTableFilter(TableFilter filter) {
-        this.filter = filter;
+    public void setExpressionEvaluator(IExpression.Evaluator exprEvaluator) {
+        this.exprEvaluator = exprEvaluator;
     }
 
-    public void setExpression(Expression expr) {
+    public void setExpression(IExpression expr) {
         this.expr = expr;
     }
 
@@ -76,7 +76,7 @@ public String getCreateSQL() {
     public void removeChildrenAndResources(ServerSession session) {
         table.removeConstraint(this);
         database.removeMeta(session, getId());
-        filter = null;
+        exprEvaluator = null;
         expr = null;
         table = null;
         invalidate();
@@ -87,10 +87,9 @@ public void checkRow(ServerSession session, Table t, Row oldRow, Row newRow) {
         if (newRow == null) {
             return;
         }
-        filter.set(newRow);
         Boolean b;
         try {
-            b = expr.getValue(session).getBoolean();
+            b = exprEvaluator.getExpressionValue(session, expr, newRow).getBoolean();
         } catch (DbException ex) {
             throw DbException.get(ErrorCode.CHECK_CONSTRAINT_INVALID, ex, getShortDescription());
         }
@@ -113,7 +112,7 @@ public void setIndexOwner(Index index) {
     @Override
     public HashSet<Column> getReferencedColumns(Table table) {
         HashSet<Column> columns = New.hashSet();
-        expr.isEverything(ExpressionVisitor.getColumnsVisitor(columns));
+        expr.getColumns(columns);
         for (Iterator<Column> it = columns.iterator(); it.hasNext();) {
             if (it.next().getTable() != table) {
                 it.remove();
@@ -122,7 +121,7 @@ public HashSet<Column> getReferencedColumns(Table table) {
         return columns;
     }
 
-    public Expression getExpression() {
+    public IExpression getExpression() {
         return expr;
     }
 
@@ -137,7 +136,7 @@ public void checkExistingData(ServerSession session) {
             // don't check at startup
             return;
         }
-        String sql = "SELECT 1 FROM " + filter.getTable().getSQL() + " WHERE NOT(" + expr.getSQL() + ")";
+        String sql = "SELECT 1 FROM " + table.getSQL() + " WHERE NOT(" + expr.getSQL() + ")";
         Result r = session.prepareStatement(sql).query(1);
         if (r.next()) {
             throw DbException.get(ErrorCode.CHECK_CONSTRAINT_VIOLATED_1, getName());
@@ -155,8 +154,7 @@ public void rebuild() {
     }
 
     @Override
-    public boolean isEverything(ExpressionVisitor visitor) {
-        return expr.isEverything(visitor);
+    public void getDependencies(Set<DbObject> dependencies) {
+        expr.getDependencies(dependencies);
     }
-
 }

lealone-db/src/main/java/org/lealone/db/constraint/ConstraintReferential.java

@@ -15,7 +15,6 @@
 import org.lealone.db.CommandParameter;
 import org.lealone.db.ServerSession;
 import org.lealone.db.api.ErrorCode;
-import org.lealone.db.expression.Expression;
 import org.lealone.db.index.Cursor;
 import org.lealone.db.index.Index;
 import org.lealone.db.result.Result;
@@ -27,6 +26,7 @@
 import org.lealone.db.table.Table;
 import org.lealone.db.value.Value;
 import org.lealone.db.value.ValueNull;
+import org.lealone.sql.IExpression;
 import org.lealone.sql.PreparedStatement;
 
 /**
@@ -560,7 +560,7 @@ private PreparedStatement prepare(ServerSession session, String sql, int action)
                 if (action == SET_NULL) {
                     value = ValueNull.INSTANCE;
                 } else {
-                    Expression expr = column.getDefaultExpression();
+                    IExpression expr = column.getDefaultExpression();
                     if (expr == null) {
                         throw DbException.get(ErrorCode.NO_DEFAULT_SET_1, column.getName());
                     }