Skip to content

Move Bootstrap.class to presto-bytecode to avoid duplicate definitions #25245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hantangwangd merged 1 commit into from
Jun 4, 2025
Merged

Move Bootstrap.class to presto-bytecode to avoid duplicate definitions #25245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions ...om/facebook/presto/sql/gen/Bootstrap.java → ...m/facebook/presto/bytecode/Bootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.facebook.presto.sql.gen;

import com.facebook.presto.bytecode.DynamicClassLoader;
package com.facebook.presto.bytecode;

import java.lang.invoke.CallSite;
import java.lang.invoke.ConstantCallSite;
Expand Down
2 changes: 1 addition & 1 deletion ...n-namespace/src/main/java/com/facebook/presto/hive/functions/gen/AccumulatorCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import static com.facebook.presto.bytecode.Access.PRIVATE;
import static com.facebook.presto.bytecode.Access.PUBLIC;
import static com.facebook.presto.bytecode.Access.a;
import static com.facebook.presto.bytecode.Bootstrap.BOOTSTRAP_METHOD;
import static com.facebook.presto.bytecode.Parameter.arg;
import static com.facebook.presto.bytecode.ParameterizedType.type;
import static com.facebook.presto.bytecode.expression.BytecodeExpressions.and;
Expand All @@ -65,7 +66,6 @@
import static com.facebook.presto.bytecode.expression.BytecodeExpressions.invokeDynamic;
import static com.facebook.presto.bytecode.expression.BytecodeExpressions.invokeStatic;
import static com.facebook.presto.bytecode.expression.BytecodeExpressions.not;
import static com.facebook.presto.hive.functions.gen.Bootstrap.BOOTSTRAP_METHOD;
import static com.facebook.presto.hive.functions.gen.CompilerUtils.defineClass;
import static com.facebook.presto.hive.functions.gen.CompilerUtils.makeClassName;
import static com.facebook.presto.hive.functions.gen.SqlTypeBytecodeExpression.constantType;
Expand Down
55 changes: 0 additions & 55 deletions ...ve-function-namespace/src/main/java/com/facebook/presto/hive/functions/gen/Bootstrap.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...space/src/main/java/com/facebook/presto/hive/functions/gen/SqlTypeBytecodeExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import java.lang.reflect.Method;
import java.util.List;

import static com.facebook.presto.bytecode.Bootstrap.BOOTSTRAP_METHOD;
import static com.facebook.presto.bytecode.ParameterizedType.type;
import static com.facebook.presto.hive.functions.gen.Bootstrap.BOOTSTRAP_METHOD;
import static java.util.Objects.requireNonNull;

public class SqlTypeBytecodeExpression
Expand Down
2 changes: 1 addition & 1 deletion ...main-base/src/main/java/com/facebook/presto/operator/aggregation/AccumulatorCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import static com.facebook.presto.bytecode.Access.PRIVATE;
import static com.facebook.presto.bytecode.Access.PUBLIC;
import static com.facebook.presto.bytecode.Access.a;
import static com.facebook.presto.bytecode.Bootstrap.BOOTSTRAP_METHOD;
import static com.facebook.presto.bytecode.Parameter.arg;
import static com.facebook.presto.bytecode.ParameterizedType.type;
import static com.facebook.presto.bytecode.expression.BytecodeExpressions.and;
Expand All @@ -69,7 +70,6 @@
import static com.facebook.presto.bytecode.expression.BytecodeExpressions.not;
import static com.facebook.presto.spi.function.aggregation.AggregationMetadata.ParameterMetadata;
import static com.facebook.presto.spi.function.aggregation.AggregationMetadata.countInputChannels;
import static com.facebook.presto.sql.gen.Bootstrap.BOOTSTRAP_METHOD;
import static com.facebook.presto.sql.gen.BytecodeUtils.invoke;
import static com.facebook.presto.sql.gen.SqlTypeBytecodeExpression.constantType;
import static com.facebook.presto.util.CompilerUtils.defineClass;
Expand Down
2 changes: 1 addition & 1 deletion presto-main-base/src/main/java/com/facebook/presto/sql/gen/BytecodeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import java.util.List;
import java.util.Optional;

import static com.facebook.presto.bytecode.Bootstrap.BOOTSTRAP_METHOD;
import static com.facebook.presto.bytecode.OpCode.NOP;
import static com.facebook.presto.bytecode.expression.BytecodeExpressions.constantFalse;
import static com.facebook.presto.bytecode.expression.BytecodeExpressions.constantTrue;
Expand All @@ -50,7 +51,6 @@
import static com.facebook.presto.operator.scalar.ScalarFunctionImplementationChoice.NullConvention.BLOCK_AND_POSITION;
import static com.facebook.presto.operator.scalar.ScalarFunctionImplementationChoice.ReturnPlaceConvention.PROVIDED_BLOCKBUILDER;
import static com.facebook.presto.operator.scalar.ScalarFunctionImplementationChoice.ReturnPlaceConvention.STACK;
import static com.facebook.presto.sql.gen.Bootstrap.BOOTSTRAP_METHOD;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.ImmutableList.toImmutableList;
Expand Down
2 changes: 1 addition & 1 deletion presto-main-base/src/main/java/com/facebook/presto/sql/gen/SqlTypeBytecodeExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import java.lang.reflect.Method;
import java.util.List;

import static com.facebook.presto.bytecode.Bootstrap.BOOTSTRAP_METHOD;
import static com.facebook.presto.bytecode.ParameterizedType.type;
import static com.facebook.presto.sql.gen.Bootstrap.BOOTSTRAP_METHOD;
import static java.util.Objects.requireNonNull;

public class SqlTypeBytecodeExpression
Expand Down
Loading