[ https://issues.apache.org/jira/browse/BEAM-5112?focusedWorklogId=151720&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-151720 ]
ASF GitHub Bot logged work on BEAM-5112: ---------------------------------------- Author: ASF GitHub Bot Created on: 05/Oct/18 17:09 Start Date: 05/Oct/18 17:09 Worklog Time Spent: 10m Work Description: apilloud closed pull request #6562: [BEAM-5112] UdafImpl isn't part of interpreter URL: https://github.com/apache/beam/pull/6562 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamSqlEnv.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamSqlEnv.java index 1aca83bac0b..44eed399130 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamSqlEnv.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/BeamSqlEnv.java @@ -22,7 +22,6 @@ import org.apache.beam.sdk.annotations.Internal; import org.apache.beam.sdk.extensions.sql.BeamSqlTable; import org.apache.beam.sdk.extensions.sql.BeamSqlUdf; -import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.UdafImpl; import org.apache.beam.sdk.extensions.sql.impl.rel.BeamRelNode; import org.apache.beam.sdk.extensions.sql.meta.provider.ReadOnlyTableProvider; import org.apache.beam.sdk.extensions.sql.meta.provider.TableProvider; diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/UdafImpl.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/UdafImpl.java similarity index 93% rename from sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/UdafImpl.java rename to sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/UdafImpl.java index a0890596ae9..fd3f472efb0 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/interpreter/operator/UdafImpl.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/UdafImpl.java @@ -15,12 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.extensions.sql.impl.interpreter.operator; +package org.apache.beam.sdk.extensions.sql.impl; import java.io.Serializable; import java.lang.reflect.ParameterizedType; import java.util.ArrayList; import java.util.List; +import org.apache.beam.sdk.annotations.Experimental; +import org.apache.beam.sdk.annotations.Internal; import org.apache.beam.sdk.transforms.Combine.CombineFn; import org.apache.calcite.adapter.enumerable.AggImplementor; import org.apache.calcite.rel.type.RelDataType; @@ -30,11 +32,13 @@ import org.apache.calcite.schema.ImplementableAggFunction; /** Implement {@link AggregateFunction} to take a {@link CombineFn} as UDAF. */ +@Experimental +@Internal public final class UdafImpl<InputT, AccumT, OutputT> implements AggregateFunction, ImplementableAggFunction, Serializable { private CombineFn<InputT, AccumT, OutputT> combineFn; - public UdafImpl(CombineFn<InputT, AccumT, OutputT> combineFn) { + UdafImpl(CombineFn<InputT, AccumT, OutputT> combineFn) { this.combineFn = combineFn; } diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamAggregationTransforms.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamAggregationTransforms.java index 61342c45245..53fdee894b9 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamAggregationTransforms.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/transform/BeamAggregationTransforms.java @@ -39,7 +39,7 @@ import org.apache.beam.sdk.coders.KvCoder; import org.apache.beam.sdk.coders.RowCoder; import org.apache.beam.sdk.coders.VarIntCoder; -import org.apache.beam.sdk.extensions.sql.impl.interpreter.operator.UdafImpl; +import org.apache.beam.sdk.extensions.sql.impl.UdafImpl; import org.apache.beam.sdk.extensions.sql.impl.transform.agg.CovarianceFn; import org.apache.beam.sdk.extensions.sql.impl.transform.agg.VarianceFn; import org.apache.beam.sdk.extensions.sql.impl.utils.BigDecimalConverter; ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking ------------------- Worklog Id: (was: 151720) Time Spent: 1h 20m (was: 1h 10m) > Investigate if Calcite can generate functions that we need > ---------------------------------------------------------- > > Key: BEAM-5112 > URL: https://issues.apache.org/jira/browse/BEAM-5112 > Project: Beam > Issue Type: Sub-task > Components: dsl-sql > Reporter: Rui Wang > Assignee: Andrew Pilloud > Priority: Major > Time Spent: 1h 20m > Remaining Estimate: 0h > -- This message was sent by Atlassian JIRA (v7.6.3#76005)