You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2015/07/09 20:10:18 UTC
[1/3] incubator-calcite git commit: [CALCITE-752] Add back sqlline as
a dependency to csv example
Repository: incubator-calcite
Updated Branches:
refs/heads/master 03111d2b6 -> 464fd364a
[CALCITE-752] Add back sqlline as a dependency to csv example
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/fcb6ba5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/fcb6ba5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/fcb6ba5f
Branch: refs/heads/master
Commit: fcb6ba5fa4be7c5eb55f784f5ff74ce4bd993abb
Parents: 830afef
Author: Julian Hyde <jh...@apache.org>
Authored: Wed Jul 8 11:54:23 2015 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Thu Jul 9 10:28:40 2015 -0700
----------------------------------------------------------------------
example/csv/pom.xml | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/fcb6ba5f/example/csv/pom.xml
----------------------------------------------------------------------
diff --git a/example/csv/pom.xml b/example/csv/pom.xml
index c573eca..a8f93e7 100644
--- a/example/csv/pom.xml
+++ b/example/csv/pom.xml
@@ -69,5 +69,37 @@ limitations under the License.
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
+ <dependency>
+ <groupId>sqlline</groupId>
+ <artifactId>sqlline</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.10</version>
+ <!-- configurations do not cascade, so all of the definition from
+ ../pom.xml:build:plugin-management:plugins:plugin must be repeated in child poms -->
+ <executions>
+ <execution>
+ <id>analyze</id>
+ <goals>
+ <goal>analyze-only</goal>
+ </goals>
+ <configuration>
+ <failOnWarning>true</failOnWarning>
+ <!-- ignore "unused but declared" warnings -->
+ <ignoredUnusedDeclaredDependencies>
+ <ignoredUnusedDeclaredDependency>sqlline:sqlline</ignoredUnusedDeclaredDependency>
+ </ignoredUnusedDeclaredDependencies>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
[3/3] incubator-calcite git commit: [CALCITE-789]
MetaImpl.MetaCatalog should expose TABLE_CAT instead of TABLE_CATALOG
Posted by jh...@apache.org.
[CALCITE-789] MetaImpl.MetaCatalog should expose TABLE_CAT instead of TABLE_CATALOG
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/464fd364
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/464fd364
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/464fd364
Branch: refs/heads/master
Commit: 464fd364a4ed0563645dee3cefdf2cc5195533fa
Parents: fcb6ba5
Author: Julian Hyde <jh...@apache.org>
Authored: Tue Jul 7 12:00:10 2015 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Thu Jul 9 10:47:18 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/calcite/avatica/Meta.java | 26 ++++++++++++++++++++
.../org/apache/calcite/avatica/MetaImpl.java | 7 +++---
.../apache/calcite/jdbc/CalciteMetaImpl.java | 3 ++-
.../calcite/jdbc/CalciteRemoteDriverTest.java | 4 +--
.../java/org/apache/calcite/test/JdbcTest.java | 12 ++++-----
5 files changed, 40 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/464fd364/avatica/src/main/java/org/apache/calcite/avatica/Meta.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/Meta.java b/avatica/src/main/java/org/apache/calcite/avatica/Meta.java
index 5dd59f0..a15a769 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/Meta.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/Meta.java
@@ -52,11 +52,13 @@ public interface Meta {
*/
Map<DatabaseProperty, Object> getDatabaseProperties();
+ /** Per {@link DatabaseMetaData#getTables(String, String, String, String[])}. */
MetaResultSet getTables(String catalog,
Pat schemaPattern,
Pat tableNamePattern,
List<String> typeList);
+ /** Per {@link DatabaseMetaData#getColumns(String, String, String, String)}. */
MetaResultSet getColumns(String catalog,
Pat schemaPattern,
Pat tableNamePattern,
@@ -64,42 +66,56 @@ public interface Meta {
MetaResultSet getSchemas(String catalog, Pat schemaPattern);
+ /** Per {@link DatabaseMetaData#getCatalogs()}. */
MetaResultSet getCatalogs();
+ /** Per {@link DatabaseMetaData#getTableTypes()}. */
MetaResultSet getTableTypes();
+ /** Per {@link DatabaseMetaData#getProcedures(String, String, String)}. */
MetaResultSet getProcedures(String catalog,
Pat schemaPattern,
Pat procedureNamePattern);
+ /** Per {@link DatabaseMetaData#getProcedureColumns(String, String, String, String)}. */
MetaResultSet getProcedureColumns(String catalog,
Pat schemaPattern,
Pat procedureNamePattern,
Pat columnNamePattern);
+ /** Per {@link DatabaseMetaData#getColumnPrivileges(String, String, String, String)}. */
MetaResultSet getColumnPrivileges(String catalog,
String schema,
String table,
Pat columnNamePattern);
+ /** Per {@link DatabaseMetaData#getTablePrivileges(String, String, String)}. */
MetaResultSet getTablePrivileges(String catalog,
Pat schemaPattern,
Pat tableNamePattern);
+ /** Per
+ * {@link DatabaseMetaData#getBestRowIdentifier(String, String, String, int, boolean)}. */
MetaResultSet getBestRowIdentifier(String catalog,
String schema,
String table,
int scope,
boolean nullable);
+ /** Per {@link DatabaseMetaData#getVersionColumns(String, String, String)}. */
MetaResultSet getVersionColumns(String catalog, String schema, String table);
+ /** Per {@link DatabaseMetaData#getPrimaryKeys(String, String, String)}. */
MetaResultSet getPrimaryKeys(String catalog, String schema, String table);
+ /** Per {@link DatabaseMetaData#getImportedKeys(String, String, String)}. */
MetaResultSet getImportedKeys(String catalog, String schema, String table);
+ /** Per {@link DatabaseMetaData#getExportedKeys(String, String, String)}. */
MetaResultSet getExportedKeys(String catalog, String schema, String table);
+ /** Per
+ * {@link DatabaseMetaData#getCrossReference(String, String, String, String, String, String)}. */
MetaResultSet getCrossReference(String parentCatalog,
String parentSchema,
String parentTable,
@@ -107,43 +123,53 @@ public interface Meta {
String foreignSchema,
String foreignTable);
+ /** Per {@link DatabaseMetaData#getTypeInfo()}. */
MetaResultSet getTypeInfo();
+ /** Per {@link DatabaseMetaData#getIndexInfo(String, String, String, boolean, boolean)}. */
MetaResultSet getIndexInfo(String catalog,
String schema,
String table,
boolean unique,
boolean approximate);
+ /** Per {@link DatabaseMetaData#getUDTs(String, String, String, int[])}. */
MetaResultSet getUDTs(String catalog,
Pat schemaPattern,
Pat typeNamePattern,
int[] types);
+ /** Per {@link DatabaseMetaData#getSuperTypes(String, String, String)}. */
MetaResultSet getSuperTypes(String catalog,
Pat schemaPattern,
Pat typeNamePattern);
+ /** Per {@link DatabaseMetaData#getSuperTables(String, String, String)}. */
MetaResultSet getSuperTables(String catalog,
Pat schemaPattern,
Pat tableNamePattern);
+ /** Per {@link DatabaseMetaData#getAttributes(String, String, String, String)}. */
MetaResultSet getAttributes(String catalog,
Pat schemaPattern,
Pat typeNamePattern,
Pat attributeNamePattern);
+ /** Per {@link DatabaseMetaData#getClientInfoProperties()}. */
MetaResultSet getClientInfoProperties();
+ /** Per {@link DatabaseMetaData#getFunctions(String, String, String)}. */
MetaResultSet getFunctions(String catalog,
Pat schemaPattern,
Pat functionNamePattern);
+ /** Per {@link DatabaseMetaData#getFunctionColumns(String, String, String, String)}. */
MetaResultSet getFunctionColumns(String catalog,
Pat schemaPattern,
Pat functionNamePattern,
Pat columnNamePattern);
+ /** Per {@link DatabaseMetaData#getPseudoColumns(String, String, String, String)}. */
MetaResultSet getPseudoColumns(String catalog,
Pat schemaPattern,
Pat tableNamePattern,
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/464fd364/avatica/src/main/java/org/apache/calcite/avatica/MetaImpl.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/MetaImpl.java b/avatica/src/main/java/org/apache/calcite/avatica/MetaImpl.java
index 223830d..504c929 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/MetaImpl.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/MetaImpl.java
@@ -286,6 +286,7 @@ public abstract class MetaImpl implements Meta {
public final int ordinalPosition;
public final String isNullable;
public final String scopeCatalog = null;
+ public final String scopeSchema = null;
public final String scopeTable = null;
public final String sourceDataType = null;
public final String isAutoincrement = null;
@@ -374,15 +375,15 @@ public abstract class MetaImpl implements Meta {
/** Metadata describing a catalog. */
public static class MetaCatalog implements Named {
- public final String tableCatalog;
+ public final String tableCat;
public MetaCatalog(
String tableCatalog) {
- this.tableCatalog = tableCatalog;
+ this.tableCat = tableCatalog;
}
public String getName() {
- return tableCatalog;
+ return tableCat;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/464fd364/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java b/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java
index d087f9b..cd3df50 100644
--- a/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java
+++ b/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java
@@ -344,6 +344,7 @@ public class CalciteMetaImpl extends MetaImpl {
"ORDINAL_POSITION",
"IS_NULLABLE",
"SCOPE_CATALOG",
+ "SCOPE_SCHEMA",
"SCOPE_TABLE",
"SOURCE_DATA_TYPE",
"IS_AUTOINCREMENT",
@@ -514,7 +515,7 @@ public class CalciteMetaImpl extends MetaImpl {
public MetaResultSet getCatalogs() {
return createResultSet(catalogs(),
MetaCatalog.class,
- "TABLE_CATALOG");
+ "TABLE_CAT");
}
public MetaResultSet getTableTypes() {
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/464fd364/core/src/test/java/org/apache/calcite/jdbc/CalciteRemoteDriverTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/jdbc/CalciteRemoteDriverTest.java b/core/src/test/java/org/apache/calcite/jdbc/CalciteRemoteDriverTest.java
index f7aba8c..9491645 100644
--- a/core/src/test/java/org/apache/calcite/jdbc/CalciteRemoteDriverTest.java
+++ b/core/src/test/java/org/apache/calcite/jdbc/CalciteRemoteDriverTest.java
@@ -174,7 +174,7 @@ public class CalciteRemoteDriverTest {
final ResultSet resultSet = connection.getMetaData().getCatalogs();
final ResultSetMetaData metaData = resultSet.getMetaData();
assertEquals(1, metaData.getColumnCount());
- assertEquals("TABLE_CATALOG", metaData.getColumnName(1));
+ assertEquals("TABLE_CAT", metaData.getColumnName(1));
assertTrue(resultSet.next());
assertFalse(resultSet.next());
resultSet.close();
@@ -241,7 +241,7 @@ public class CalciteRemoteDriverTest {
@Test public void testRemoteCatalogs() throws Exception {
CalciteAssert.hr().with(REMOTE_CONNECTION_FACTORY)
.metaData(GET_CATALOGS)
- .returns("TABLE_CATALOG=null\n");
+ .returns("TABLE_CAT=null\n");
}
@Test public void testRemoteSchemas() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/464fd364/core/src/test/java/org/apache/calcite/test/JdbcTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/JdbcTest.java b/core/src/test/java/org/apache/calcite/test/JdbcTest.java
index 658619d..941b88a 100644
--- a/core/src/test/java/org/apache/calcite/test/JdbcTest.java
+++ b/core/src/test/java/org/apache/calcite/test/JdbcTest.java
@@ -5071,18 +5071,18 @@ public class JdbcTest {
// columns
assertEquals(
- "TABLE_CAT=null; TABLE_SCHEM=adhoc; TABLE_NAME=V; COLUMN_NAME=empid; DATA_TYPE=4; TYPE_NAME=JavaType(int) NOT NULL; COLUMN_SIZE=-1; BUFFER_LENGTH=null; DECIMAL_DIGITS=null; NUM_PREC_RADIX=10; NULLABLE=0; REMARKS=null; COLUMN_DEF=null; SQL_DATA_TYPE=null; SQL_DATETIME_SUB=null; CHAR_OCTET_LENGTH=-1; ORDINAL_POSITION=1; IS_NULLABLE=NO; SCOPE_CATALOG=null; SCOPE_TABLE=null; SOURCE_DATA_TYPE=null; IS_AUTOINCREMENT=null; IS_GENERATEDCOLUMN=null\n"
- + "TABLE_CAT=null; TABLE_SCHEM=adhoc; TABLE_NAME=V; COLUMN_NAME=deptno; DATA_TYPE=4; TYPE_NAME=JavaType(int) NOT NULL; COLUMN_SIZE=-1; BUFFER_LENGTH=null; DECIMAL_DIGITS=null; NUM_PREC_RADIX=10; NULLABLE=0; REMARKS=null; COLUMN_DEF=null; SQL_DATA_TYPE=null; SQL_DATETIME_SUB=null; CHAR_OCTET_LENGTH=-1; ORDINAL_POSITION=2; IS_NULLABLE=NO; SCOPE_CATALOG=null; SCOPE_TABLE=null; SOURCE_DATA_TYPE=null; IS_AUTOINCREMENT=null; IS_GENERATEDCOLUMN=null\n"
- + "TABLE_CAT=null; TABLE_SCHEM=adhoc; TABLE_NAME=V; COLUMN_NAME=name; DATA_TYPE=12; TYPE_NAME=JavaType(class java.lang.String); COLUMN_SIZE=-1; BUFFER_LENGTH=null; DECIMAL_DIGITS=null; NUM_PREC_RADIX=10; NULLABLE=1; REMARKS=null; COLUMN_DEF=null; SQL_DATA_TYPE=null; SQL_DATETIME_SUB=null; CHAR_OCTET_LENGTH=-1; ORDINAL_POSITION=3; IS_NULLABLE=YES; SCOPE_CATALOG=null; SCOPE_TABLE=null; SOURCE_DATA_TYPE=null; IS_AUTOINCREMENT=null; IS_GENERATEDCOLUMN=null\n"
- + "TABLE_CAT=null; TABLE_SCHEM=adhoc; TABLE_NAME=V; COLUMN_NAME=salary; DATA_TYPE=7; TYPE_NAME=JavaType(float) NOT NULL; COLUMN_SIZE=-1; BUFFER_LENGTH=null; DECIMAL_DIGITS=null; NUM_PREC_RADIX=10; NULLABLE=0; REMARKS=null; COLUMN_DEF=null; SQL_DATA_TYPE=null; SQL_DATETIME_SUB=null; CHAR_OCTET_LENGTH=-1; ORDINAL_POSITION=4; IS_NULLABLE=NO; SCOPE_CATALOG=null; SCOPE_TABLE=null; SOURCE_DATA_TYPE=null; IS_AUTOINCREMENT=null; IS_GENERATEDCOLUMN=null\n"
- + "TABLE_CAT=null; TABLE_SCHEM=adhoc; TABLE_NAME=V; COLUMN_NAME=commission; DATA_TYPE=4; TYPE_NAME=JavaType(class java.lang.Integer); COLUMN_SIZE=-1; BUFFER_LENGTH=null; DECIMAL_DIGITS=null; NUM_PREC_RADIX=10; NULLABLE=1; REMARKS=null; COLUMN_DEF=null; SQL_DATA_TYPE=null; SQL_DATETIME_SUB=null; CHAR_OCTET_LENGTH=-1; ORDINAL_POSITION=5; IS_NULLABLE=YES; SCOPE_CATALOG=null; SCOPE_TABLE=null; SOURCE_DATA_TYPE=null; IS_AUTOINCREMENT=null; IS_GENERATEDCOLUMN=null\n",
+ "TABLE_CAT=null; TABLE_SCHEM=adhoc; TABLE_NAME=V; COLUMN_NAME=empid; DATA_TYPE=4; TYPE_NAME=JavaType(int) NOT NULL; COLUMN_SIZE=-1; BUFFER_LENGTH=null; DECIMAL_DIGITS=null; NUM_PREC_RADIX=10; NULLABLE=0; REMARKS=null; COLUMN_DEF=null; SQL_DATA_TYPE=null; SQL_DATETIME_SUB=null; CHAR_OCTET_LENGTH=-1; ORDINAL_POSITION=1; IS_NULLABLE=NO; SCOPE_CATALOG=null; SCOPE_SCHEMA=null; SCOPE_TABLE=null; SOURCE_DATA_TYPE=null; IS_AUTOINCREMENT=null; IS_GENERATEDCOLUMN=null\n"
+ + "TABLE_CAT=null; TABLE_SCHEM=adhoc; TABLE_NAME=V; COLUMN_NAME=deptno; DATA_TYPE=4; TYPE_NAME=JavaType(int) NOT NULL; COLUMN_SIZE=-1; BUFFER_LENGTH=null; DECIMAL_DIGITS=null; NUM_PREC_RADIX=10; NULLABLE=0; REMARKS=null; COLUMN_DEF=null; SQL_DATA_TYPE=null; SQL_DATETIME_SUB=null; CHAR_OCTET_LENGTH=-1; ORDINAL_POSITION=2; IS_NULLABLE=NO; SCOPE_CATALOG=null; SCOPE_SCHEMA=null; SCOPE_TABLE=null; SOURCE_DATA_TYPE=null; IS_AUTOINCREMENT=null; IS_GENERATEDCOLUMN=null\n"
+ + "TABLE_CAT=null; TABLE_SCHEM=adhoc; TABLE_NAME=V; COLUMN_NAME=name; DATA_TYPE=12; TYPE_NAME=JavaType(class java.lang.String); COLUMN_SIZE=-1; BUFFER_LENGTH=null; DECIMAL_DIGITS=null; NUM_PREC_RADIX=10; NULLABLE=1; REMARKS=null; COLUMN_DEF=null; SQL_DATA_TYPE=null; SQL_DATETIME_SUB=null; CHAR_OCTET_LENGTH=-1; ORDINAL_POSITION=3; IS_NULLABLE=YES; SCOPE_CATALOG=null; SCOPE_SCHEMA=null; SCOPE_TABLE=null; SOURCE_DATA_TYPE=null; IS_AUTOINCREMENT=null; IS_GENERATEDCOLUMN=null\n"
+ + "TABLE_CAT=null; TABLE_SCHEM=adhoc; TABLE_NAME=V; COLUMN_NAME=salary; DATA_TYPE=7; TYPE_NAME=JavaType(float) NOT NULL; COLUMN_SIZE=-1; BUFFER_LENGTH=null; DECIMAL_DIGITS=null; NUM_PREC_RADIX=10; NULLABLE=0; REMARKS=null; COLUMN_DEF=null; SQL_DATA_TYPE=null; SQL_DATETIME_SUB=null; CHAR_OCTET_LENGTH=-1; ORDINAL_POSITION=4; IS_NULLABLE=NO; SCOPE_CATALOG=null; SCOPE_SCHEMA=null; SCOPE_TABLE=null; SOURCE_DATA_TYPE=null; IS_AUTOINCREMENT=null; IS_GENERATEDCOLUMN=null\n"
+ + "TABLE_CAT=null; TABLE_SCHEM=adhoc; TABLE_NAME=V; COLUMN_NAME=commission; DATA_TYPE=4; TYPE_NAME=JavaType(class java.lang.Integer); COLUMN_SIZE=-1; BUFFER_LENGTH=null; DECIMAL_DIGITS=null; NUM_PREC_RADIX=10; NULLABLE=1; REMARKS=null; COLUMN_DEF=null; SQL_DATA_TYPE=null; SQL_DATETIME_SUB=null; CHAR_OCTET_LENGTH=-1; ORDINAL_POSITION=5; IS_NULLABLE=YES; SCOPE_CATALOG=null; SCOPE_SCHEMA=null; SCOPE_TABLE=null; SOURCE_DATA_TYPE=null; IS_AUTOINCREMENT=null; IS_GENERATEDCOLUMN=null\n",
CalciteAssert.toString(
metaData.getColumns(
null, "adhoc", "V", null)));
// catalog
assertEquals(
- "TABLE_CATALOG=null\n",
+ "TABLE_CAT=null\n",
CalciteAssert.toString(
metaData.getCatalogs()));
[2/3] incubator-calcite git commit: Re-enable a test;
fix some code formatting; fix Windows line endings
Posted by jh...@apache.org.
Re-enable a test; fix some code formatting; fix Windows line endings
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/830afef0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/830afef0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/830afef0
Branch: refs/heads/master
Commit: 830afef0484e7b59de01331c2305a33c20df152e
Parents: 03111d2
Author: Julian Hyde <jh...@apache.org>
Authored: Tue Jul 7 17:34:58 2015 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Thu Jul 9 10:28:40 2015 -0700
----------------------------------------------------------------------
.../org/apache/calcite/plan/RelOptUtil.java | 9 ++----
.../org/apache/calcite/runtime/FlatLists.java | 4 +--
.../java/org/apache/calcite/test/JdbcTest.java | 12 ++++----
.../org/apache/calcite/test/RelBuilderTest.java | 8 +++---
.../calcite/adapter/mongodb/MongoTable.java | 29 +++++++++++---------
5 files changed, 30 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/830afef0/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java b/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java
index 5436e20..5aa2177 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java
@@ -2820,12 +2820,9 @@ public abstract class RelOptUtil {
*
* <p>Optimizes if the fields are the identity projection.
*
- * @param factory
- * ProjectFactory
- * @param child
- * Input relational expression
- * @param posList
- * Source of each projected field
+ * @param factory ProjectFactory
+ * @param child Input relational expression
+ * @param posList Source of each projected field
* @return Relational expression that projects given fields
*/
public static RelNode createProject(final RelFactories.ProjectFactory factory,
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/830afef0/core/src/main/java/org/apache/calcite/runtime/FlatLists.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/runtime/FlatLists.java b/core/src/main/java/org/apache/calcite/runtime/FlatLists.java
index c2c887f..47915e7 100644
--- a/core/src/main/java/org/apache/calcite/runtime/FlatLists.java
+++ b/core/src/main/java/org/apache/calcite/runtime/FlatLists.java
@@ -219,7 +219,7 @@ public class FlatLists {
*
* <p>The list is created via {@link FlatLists#of}.
*
- * @param <T>
+ * @param <T> Element type
*/
protected static class Flat2List<T>
extends AbstractFlatList<T>
@@ -346,7 +346,7 @@ public class FlatLists {
*
* <p>The list is created via {@link FlatLists#of(java.util.List)}.
*
- * @param <T>
+ * @param <T> Element type
*/
protected static class Flat3List<T>
extends AbstractFlatList<T>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/830afef0/core/src/test/java/org/apache/calcite/test/JdbcTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/JdbcTest.java b/core/src/test/java/org/apache/calcite/test/JdbcTest.java
index 9bee267..658619d 100644
--- a/core/src/test/java/org/apache/calcite/test/JdbcTest.java
+++ b/core/src/test/java/org/apache/calcite/test/JdbcTest.java
@@ -3379,20 +3379,18 @@ public class JdbcTest {
}
/** Tests sorting by a column that is already sorted. */
- @Ignore("fix output for timezone")
@Test public void testOrderByOnSortedTable2() {
CalciteAssert.that()
.with(CalciteAssert.Config.FOODMART_CLONE)
.query("select \"time_id\", \"the_date\" from \"time_by_day\"\n"
+ "where \"time_id\" < 370\n"
+ "order by \"time_id\"")
- .returns("time_id=367; the_date=1997-01-01 00:00:00.0\n"
- + "time_id=368; the_date=1997-01-02 00:00:00.0\n"
- + "time_id=369; the_date=1997-01-03 00:00:00.0\n")
+ .returns("time_id=367; the_date=1997-01-01 00:00:00\n"
+ + "time_id=368; the_date=1997-01-02 00:00:00\n"
+ + "time_id=369; the_date=1997-01-03 00:00:00\n")
.explainContains(""
- + "PLAN=EnumerableSort(sort0=[$0], dir0=[ASC])\n"
- + " EnumerableCalc(expr#0..9=[{inputs}], expr#10=[370], expr#11=[<($t0, $t10)], proj#0..1=[{exprs}], $condition=[$t11])\n"
- + " EnumerableTableScan(table=[[foodmart2, time_by_day]])\n\n");
+ + "PLAN=EnumerableCalc(expr#0..9=[{inputs}], expr#10=[370], expr#11=[<($t0, $t10)], proj#0..1=[{exprs}], $condition=[$t11])\n"
+ + " EnumerableTableScan(table=[[foodmart2, time_by_day]])\n\n");
}
@Test public void testWithInsideWhereExists() {
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/830afef0/core/src/test/java/org/apache/calcite/test/RelBuilderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/RelBuilderTest.java b/core/src/test/java/org/apache/calcite/test/RelBuilderTest.java
index 0474590..abf85bb 100644
--- a/core/src/test/java/org/apache/calcite/test/RelBuilderTest.java
+++ b/core/src/test/java/org/apache/calcite/test/RelBuilderTest.java
@@ -642,13 +642,13 @@ public class RelBuilderTest {
final String expected = ""
+ "LogicalSort(sort0=[$7], dir0=[DESC], fetch=[10])\n"
+ " LogicalTableScan(table=[[scott, EMP]])\n";
- assertThat(RelOptUtil.toString(root), is(expected));
+ assertThat(str(root), is(expected));
final RelNode root2 =
builder.scan("EMP")
.sortLimit(-1, 10, builder.desc(builder.field("DEPTNO")))
.build();
- assertThat(RelOptUtil.toString(root2), is(expected));
+ assertThat(str(root2), is(expected));
}
/** Tests that a sort on an expression followed by a limit gives the same
@@ -668,7 +668,7 @@ public class RelBuilderTest {
+ " LogicalSort(sort0=[$3], dir0=[DESC], offset=[3], fetch=[10])\n"
+ " LogicalProject(DEPTNO=[$0], DNAME=[$1], LOC=[$2], $f3=[+($0, 1)])\n"
+ " LogicalTableScan(table=[[scott, DEPT]])\n";
- assertThat(RelOptUtil.toString(root), is(expected));
+ assertThat(str(root), is(expected));
final RelNode root2 =
builder.scan("DEPT")
@@ -677,7 +677,7 @@ public class RelBuilderTest {
builder.call(SqlStdOperatorTable.PLUS,
builder.field("DEPTNO"), builder.literal(1))))
.build();
- assertThat(RelOptUtil.toString(root2), is(expected));
+ assertThat(str(root2), is(expected));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/830afef0/mongodb/src/main/java/org/apache/calcite/adapter/mongodb/MongoTable.java
----------------------------------------------------------------------
diff --git a/mongodb/src/main/java/org/apache/calcite/adapter/mongodb/MongoTable.java b/mongodb/src/main/java/org/apache/calcite/adapter/mongodb/MongoTable.java
index 2c362a3..af8d80c 100644
--- a/mongodb/src/main/java/org/apache/calcite/adapter/mongodb/MongoTable.java
+++ b/mongodb/src/main/java/org/apache/calcite/adapter/mongodb/MongoTable.java
@@ -189,28 +189,31 @@ public class MongoTable extends AbstractQueryableTable
};
}
- /** Helper method to strip non-numerics from a string
+ /** Helper method to strip non-numerics from a string.
+ *
* <p>Currently used to determine mongod versioning numbers
- * from buildInfo.versionArray for use in aggregate method logic</p>
- * @param valueString
- * @return Integer */
+ * from buildInfo.versionArray for use in aggregate method logic. */
private static Integer parseIntString(String valueString) {
return Integer.parseInt(valueString.replaceAll("[^0-9]", ""));
}
/** Executes an "aggregate" operation for pre-2.6 mongo servers.
+ *
* <p>Return document is limited to 4M or 16M in size depending on
- * version of mongo <p>Helper method for
- * {@link org.apache.calcite.adapter.mongodb.MongoTable#aggregate}
- * </p>
- * @param dbCollection
- * @param first the first aggregate action
- * @param rest the rest of the aggregate actions
- * @return AggregationOutput */
+ * version of mongo.
+
+ * <p>Helper method for
+ * {@link org.apache.calcite.adapter.mongodb.MongoTable#aggregate}.
+ *
+ * @param dbCollection Collection
+ * @param first First aggregate action
+ * @param rest Rest of the aggregate actions
+ * @return Aggregation output
+ */
private AggregationOutput aggregateOldWay(DBCollection dbCollection,
DBObject first, List<DBObject> rest) {
- return dbCollection.aggregate(first, rest
- .toArray(new DBObject[rest.size()]));
+ return dbCollection.aggregate(first,
+ rest.toArray(new DBObject[rest.size()]));
}
/** Implementation of {@link org.apache.calcite.linq4j.Queryable} based on