diff --git a/build.sh b/build.sh new file mode 100755 index 00000000000..3a833fe2c27 --- /dev/null +++ b/build.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +set -e + +./gradlew clean publishToMavenLocal +mvn install:install-file \ + -Dfile=core/build/libs/calcite-core-1.35.0-SNAPSHOT.jar \ + -DgroupId=org.apache.calcite \ + -DartifactId=calcite-core-sap \ + -Dversion=1.35.0 \ + -Dpackaging=jar \ + -DlocalRepositoryPath=../nucleus-resources-app/patches/ +mvn install:install-file \ + -Dfile=core/build/libs/calcite-core-1.35.0-SNAPSHOT.jar \ + -DgroupId=org.apache.calcite \ + -DartifactId=calcite-core-sap \ + -Dversion=1.35.0 \ + -Dpackaging=jar \ + -DlocalRepositoryPath=$HOME/.m2/repository diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcCorrelationDataContext.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcCorrelationDataContext.java new file mode 100644 index 00000000000..7876bcd6231 --- /dev/null +++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcCorrelationDataContext.java @@ -0,0 +1,62 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.calcite.adapter.jdbc; + +import org.apache.calcite.DataContext; +import org.apache.calcite.adapter.java.JavaTypeFactory; +import org.apache.calcite.linq4j.QueryProvider; +import org.apache.calcite.schema.SchemaPlus; + +import org.checkerframework.checker.nullness.qual.Nullable; + +public class JdbcCorrelationDataContext implements DataContext { + public final static int OFFSET= 10000; + + private final DataContext delegate; + private final Object[] parameters; + + public JdbcCorrelationDataContext(DataContext delegate, Object[] parameters) { + this.delegate = delegate; + this.parameters = parameters; + } + @Override + public @Nullable SchemaPlus getRootSchema() { + return delegate.getRootSchema(); + } + + @Override + public JavaTypeFactory getTypeFactory() { + return delegate.getTypeFactory(); + } + + @Override + public QueryProvider getQueryProvider() { + return delegate.getQueryProvider(); + } + + @Override + public @Nullable Object get(String name) { + if ( name.startsWith("?")) { + int index = Integer.parseInt(name.substring(1)); + if ( index >= OFFSET && index < OFFSET+parameters.length) { + return parameters[index-OFFSET]; + } + } + return delegate.get(name); + } +} diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcCorrelationDataContextBuilder.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcCorrelationDataContextBuilder.java new file mode 100644 index 00000000000..fc272609713 --- /dev/null +++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcCorrelationDataContextBuilder.java @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.calcite.adapter.jdbc; + +import org.apache.calcite.rel.core.CorrelationId; + +import java.lang.reflect.Type; + +public interface JdbcCorrelationDataContextBuilder { + int add(CorrelationId id, int ordinal, Type type); +} diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcCorrelationDataContextBuilderImpl.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcCorrelationDataContextBuilderImpl.java new file mode 100644 index 00000000000..28135048902 --- /dev/null +++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcCorrelationDataContextBuilderImpl.java @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.calcite.adapter.jdbc; + +import com.google.common.collect.ImmutableList; + +import org.apache.calcite.DataContext; +import org.apache.calcite.adapter.enumerable.EnumerableRelImplementor; +import org.apache.calcite.linq4j.tree.BlockBuilder; +import org.apache.calcite.linq4j.tree.Expression; +import org.apache.calcite.linq4j.tree.Expressions; +import org.apache.calcite.linq4j.tree.Types; +import org.apache.calcite.rel.core.CorrelationId; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Type; + +public class JdbcCorrelationDataContextBuilderImpl implements JdbcCorrelationDataContextBuilder { + private static final Constructor NEW = Types.lookupConstructor(JdbcCorrelationDataContext.class, DataContext.class, Object[].class); + private final ImmutableList.Builder parameters = new ImmutableList.Builder<>(); + private int offset = JdbcCorrelationDataContext.OFFSET; + private final EnumerableRelImplementor implementor; + private final BlockBuilder builder; + private final Expression dataContext; + + public JdbcCorrelationDataContextBuilderImpl(EnumerableRelImplementor implementor,BlockBuilder builder, Expression dataContext) { + this.implementor = implementor; + this.builder = builder; + this.dataContext = dataContext; + } + + @Override + public int add(CorrelationId id, int ordinal, Type type) { + parameters.add(implementor.getCorrelVariableGetter(id.getName()).field(builder,ordinal,type)); + return offset++; + } + + public Expression build() { + return Expressions.new_(NEW,dataContext, + Expressions.newArrayInit(Object.class,1,parameters.build())); + } +} diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcImplementor.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcImplementor.java index 0695a77ba85..53f6571bf41 100644 --- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcImplementor.java +++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcImplementor.java @@ -18,20 +18,63 @@ import org.apache.calcite.adapter.java.JavaTypeFactory; import org.apache.calcite.rel.RelNode; +import org.apache.calcite.rel.core.CorrelationId; import org.apache.calcite.rel.rel2sql.RelToSqlConverter; +import org.apache.calcite.rel.rel2sql.SqlImplementor; +import org.apache.calcite.rel.type.RelDataTypeField; +import org.apache.calcite.rex.RexCorrelVariable; import org.apache.calcite.sql.SqlDialect; -import org.apache.calcite.util.Util; +import org.apache.calcite.sql.SqlDynamicParam; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.parser.SqlParserPos; + +import java.lang.reflect.Type; +import java.util.List; /** * State for generating a SQL statement. */ public class JdbcImplementor extends RelToSqlConverter { - public JdbcImplementor(SqlDialect dialect, JavaTypeFactory typeFactory) { + + private final JdbcCorrelationDataContextBuilder dataContextBuilder; + private final JavaTypeFactory typeFactory; + + public JdbcImplementor(SqlDialect dialect, JavaTypeFactory typeFactory, JdbcCorrelationDataContextBuilder dataContextBuilder) { super(dialect); - Util.discard(typeFactory); + this. typeFactory= typeFactory; + this.dataContextBuilder = dataContextBuilder; + } + + public JdbcImplementor(SqlDialect dialect, JavaTypeFactory typeFactory) { + this(dialect, typeFactory, new JdbcCorrelationDataContextBuilder() { + private int counter = 1; + @Override + public int add(CorrelationId id, int ordinal, Type type) { + return counter++; + } + }); } public Result implement(RelNode node) { return dispatch(node); } + + @Override + protected Context getAliasContext(RexCorrelVariable variable){ + Context context = correlTableMap.get(variable.id); + if ( context != null) return context; + List fieldList = variable.getType().getFieldList(); + return new Context(dialect,fieldList.size()) { + @Override + public SqlNode field(int ordinal) { + RelDataTypeField field = fieldList.get(ordinal); + return new SqlDynamicParam(dataContextBuilder.add(variable.id,ordinal, typeFactory.getJavaClass(field.getType())),SqlParserPos.ZERO); + } + + @Override + public SqlImplementor implementor() { + return JdbcImplementor.this; + } + }; + } } diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcToEnumerableConverter.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcToEnumerableConverter.java index 80cf32d992b..4a0570a1c38 100644 --- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcToEnumerableConverter.java +++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcToEnumerableConverter.java @@ -105,7 +105,9 @@ protected JdbcToEnumerableConverter( final JdbcConvention jdbcConvention = (JdbcConvention) requireNonNull(child.getConvention(), () -> "child.getConvention() is null for " + child); - SqlString sqlString = generateSql(jdbcConvention.dialect); + JdbcCorrelationDataContextBuilderImpl dataContextBuilder = new JdbcCorrelationDataContextBuilderImpl( + implementor,builder0,DataContext.ROOT); + SqlString sqlString = generateSql(jdbcConvention.dialect,dataContextBuilder); String sql = sqlString.getSql(); if (CalciteSystemProperty.DEBUG.value()) { System.out.println("[" + sql + "]"); @@ -179,7 +181,7 @@ protected JdbcToEnumerableConverter( Expressions.call(BuiltInMethod.CREATE_ENRICHER.method, Expressions.newArrayInit(Integer.class, 1, toIndexesTableExpression(sqlString)), - DataContext.ROOT)); + dataContextBuilder.build())); enumerable = builder0.append("enumerable", @@ -356,10 +358,10 @@ private static String jdbcGetMethod(@Nullable Primitive primitive) { : "get" + SqlFunctions.initcap(castNonNull(primitive.primitiveName)); } - private SqlString generateSql(SqlDialect dialect) { + private SqlString generateSql(SqlDialect dialect, JdbcCorrelationDataContextBuilder dataContextBuilder) { final JdbcImplementor jdbcImplementor = new JdbcImplementor(dialect, - (JavaTypeFactory) getCluster().getTypeFactory()); + (JavaTypeFactory) getCluster().getTypeFactory(), dataContextBuilder); final JdbcImplementor.Result result = jdbcImplementor.visitRoot(this.getInput()); return result.asStatement().toSqlString(dialect); diff --git a/core/src/main/java/org/apache/calcite/rel/rel2sql/SqlImplementor.java b/core/src/main/java/org/apache/calcite/rel/rel2sql/SqlImplementor.java index 6517440c5b6..f0fa528d5bc 100644 --- a/core/src/main/java/org/apache/calcite/rel/rel2sql/SqlImplementor.java +++ b/core/src/main/java/org/apache/calcite/rel/rel2sql/SqlImplementor.java @@ -659,8 +659,12 @@ public SqlNode toSql(@Nullable RexProgram program, RexNode rex) { final Context correlAliasContext = getAliasContext(variable); final RexFieldAccess lastAccess = accesses.pollLast(); assert lastAccess != null; - sqlIdentifier = (SqlIdentifier) correlAliasContext + SqlNode node = correlAliasContext .field(lastAccess.getField().getIndex()); + if ( node instanceof SqlDynamicParam) { + return node; + } + sqlIdentifier = (SqlIdentifier) node; break; case ROW: final SqlNode expr = toSql(program, referencedExpr); @@ -1450,6 +1454,12 @@ public static SqlNode toSql(RexLiteral literal) { } } + protected Context getAliasContext(RexCorrelVariable variable){ + return requireNonNull( + correlTableMap.get(variable.id), + () -> "variable " + variable.id + " is not found"); + } + /** Simple implementation of {@link Context} that cannot handle sub-queries * or correlations. Because it is so simple, you do not need to create a * {@link SqlImplementor} or {@link org.apache.calcite.tools.RelBuilder} @@ -1479,9 +1489,7 @@ protected abstract class BaseContext extends Context { } @Override protected Context getAliasContext(RexCorrelVariable variable) { - return requireNonNull( - correlTableMap.get(variable.id), - () -> "variable " + variable.id + " is not found"); + return SqlImplementor.this.getAliasContext(variable); } @Override public SqlImplementor implementor() {