提交 f63f3101 authored 作者: tledkov's avatar tledkov

fix review issues

上级 fcb43bb7
...@@ -6945,7 +6945,7 @@ public class Parser { ...@@ -6945,7 +6945,7 @@ public class Parser {
* @see <a href="https://en.wikipedia.org/wiki/DUAL_table">Wikipedia: DUAL table</a> * @see <a href="https://en.wikipedia.org/wiki/DUAL_table">Wikipedia: DUAL table</a>
*/ */
boolean isDualTable(String tableName) { boolean isDualTable(String tableName) {
return ((schemaName == null || equalsToken(schemaName, "SYS")) && equalsToken("F", tableName)) return ((schemaName == null || equalsToken(schemaName, "SYS")) && equalsToken("DUAL", tableName))
|| (database.getMode().sysDummy1 && (schemaName == null || equalsToken(schemaName, "SYSIBM")) || (database.getMode().sysDummy1 && (schemaName == null || equalsToken(schemaName, "SYSIBM"))
&& equalsToken("SYSDUMMY1", tableName)); && equalsToken("SYSDUMMY1", tableName));
} }
......
...@@ -53,7 +53,7 @@ public abstract class Query extends Prepared { ...@@ -53,7 +53,7 @@ public abstract class Query extends Prepared {
Expression[] expressionArray; Expression[] expressionArray;
/** /**
* Describes one element of the ORDER BY clause of a query. * Describes elements of the ORDER BY clause of a query.
*/ */
ArrayList<SelectOrderBy> orderList; ArrayList<SelectOrderBy> orderList;
...@@ -403,7 +403,7 @@ public abstract class Query extends Prepared { ...@@ -403,7 +403,7 @@ public abstract class Query extends Prepared {
} }
fireBeforeSelectTriggers(); fireBeforeSelectTriggers();
if (noCache || !session.getDatabase().getOptimizeReuseResults() || if (noCache || !session.getDatabase().getOptimizeReuseResults() ||
(session.isLazyQueryExecution() /* && !neverLazy*/)) { (session.isLazyQueryExecution() && !neverLazy)) {
return queryWithoutCacheLazyCheck(limit, target); return queryWithoutCacheLazyCheck(limit, target);
} }
Value[] params = getParameterValues(); Value[] params = getParameterValues();
...@@ -466,7 +466,7 @@ public abstract class Query extends Prepared { ...@@ -466,7 +466,7 @@ public abstract class Query extends Prepared {
} }
/** /**
* Initialize the order or distinct expression. * Initialize the order or distinct expressions.
* *
* @param session the session * @param session the session
* @param expressions the select list expressions * @param expressions the select list expressions
...@@ -474,7 +474,7 @@ public abstract class Query extends Prepared { ...@@ -474,7 +474,7 @@ public abstract class Query extends Prepared {
* @param e the expression. * @param e the expression.
* @param visible the number of visible columns in the select list * @param visible the number of visible columns in the select list
* @param mustBeInResult all order by expressions must be in the select list * @param mustBeInResult all order by expressions must be in the select list
* @param filters the table filters1 * @param filters the table filters.
* @return index on the expression in the {@link #expressions} list. * @return index on the expression in the {@link #expressions} list.
*/ */
static int initExpression(Session session, ArrayList<Expression> expressions, static int initExpression(Session session, ArrayList<Expression> expressions,
...@@ -711,7 +711,7 @@ public abstract class Query extends Prepared { ...@@ -711,7 +711,7 @@ public abstract class Query extends Prepared {
/** /**
* Appends query limits info to the plan. * Appends query limits info to the plan.
* *
* @param buff sl plan string builder. * @param buff query plan string builder.
*/ */
void appendLimitToSQL(StringBuilder buff) { void appendLimitToSQL(StringBuilder buff) {
if (offsetExpr != null) { if (offsetExpr != null) {
......
...@@ -72,7 +72,7 @@ public class Select extends Query { ...@@ -72,7 +72,7 @@ public class Select extends Query {
/** /**
* The main (top) table filter. * The main (top) table filter.
*/ */
private TableFilter topTableFilter; TableFilter topTableFilter;
private final ArrayList<TableFilter> filters = Utils.newSmallArrayList(); private final ArrayList<TableFilter> filters = Utils.newSmallArrayList();
private final ArrayList<TableFilter> topFilters = Utils.newSmallArrayList(); private final ArrayList<TableFilter> topFilters = Utils.newSmallArrayList();
...@@ -83,7 +83,7 @@ public class Select extends Query { ...@@ -83,7 +83,7 @@ public class Select extends Query {
/** /**
* The visible columns (the ones required in the result). * The visible columns (the ones required in the result).
*/ */
private int visibleColumnCount; int visibleColumnCount;
/** /**
* {@code DISTINCT ON(...)} expressions. * {@code DISTINCT ON(...)} expressions.
...@@ -98,17 +98,17 @@ public class Select extends Query { ...@@ -98,17 +98,17 @@ public class Select extends Query {
/** /**
* The indexes of the group-by columns. * The indexes of the group-by columns.
*/ */
private int[] groupIndex; int[] groupIndex;
/** /**
* Whether a column in the expression list is part of a group-by. * Whether a column in the expression list is part of a group-by.
*/ */
private boolean[] groupByExpression; boolean[] groupByExpression;
private SelectGroups groupData; SelectGroups groupData;
private int havingIndex; private int havingIndex;
private boolean isGroupQuery; boolean isGroupQuery;
private boolean isGroupSortedQuery; private boolean isGroupSortedQuery;
private boolean isWindowQuery; private boolean isWindowQuery;
private boolean isForUpdate, isForUpdateMvcc; private boolean isForUpdate, isForUpdateMvcc;
......
...@@ -195,7 +195,7 @@ public abstract class SelectGroups { ...@@ -195,7 +195,7 @@ public abstract class SelectGroups {
} }
/** /**
* H2 session. * The session.
*/ */
final Session session; final Session session;
......
...@@ -19,17 +19,17 @@ public class SimpleResult implements ResultInterface { ...@@ -19,17 +19,17 @@ public class SimpleResult implements ResultInterface {
static final class Column { static final class Column {
private final String alias; final String alias;
private final String columnName; final String columnName;
private final int columnType; final int columnType;
private final long columnPrecision; final long columnPrecision;
private final int columnScale; final int columnScale;
private final int displaySize; final int displaySize;
Column(String alias, String columnName, int columnType, long columnPrecision, int columnScale, Column(String alias, String columnName, int columnType, long columnPrecision, int columnScale,
int displaySize) { int displaySize) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论