Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/calcite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@
</goals>
<configuration>
<sourceDirectory>${project.build.directory}/generated-sources/fmpp</sourceDirectory>
<outputDirectory>${project.build.directory}/generated-sources/javacc</outputDirectory>
<outputDirectory>${project.build.sourceDirectory}</outputDirectory>
<includes>
<include>**/Parser.jj</include>
</includes>
Expand Down
3 changes: 2 additions & 1 deletion modules/calcite/src/main/codegen/config.fmpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ data: {
# FMPP will use the declaration from default_config.fmpp.
parser: {
# Generated parser implementation class package and name
package: "org.apache.ignite.internal.processors.query.calcite.sql",
package: "org.apache.ignite.internal.processors.query.calcite.sql.generated",
class: "IgniteSqlParserImpl",

# List of additional classes and packages to import.
Expand All @@ -35,6 +35,7 @@ data: {
"org.apache.ignite.internal.processors.query.calcite.util.IgniteResource",
"org.apache.ignite.lang.IgniteUuid",
"org.apache.calcite.sql.ddl.SqlDdlNodes",
"org.apache.ignite.internal.processors.query.calcite.sql.*",
]

# List of new keywords. Example: "DATABASES", "TABLES". If the keyword is
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
import org.apache.ignite.internal.processors.query.calcite.schema.SchemaHolder;
import org.apache.ignite.internal.processors.query.calcite.schema.SchemaHolderImpl;
import org.apache.ignite.internal.processors.query.calcite.sql.IgniteSqlConformance;
import org.apache.ignite.internal.processors.query.calcite.sql.IgniteSqlParserImpl;
import org.apache.ignite.internal.processors.query.calcite.sql.fun.IgniteOwnSqlOperatorTable;
import org.apache.ignite.internal.processors.query.calcite.sql.fun.IgniteStdSqlOperatorTable;
import org.apache.ignite.internal.processors.query.calcite.sql.generated.IgniteSqlParserImpl;
import org.apache.ignite.internal.processors.query.calcite.trait.CorrelationTraitDef;
import org.apache.ignite.internal.processors.query.calcite.trait.DistributionTraitDef;
import org.apache.ignite.internal.processors.query.calcite.trait.RewindabilityTraitDef;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class IgniteSqlAlterTable extends IgniteAbstractSqlAlterTable {
private final boolean logging;

/** */
protected IgniteSqlAlterTable(SqlParserPos pos, boolean ifExists, SqlIdentifier tblName, boolean logging) {
public IgniteSqlAlterTable(SqlParserPos pos, boolean ifExists, SqlIdentifier tblName, boolean logging) {
super(pos, ifExists, tblName);
this.logging = logging;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class IgniteSqlAlterTableAddColumn extends IgniteAbstractSqlAlterTable {
private final SqlNodeList columns;

/** */
protected IgniteSqlAlterTableAddColumn(SqlParserPos pos, boolean ifExists, SqlIdentifier tblName,
public IgniteSqlAlterTableAddColumn(SqlParserPos pos, boolean ifExists, SqlIdentifier tblName,
boolean ifNotExistsColumn, SqlNodeList columns) {
super(pos, ifExists, tblName);
this.ifNotExistsColumn = ifNotExistsColumn;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class IgniteSqlAlterTableDropColumn extends IgniteAbstractSqlAlterTable {
private final SqlNodeList columns;

/** */
protected IgniteSqlAlterTableDropColumn(SqlParserPos pos, boolean ifExists, SqlIdentifier tblName,
public IgniteSqlAlterTableDropColumn(SqlParserPos pos, boolean ifExists, SqlIdentifier tblName,
boolean ifExistsColumn, SqlNodeList columns) {
super(pos, ifExists, tblName);
this.ifExistsColumn = ifExistsColumn;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class IgniteSqlAlterUser extends SqlDdl {
new SqlSpecialOperator("ALTER USER", SqlKind.OTHER_DDL);

/** */
protected IgniteSqlAlterUser(SqlParserPos pos, SqlIdentifier user, SqlLiteral pwd) {
public IgniteSqlAlterUser(SqlParserPos pos, SqlIdentifier user, SqlLiteral pwd) {
super(OPERATOR, pos);
this.user = Objects.requireNonNull(user, "user");
this.pwd = Objects.requireNonNull(pwd, "password");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public class IgniteSqlCreateIndex extends SqlCreate {
new SqlSpecialOperator("CREATE INDEX", SqlKind.CREATE_INDEX);

/** Creates a SqlCreateIndex. */
protected IgniteSqlCreateIndex(SqlParserPos pos, boolean ifNotExists, SqlIdentifier idxName, SqlIdentifier tblName,
public IgniteSqlCreateIndex(SqlParserPos pos, boolean ifNotExists, SqlIdentifier idxName, SqlIdentifier tblName,
SqlNodeList columnList, SqlNumericLiteral parallel, SqlNumericLiteral inlineSize) {
super(OPERATOR, pos, false, ifNotExists);
this.idxName = Objects.requireNonNull(idxName, "index name");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public class IgniteSqlCreateTable extends SqlCreate {
new SqlSpecialOperator("CREATE TABLE", SqlKind.CREATE_TABLE);

/** Creates a SqlCreateTable. */
protected IgniteSqlCreateTable(SqlParserPos pos, boolean ifNotExists, SqlIdentifier name,
public IgniteSqlCreateTable(SqlParserPos pos, boolean ifNotExists, SqlIdentifier name,
@Nullable SqlNodeList columnList, @Nullable SqlNode qry, @Nullable SqlNodeList createOptionList) {
super(OPERATOR, pos, false, ifNotExists);
this.name = Objects.requireNonNull(name, "name");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class IgniteSqlCreateUser extends SqlCreate {
new SqlSpecialOperator("CREATE USER", SqlKind.OTHER_DDL);

/** */
protected IgniteSqlCreateUser(SqlParserPos pos, SqlIdentifier user, SqlLiteral pwd) {
public IgniteSqlCreateUser(SqlParserPos pos, SqlIdentifier user, SqlLiteral pwd) {
super(OPERATOR, pos, false, false);
this.user = Objects.requireNonNull(user, "user");
this.pwd = Objects.requireNonNull(pwd, "password");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class IgniteSqlDropIndex extends SqlDrop {
new SqlSpecialOperator("DROP INDEX", SqlKind.DROP_INDEX);

/** */
protected IgniteSqlDropIndex(SqlParserPos pos, boolean ifExists, SqlIdentifier idxName) {
public IgniteSqlDropIndex(SqlParserPos pos, boolean ifExists, SqlIdentifier idxName) {
super(OPERATOR, pos, ifExists);
name = Objects.requireNonNull(idxName, "index name");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class IgniteSqlDropUser extends SqlDrop {
new SqlSpecialOperator("DROP USER", SqlKind.OTHER_DDL);

/** */
protected IgniteSqlDropUser(SqlParserPos pos, SqlIdentifier user) {
public IgniteSqlDropUser(SqlParserPos pos, SqlIdentifier user) {
super(OPERATOR, pos, false);
this.user = Objects.requireNonNull(user, "user");
}
Expand Down
Loading