From c10b30d97a1e70ac2464b46c25be42a982163dfc Mon Sep 17 00:00:00 2001 From: Shelton Cai Date: Fri, 6 Jun 2025 17:09:11 -0700 Subject: [PATCH] Revert Move Bootstrap.class to presto-bytecode to avoid duplicate definitions [D75970190] (#25260) Summary: This diff reverts D75970190 Reverts https://github.com/prestodb/presto/pull/25245?fbclid=IwY2xjawKwI6BleHRuA2FlbQIxMQBicmlkETBoYW9yclAzdjR2bW9rU1ZlAR5T6z9TdGaufXbSNH8Y7s5HI1NhghLSwgqbKWZLniAvsDvnZshdKowS2qj08A_aem_CLbW4rp6V1haCMjCgdqPDg Causing issues in our facebook internal verifier. Not sure if issue is with facebook internal, or oss spi. Temporary revert so we can continue with release while we attempt to fix the issue. Depends on D75970190 Differential Revision: D76145724 --- .../functions/gen/AccumulatorCompiler.java | 2 +- .../presto/hive/functions/gen/Bootstrap.java | 55 +++++++++++++++++++ .../gen/SqlTypeBytecodeExpression.java | 2 +- .../aggregation/AccumulatorCompiler.java | 2 +- .../facebook/presto/sql/gen}/Bootstrap.java | 4 +- .../presto/sql/gen/BytecodeUtils.java | 2 +- .../sql/gen/SqlTypeBytecodeExpression.java | 2 +- 7 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/gen/Bootstrap.java rename {presto-bytecode/src/main/java/com/facebook/presto/bytecode => presto-main-base/src/main/java/com/facebook/presto/sql/gen}/Bootstrap.java (95%) diff --git a/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/gen/AccumulatorCompiler.java b/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/gen/AccumulatorCompiler.java index 1fe70511f8e55..d65a297591eaa 100644 --- a/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/gen/AccumulatorCompiler.java +++ b/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/gen/AccumulatorCompiler.java @@ -55,7 +55,6 @@ 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; @@ -66,6 +65,7 @@ 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; diff --git a/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/gen/Bootstrap.java b/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/gen/Bootstrap.java new file mode 100644 index 0000000000000..a6a9966670823 --- /dev/null +++ b/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/gen/Bootstrap.java @@ -0,0 +1,55 @@ +/* + * Licensed 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 com.facebook.presto.hive.functions.gen; + +import com.facebook.presto.bytecode.DynamicClassLoader; + +import java.lang.invoke.CallSite; +import java.lang.invoke.ConstantCallSite; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.reflect.Method; + +import static com.google.common.base.Preconditions.checkArgument; + +public final class Bootstrap +{ + public static final Method BOOTSTRAP_METHOD; + + static { + try { + BOOTSTRAP_METHOD = Bootstrap.class.getMethod("bootstrap", MethodHandles.Lookup.class, String.class, MethodType.class, long.class); + } + catch (NoSuchMethodException e) { + throw new AssertionError(e); + } + } + + private Bootstrap() + { + } + + public static CallSite bootstrap(MethodHandles.Lookup callerLookup, String name, MethodType type, long bindingId) + { + ClassLoader classLoader = callerLookup.lookupClass().getClassLoader(); + checkArgument(classLoader instanceof DynamicClassLoader, "Expected %s's classloader to be of type %s", callerLookup.lookupClass().getName(), DynamicClassLoader.class.getName()); + + DynamicClassLoader dynamicClassLoader = (DynamicClassLoader) classLoader; + MethodHandle target = dynamicClassLoader.getCallSiteBindings().get(bindingId); + checkArgument(target != null, "Binding %s for function %s%s not found", bindingId, name, type.parameterList()); + + return new ConstantCallSite(target); + } +} diff --git a/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/gen/SqlTypeBytecodeExpression.java b/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/gen/SqlTypeBytecodeExpression.java index 0ad381158afc7..72e952cebffcb 100644 --- a/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/gen/SqlTypeBytecodeExpression.java +++ b/presto-hive-function-namespace/src/main/java/com/facebook/presto/hive/functions/gen/SqlTypeBytecodeExpression.java @@ -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 diff --git a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/AccumulatorCompiler.java b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/AccumulatorCompiler.java index c79f93c41e37c..5aad4992981df 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/AccumulatorCompiler.java +++ b/presto-main-base/src/main/java/com/facebook/presto/operator/aggregation/AccumulatorCompiler.java @@ -57,7 +57,6 @@ 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; @@ -70,6 +69,7 @@ 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; diff --git a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/Bootstrap.java b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/Bootstrap.java similarity index 95% rename from presto-bytecode/src/main/java/com/facebook/presto/bytecode/Bootstrap.java rename to presto-main-base/src/main/java/com/facebook/presto/sql/gen/Bootstrap.java index 670c619ece3fb..7a007bea6e0c3 100644 --- a/presto-bytecode/src/main/java/com/facebook/presto/bytecode/Bootstrap.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/Bootstrap.java @@ -11,7 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.bytecode; +package com.facebook.presto.sql.gen; + +import com.facebook.presto.bytecode.DynamicClassLoader; import java.lang.invoke.CallSite; import java.lang.invoke.ConstantCallSite; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/BytecodeUtils.java b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/BytecodeUtils.java index 47d02274cea79..63d31b24b430c 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/BytecodeUtils.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/BytecodeUtils.java @@ -42,7 +42,6 @@ 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; @@ -51,6 +50,7 @@ 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; diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/SqlTypeBytecodeExpression.java b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/SqlTypeBytecodeExpression.java index c91f33dc0f4f4..23c49fd5f6382 100644 --- a/presto-main-base/src/main/java/com/facebook/presto/sql/gen/SqlTypeBytecodeExpression.java +++ b/presto-main-base/src/main/java/com/facebook/presto/sql/gen/SqlTypeBytecodeExpression.java @@ -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