1fanwang opened a new pull request, #29976:
URL: https://github.com/apache/flink/pull/29976

   <!--
   *Thank you very much for contributing to Apache Flink - we are happy that 
you want to help us improve Flink. To help the community review your 
contribution in the best possible way, please go through the checklist below, 
which will get the contribution into a shape in which it can be best reviewed.*
   
   *Please understand that we do not do this to make contributions to Flink a 
hassle. In order to uphold a high standard of quality for code contributions, 
while at the same time managing a large number of contributions, we need 
contributors to prepare the contributions well, and give reviewers enough 
contextual information for the review. Please also understand that 
contributions that do not follow this guide will take longer to review and thus 
typically be picked up with lower priority by the community.*
   
   ## Contribution Checklist
   
     - Make sure that the pull request corresponds to a [JIRA 
issue](https://issues.apache.org/jira/projects/FLINK/issues). Exceptions are 
made for typos in JavaDoc or documentation files, which need no JIRA issue.
     
     - Name the pull request in the form "[FLINK-XXXX] [component] Title of the 
pull request", where *FLINK-XXXX* should be replaced by the actual issue 
number. Skip *component* if you are unsure about which is the best component.
     Typo fixes that have no associated JIRA issue should be named following 
this pattern: `[hotfix] [docs] Fix typo in event time introduction` or 
`[hotfix] [javadocs] Expand JavaDoc for PuncuatedWatermarkGenerator`.
   
     - Fill out the template below to describe the changes contributed by the 
pull request. That will give reviewers the context they need to do the review.
     
     - Make sure that the change passes the automated tests, i.e., `mvn clean 
verify` passes. You can set up Azure Pipelines CI to do that following [this 
guide](https://cwiki.apache.org/confluence/display/FLINK/Azure+Pipelines#AzurePipelines-Tutorial:SettingupAzurePipelinesforaforkoftheFlinkrepository).
   
     - Each pull request should address only one issue, not mix up code from 
multiple issues.
     
     - Each commit in the pull request has a meaningful commit message 
(including the JIRA id)
   
     - Once all items of the checklist are addressed, remove the above text and 
this checklist, leaving only the filled out template below.
   
   
   **(The sections below can be removed for hotfixes of typos)**
   -->
   
   ## What is the purpose of the change
   
   In a two-phase batch aggregation, AVG can return NULL for a group with 
non-NULL values after adaptive local hash aggregation switches to bypass mode. 
This fixes https://issues.apache.org/jira/browse/FLINK-41097.
   
   ## Brief change log
   
   When local aggregation is bypassed, AVG now represents a NULL input with a 
zero sum and zero count, as it does during normal local aggregation. This 
avoids changing how partial results are merged.
   
   ## Verifying this change
   
   Please make sure both new and modified tests in this PR follow [the 
conventions for tests defined in our code quality 
guide](https://flink.apache.org/how-to-contribute/code-style-and-quality-common/#7-testing).
   
   This change added tests and can be verified as follows:
   
   The regression executes a bounded values source through local and global 
hash aggregation, with and without operator fusion. The first row triggers 
bypass; later rows include NULL before and after a non-NULL value. A separate 
test checks that decimal overflow in a nonempty partial aggregate remains NULL.
   
   ```shell
   ./mvnw -pl flink-table/flink-table-planner 
-Dtest=AdaptiveLocalHashAggITCase#testAvgNullAfterAdaptiveBypass -Dfast test
   ```
   
   Before:
   
   ```text
    == Correct Result - 3 ==           == Actual Result - 3 ==
   !+I[1, 5, 5.0, 5.000000, 5, 1]      +I[1, null, null, null, 5, 1]
   !+I[2, 7, 7.0, 7.000000, 7, 1]      +I[2, null, null, null, 7, 1]
    +I[3, null, null, null, null, 0]   +I[3, null, null, null, null, 0]
   [INFO] BUILD FAILURE
   ```
   
   After:
   
   ```text
   [INFO] BUILD SUCCESS
   ```
   
   The standalone reproducer below uses the same source and query, on Java 17. 
Save its source to /tmp/AvgBypassRepro.java after running the test above to 
build the test classpath.
   
   ```shell
   CP=$(python3 -c 'import xml.etree.ElementTree as ET; 
r=ET.parse("flink-table/flink-table-planner/target/surefire-reports/TEST-org.apache.flink.table.planner.runtime.batch.sql.agg.AdaptiveLocalHashAggITCase.xml");
 print(r.find(".//property[@name=\"java.class.path\"]").get("value"))')
   java --add-opens=java.base/java.lang=ALL-UNNAMED 
--add-opens=java.base/java.util=ALL-UNNAMED 
--add-opens=java.base/java.io=ALL-UNNAMED 
--add-opens=java.base/java.nio=ALL-UNNAMED 
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED -cp "$CP" /tmp/AvgBypassRepro.java
   ```
   
   Before:
   
   ```text
   
+-------------+-------------+--------------------------------+------------------------------------------+-------------+----------------------+
   |           g |      EXPR$1 |                         EXPR$2 |               
                    EXPR$3 |      EXPR$4 |               EXPR$5 |
   
+-------------+-------------+--------------------------------+------------------------------------------+-------------+----------------------+
   |           1 |      <NULL> |                         <NULL> |               
                    <NULL> |           5 |                    1 |
   |           2 |      <NULL> |                         <NULL> |               
                    <NULL> |           7 |                    1 |
   |           3 |      <NULL> |                         <NULL> |               
                    <NULL> |      <NULL> |                    0 |
   
+-------------+-------------+--------------------------------+------------------------------------------+-------------+----------------------+
   3 rows in set
   ```
   
   After:
   
   ```text
   
+-------------+-------------+--------------------------------+------------------------------------------+-------------+----------------------+
   |           g |      EXPR$1 |                         EXPR$2 |               
                    EXPR$3 |      EXPR$4 |               EXPR$5 |
   
+-------------+-------------+--------------------------------+------------------------------------------+-------------+----------------------+
   |           1 |           5 |                            5.0 |               
                  5.000000 |           5 |                    1 |
   |           2 |           7 |                            7.0 |               
                  7.000000 |           7 |                    1 |
   |           3 |      <NULL> |                         <NULL> |               
                    <NULL> |      <NULL> |                    0 |
   
+-------------+-------------+--------------------------------+------------------------------------------+-------------+----------------------+
   3 rows in set
   ```
   
   <details><summary>Reproducer source: AvgBypassRepro.java</summary>
   
   ```java
   import org.apache.flink.configuration.Configuration;
   import org.apache.flink.table.api.EnvironmentSettings;
   import org.apache.flink.table.api.TableEnvironment;
   import org.apache.flink.table.planner.factories.TestValuesTableFactory;
   import org.apache.flink.types.Row;
   
   import java.util.Arrays;
   
   public class AvgBypassRepro {
       public static void main(String[] args) {
           Configuration config = new Configuration();
           config.setString("parallelism.default", "1");
           config.setString("table.optimizer.agg-phase-strategy", "TWO_PHASE");
           config.setString("table.exec.disabled-operators", "SortAgg");
           config.setString("table.exec.local-hash-agg.adaptive.enabled", 
"true");
           
config.setString("table.exec.local-hash-agg.adaptive.sampling-threshold", "1");
           
config.setString("table.exec.local-hash-agg.adaptive.distinct-value-rate-threshold",
 "0.0");
           TableEnvironment env =
                   TableEnvironment.create(
                           EnvironmentSettings.newInstance()
                                   .inBatchMode()
                                   .withConfiguration(config)
                                   .build());
           String dataId =
                   TestValuesTableFactory.registerData(
                           Arrays.asList(
                                   Row.of(1, 5, 5.0),
                                   Row.of(1, null, null),
                                   Row.of(2, null, null),
                                   Row.of(2, 7, 7.0),
                                   Row.of(3, null, null)));
           env.executeSql(
                   "CREATE TABLE avg_input (g INT, x INT, d DOUBLE) "
                           + "WITH ('connector' = 'values', 'bounded' = 'true', 
"
                           + "'enable-aggregate-push-down' = 'false', 'data-id' 
= '"
                           + dataId
                           + "')");
           env.executeSql(
                           "SELECT g, AVG(x), AVG(d), AVG(CAST(x AS DECIMAL(10, 
2))),"
                                   + " SUM(x), COUNT(x) FROM avg_input GROUP BY 
g")
                   .print();
       }
   }
   ```
   </details>
   
   The full Maven verify suite was not run.
   
   ## Does this pull request potentially affect one of the following parts:
   
     - Dependencies (does it add or upgrade a dependency): no
     - The public API, i.e., is any changed class annotated with 
`@Public(Evolving)`: no
     - The serializers: no
     - The runtime per-record code paths (performance sensitive): yes, the 
adaptive bypass projection for AVG evaluates an additional condition.
     - Anything that affects deployment or recovery: JobManager (and its 
components), Checkpointing, Kubernetes/Yarn, ZooKeeper: no
     - The S3 file system connector: no
   
   ## Documentation
   
     - Does this pull request introduce a new feature? no
     - If yes, how is the feature documented? not applicable
   
   ---
   
   ##### Was generative AI tooling used to co-author this PR?
   
   <!--
   If generative AI tooling has been used in the process of authoring this PR, 
please
   change the checkbox below to `[X]` and replace the placeholder in the 
"Generated-by"
   line with the tool name and version. Otherwise remove the "Generated-by" 
line.
   See the ASF Generative Tooling Guidance for details:
   https://www.apache.org/legal/generative-tooling.html
   
   You are responsible for the quality and correctness of every change in this 
PR
   regardless of the tooling used. Low-effort AI-generated PRs will be closed. 
See
   AGENTS.md for the full guidance.
   -->
   
   - [X] Yes (please specify the tool below)
   
   Generated-by: GitHub Copilot CLI 1.0.112 (Auto)


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to