--no commit message

--no commit message

h2/ant-build.properties

-#Mon Dec 10 07:25:40 CET 2007
+#Tue Dec 25 18:57:49 CET 2007
 javac=javac
 benchmark.drivers.dir=C\:/data/java
 path.servlet.jar=C\:/data/classpath/servlet-api.jar
-version.name.maven=1.0.63
+version.name.maven=1.0.64
 path.lucene.jar=C\:/data/classpath/lucene-core-2.2.0.jar
 jdk=1.4

h2/src/docsrc/html/build.html

@@ -41,7 +41,7 @@ Newer version or compatible software works too.
 </p>
 <ul>
     <li>Windows XP
-    </li><li>Sun JDK Version 1.4 or 1.5
+    </li><li>Sun JDK Version 1.4
     </li><li>Apache Ant Version 1.6.5
     </li><li>Mozilla Firefox 1.5
     </li><li>Eclipse Version 3.2.2
@@ -78,7 +78,7 @@ Example:
 &lt;dependency&gt;
     &lt;groupId&gt;com.h2database&lt;/groupId&gt;
     &lt;artifactId&gt;h2&lt;/artifactId&gt;
-    &lt;version&gt;1.0.63&lt;/version&gt;
+    &lt;version&gt;1.0.64&lt;/version&gt;
 &lt;/dependency&gt;
 </pre>
 <p>

h2/src/docsrc/html/download.html

@@ -15,10 +15,10 @@ H2 Database Engine
 
 <h1>Downloads</h1>
 
-<h3>Version 1.0.63 (2007-12-02, Current)</h3>
+<h3>Version 1.0.64 (2007-12-26, Current)</h3>
 <p>
-<a href="http://www.h2database.com/h2-setup-2007-12-02.exe">Windows Installer</a><br />
-<a href="http://www.h2database.com/h2-2007-12-02.zip">Platform-Independent Zip</a><br />
+<a href="http://www.h2database.com/h2-setup-2007-12-26.exe">Windows Installer</a><br />
+<a href="http://www.h2database.com/h2-2007-12-26.zip">Platform-Independent Zip</a><br />
 </p>
 
 <h3>Version 1.0.63 (2007-12-02, Last Stable)</h3>

h2/src/docsrc/html/mainWeb.html

@@ -31,17 +31,17 @@ Welcome to H2, the free SQL database. The main feature of H2 are:
         <table style="border: 0px; margin: 5px; background-color: #eee;">
               <tr><td style="border: 0px; background-color: #eee;" colspan="2">
                 <h3>Download</h3>
-                Version 1.0.63 (2007-12-02):
+                Version 1.0.64 (2007-12-26):
             </td></tr>
             <tr><td style="border: 0px; background-color: #eee;">
-                <a href="http://www.h2database.com/h2-setup-2007-12-02.exe"><img border="1" src="images/download.png" alt="download" /></a>
+                <a href="http://www.h2database.com/h2-setup-2007-12-26.exe"><img border="1" src="images/download.png" alt="download" /></a>
             </td><td style="vertical-align: middle; border: 0px; background-color: #eee;">
-                <a href="http://www.h2database.com/h2-setup-2007-12-02.exe">Windows Installer (2.8 MB)</a>
+                <a href="http://www.h2database.com/h2-setup-2007-12-26.exe">Windows Installer (2.8 MB)</a>
             </td></tr>
             <tr><td style="border: 0px; background-color: #eee;">
-                <a href="http://www.h2database.com/h2-2007-12-02.zip"><img border="1" src="images/download.png" alt="download" /></a>
+                <a href="http://www.h2database.com/h2-2007-12-26.zip"><img border="1" src="images/download.png" alt="download" /></a>
             </td><td style="vertical-align: middle; border: 0px; background-color: #eee;">
-                <a href="http://www.h2database.com/h2-2007-12-02.zip">All platforms (zip, 3.9 MB)</a>
+                <a href="http://www.h2database.com/h2-2007-12-26.zip">All platforms (zip, 3.9 MB)</a>
             </td></tr>
             <tr><td style="border: 0px; background-color: #eee;" colspan="2">
                 <a href="download.html">All Downloads</a>

h2/src/main/org/h2/constant/SysProperties.java

@@ -32,7 +32,8 @@ public class SysProperties {
 
     public static final boolean OPTIMIZE_EVALUATABLE_SUBQUERIES = getBooleanSetting("h2.optimizeEvaluatableSubqueries", true);
     public static final boolean OPTIMIZE_IN = getBooleanSetting("h2.optimizeIn", true);
-    public static final boolean OPTIMIZE_IN_JOIN = getBooleanSetting("h2.optimizeInJoin", true);
+
+    public static final boolean OPTIMIZE_IN_JOIN = getBooleanSetting("h2.optimizeInJoin", false);
 
     public static final boolean OPTIMIZE_MIN_MAX = getBooleanSetting("h2.optimizeMinMax", true);
     public static final boolean OPTIMIZE_SUBQUERY_CACHE = getBooleanSetting("h2.optimizeSubqueryCache", true);

h2/src/main/org/h2/engine/Constants.java

@@ -73,8 +73,8 @@ import org.h2.constant.SysProperties;
  */
 public class Constants {
 
-    public static final int BUILD_ID = 63;
-    private static final String BUILD = "2007-12-02";
+    public static final int BUILD_ID = 64;
+    private static final String BUILD = "2007-12-26";
     public static final int VERSION_MAJOR = 1;
     public static final int VERSION_MINOR = 0;
 

h2/src/main/org/h2/expression/Expression.java

@@ -40,7 +40,7 @@ public abstract class Expression {
      * Map the columns of the resolver to expression columns.
      *
      * @param resolver the column resolver
-     * @return level the subquery nesting level
+     * @param level the subquery nesting level
      */
     public abstract void mapColumns(ColumnResolver resolver, int level) throws SQLException;
 

h2/src/main/org/h2/expression/FunctionCall.java

@@ -76,4 +76,20 @@ public interface FunctionCall {
      */
     String getSQL();
 
+    /**
+     * Check if the function can return the row count
+     * (if the function returns a number of rows).
+     *
+     * @return true if the function can return the row count
+     */
+    // boolean canGetRowCount();
+
+    /**
+     * Get the number of rows
+     * (if the function returns a number of rows).
+     *
+     * @return the row count
+     */
+    // int getRowCount(Session session);
+
 }

h2/src/main/org/h2/expression/TableFunction.java

+/*
+ * Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+package org.h2.expression;
+
+import java.sql.SQLException;
+
+import org.h2.engine.Database;
+import org.h2.engine.Session;
+import org.h2.result.LocalResult;
+import org.h2.table.Column;
+import org.h2.table.ColumnResolver;
+import org.h2.table.TableFilter;
+import org.h2.tools.SimpleResultSet;
+import org.h2.util.MathUtils;
+import org.h2.value.DataType;
+import org.h2.value.Value;
+import org.h2.value.ValueArray;
+import org.h2.value.ValueNull;
+import org.h2.value.ValueResultSet;
+
+/**
+ * Implementation of the functions TABLE(..) and TABLE_DISTINCT(..).
+ */
+public class TableFunction extends Expression implements FunctionCall {
+    private boolean distinct;
+    private Expression[] args;
+    private Column[] columnList;
+
+    public Value getValue(Session session) throws SQLException {
+        return getTable(session, args, false, distinct);
+    }
+
+    public String getSQL() {
+        StringBuffer buff = new StringBuffer();
+        buff.append(getName());
+        buff.append('(');
+        for (int i = 0; i < args.length; i++) {
+            if (i > 0) {
+                buff.append(", ");
+            }
+            buff.append(columnList[i].getCreateSQL());
+            buff.append("=");
+            Expression e = args[i];
+            buff.append(e.getSQL());
+        }
+        buff.append(')');
+        return buff.toString();
+    }
+
+    public ValueResultSet getTable(Session session, Expression[] args, boolean onlyColumnList, boolean distinct) throws SQLException {
+        int len = columnList.length;
+        Expression[] header = new Expression[len];
+        Database db = session.getDatabase();
+        for (int i = 0; i < len; i++) {
+            Column c = columnList[i];
+            ExpressionColumn col = new ExpressionColumn(db, c);
+            header[i] = col;
+        }
+        LocalResult result = new LocalResult(session, header, len);
+        if (distinct) {
+            result.setDistinct();
+        }
+        if (!onlyColumnList) {
+            Value[][] list = new Value[len][];
+            int rowCount = 0;
+            for (int i = 0; i < len; i++) {
+                Value v = args[i].getValue(session);
+                if (v == ValueNull.INSTANCE) {
+                    list[i] = new Value[0];
+                } else {
+                    ValueArray array = (ValueArray) v.convertTo(Value.ARRAY);
+                    Value[] l = array.getList();
+                    list[i] = l;
+                    rowCount = Math.max(rowCount, l.length);
+                }
+            }
+            for (int row = 0; row < rowCount; row++) {
+                Value[] r = new Value[len];
+                for (int j = 0; j < len; j++) {
+                    Value[] l = list[j];
+                    Value v;
+                    if (l.length <= row) {
+                        v = ValueNull.INSTANCE;
+                    } else {
+                        Column c = columnList[j];
+                        v = l[row];
+                        v = v.convertTo(c.getType());
+                        v = v.convertPrecision(c.getPrecision());
+                        v = v.convertScale(true, c.getScale());
+                    }
+                    r[j] = v;
+                }
+                result.addRow(r);
+            }
+        }
+        result.done();
+        ValueResultSet vr = ValueResultSet.get(getSimpleResultSet(result, Integer.MAX_VALUE));
+        return vr;
+    }
+
+    SimpleResultSet getSimpleResultSet(LocalResult rs,  int maxrows) throws SQLException {
+        int columnCount = rs.getVisibleColumnCount();
+        SimpleResultSet simple = new SimpleResultSet();
+        for (int i = 0; i < columnCount; i++) {
+            String name = rs.getColumnName(i);
+            int sqlType = DataType.convertTypeToSQLType(rs.getColumnType(i));
+            int precision = MathUtils.convertLongToInt(rs.getColumnPrecision(i));
+            int scale = rs.getColumnScale(i);
+            simple.addColumn(name, sqlType, precision, scale);
+        }
+        rs.reset();
+        for (int i = 0; i < maxrows && rs.next(); i++) {
+            Object[] list = new Object[columnCount];
+            for (int j = 0; j < columnCount; j++) {
+                list[j] = rs.currentRow()[j].getObject();
+            }
+            simple.addRow(list);
+        }
+        return simple;
+    }
+
+    public int getScale() {
+        return 0;
+    }
+
+    public void mapColumns(ColumnResolver resolver, int level) throws SQLException {
+        for (int i = 0; i < args.length; i++) {
+            args[i].mapColumns(resolver, level);
+        }
+    }
+
+    public int getCost() {
+        int cost = 3;
+        for (int i = 0; i < args.length; i++) {
+            cost += args[i].getCost();
+        }
+        return cost;
+    }
+
+    public int getDisplaySize() {
+        return Integer.MAX_VALUE;
+    }
+
+    public long getPrecision() {
+        return 0;
+    }
+
+    public int getType() {
+        return Value.RESULT_SET;
+    }
+
+    public boolean isEverything(ExpressionVisitor visitor) {
+        for (int i = 0; i < args.length; i++) {
+            Expression e = args[i];
+            if (e != null && !e.isEverything(visitor)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public Expression optimize(Session session) throws SQLException {
+        boolean allConst = true;
+        for (int i = 0; i < args.length; i++) {
+            Expression e = args[i].optimize(session);
+            args[i] = e;
+            if (!e.isConstant()) {
+                allConst = false;
+            }
+        }
+        if (allConst) {
+            return ValueExpression.get(getValue(session));
+        }
+        return this;
+    }
+
+    public void setEvaluatable(TableFilter tableFilter, boolean value) {
+        for (int i = 0; i < args.length; i++) {
+            Expression e = args[i];
+            if (e != null) {
+                e.setEvaluatable(tableFilter, value);
+            }
+        }
+    }
+
+    public void updateAggregate(Session session) throws SQLException {
+        for (int i = 0; i < args.length; i++) {
+            Expression e = args[i];
+            if (e != null) {
+                e.updateAggregate(session);
+            }
+        }
+    }
+
+    public boolean canGetRowCount() {
+        return true;
+    }
+
+    public Expression[] getArgs() {
+        return args;
+    }
+
+    public String getName() {
+        return distinct ? "TABLE_DISTINCT" : "TABLE";
+    }
+
+    public int getParameterCount() {
+        return args.length;
+    }
+
+    public int getRowCount(Session session) throws SQLException {
+        int len = columnList.length;
+        int rowCount = 0;
+        for (int i = 0; i < len; i++) {
+            Expression expr = args[i];
+            if (expr.isConstant()) {
+                Value v = expr.getValue(session);
+                if (v != ValueNull.INSTANCE) {
+                    ValueArray array = (ValueArray) v.convertTo(Value.ARRAY);
+                    Value[] l = array.getList();
+                    rowCount = Math.max(rowCount, l.length);
+                }
+            }
+        }
+        return rowCount;
+    }
+
+    public ValueResultSet getValueForColumnList(Session session, Expression[] nullArgs) throws SQLException {
+        return getTable(session, args, true, false);
+    }
+}

h2/src/main/org/h2/index/FunctionIndex.java

@@ -50,7 +50,8 @@ public class FunctionIndex extends BaseIndex {
         if (masks != null) {
             throw Message.getUnsupportedException();
         }
-        return Long.MAX_VALUE;
+        return Integer.MAX_VALUE;
+        // return functionTable.getRowCount(session) * 10;
     }
 
     public void remove(Session session) throws SQLException {

h2/src/main/org/h2/jdbc/package.html

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+Copyright 2004-2007 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
+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: 8pt/130% Tahoma, Arial, Helvetica, sans-serif; font-weight: normal;">
+
+Implementation of the JDBC API.
+
+</body></html>
\ No newline at end of file