[chore](regression) Merge nereids_p0 test cases into query_p0#61842
[chore](regression) Merge nereids_p0 test cases into query_p0#61842morrySnow wants to merge 5 commits intoapache:masterfrom
Conversation
…0 test_date_function
### What problem does this PR solve?
Problem Summary: During the merge of test_date_function.groovy from
nereids_p0 to query_p0, 7 blocks of unique content were missed:
1. dtv2s6 table + convert_tz microsecond tests
2. enable_insert_strict toggle for zero-year date insert
3. FROM_UNIXTIME(…, null) test
4. FROM_UNIXTIME long format test{} exception test
5. dtfmt table 5000-row datetime(3) date_format test
6. extract(dow/doy) test
7. utc_timestamp from table + debug_skip_fold test
### Release note
None
### Check List (For Author)
- Test: Regression test
- Behavior changed: No
- Does this need documentation: No
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
### What problem does this PR solve? Issue Number: close #xxx Problem Summary: The nereids_p0 regression test folder was copied from query_p0 ~4 years ago to develop the Nereids optimizer. Now that Nereids is the default optimizer, there are many duplicate test cases between these two folders. This commit merges unique test content from nereids_p0 into query_p0 to eliminate duplication. ### Release note None ### Check List (For Author) - Test: No need to test - this is a test file reorganization, merging test content from nereids_p0 into query_p0 - Behavior changed: No - Does this need documentation: No Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
|
/review |
|
run buildall |
|
you should remove the entire nereids_p0 if you confirm all cases in it has been merged into query_p0 |
|
OpenCode automated review failed and did not complete. Error: Review step was failure (possibly timeout or cancelled) Please inspect the workflow logs and rerun the review after the underlying issue is resolved. |
Regenerate .out golden output files for all merged test suites by running them against a local Doris cluster. Fix test_pushdown_explain to disable REWRITE_SIMPLE_AGG_TO_CONSTANT rule which folds count() to constants using metadata row counts, preventing pushAggOp testing. Remove the 119 nereids_p0 groovy test files and their corresponding .out files that have been merged into query_p0. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
/review |
|
@morrySnow Updated the PR:
Note: |
|
run buildall |
|
OpenCode automated review failed and did not complete. Error: Review step was failure (possibly timeout or cancelled) Please inspect the workflow logs and rerun the review after the underlying issue is resolved. |
…emove nereids_p0 Move all 366 unique nereids_p0 test files and 217 data files to query_p0. Remove nereids-specific settings (enable_nereids_planner, enable_fallback_to_original_planner), update suite tags from nereids_p0 to query_p0, replace nereids_test_query_db with test_query_db, and fix hardcoded database names (regression_test_nereids_p0_* to regression_test_query_p0_*). Delete entire regression-test/suites/nereids_p0/ and regression-test/data/nereids_p0/ directories. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
run buildall |
|
/review |
|
Updated: Moved all remaining 366 nereids_p0 test files + 217 data files to query_p0 and completely removed the Changes in latest commit:
|
There was a problem hiding this comment.
Code Review Summary — PR #61842
Overview
This PR consolidates regression tests by merging unique test content from nereids_p0 into query_p0 and deleting the nereids_p0 duplicates (1107 files, 68 modified groovy files, ~1000 deleted files). The merge is well-executed overall — database references (nereids_test_query_db → test_query_db) and Nereids planner settings have been properly cleaned up.
Critical Checkpoint Conclusions
| Checkpoint | Conclusion |
|---|---|
| Goal accomplished? | Yes. Unique nereids_p0 content is merged into query_p0; nereids_p0 is deleted. No test coverage is lost. |
| Modification focused/minimal? | Appropriate for scope — pure test reorganization with no production code changes. |
| Concurrency | N/A — test files only. |
| Lifecycle management | N/A |
| Configuration items | N/A |
| Incompatible changes | N/A |
| Parallel code paths | N/A |
| Test coverage | This PR is about tests — the merged tests themselves verify functionality. |
| Observability | N/A |
| Transaction/persistence | N/A |
| Data writes | N/A |
| FE-BE variable passing | N/A |
| Performance | N/A |
| Other issues | Minor issues noted below |
Issues Found (all minor/low severity)
-
Typo: "seession" → "session" in
test_pushdown_explain.groovy(3 occurrences in newly added content). Cosmetic but should be fixed. -
Tables dropped after use in
test_subquery.groovy— the newly merged content drops tables both before creation AND after use (e.g.,test_one_row_relation,table_23_undef_undef,table_100_undef_*,scalar_subquery_t). Per AGENTS.md: "After completing tests, do not drop tables; instead drop tables before using them in tests, to preserve the environment for debugging." -
def tableScale6pattern intest_date_function.groovy— usesdef tableScale6 = "dtv2s6"instead of hardcoding the table name directly in SQL. Per AGENTS.md: "For ordinary single test tables, do not usedef tableNameform; instead hardcode your table name in all SQL." (Low priority since this is inherited from nereids_p0 and the existing file already usesdef tableName.) -
Tables dropped after use in
test_date_function.groovy—test_period_unionis dropped both before and after use. -
Massive
qt_sqltag reuse intest_gis_function.groovy— all ~354 newly added queries use the bareqt_sqltag. While this works (the framework matches tags positionally), it makes.outfile maintenance fragile and debugging difficult. This is a pre-existing pattern in the file that is significantly amplified by this PR.
Verdict
No blocking issues. The merge is mechanically correct — nereids planner settings are properly removed, database references are updated, content is logically integrated, and .out files match the groovy queries. The issues found are minor style/convention violations, mostly inherited from the original nereids_p0 source material.
### What problem does this PR solve? Issue Number: close #xxx Related PR: apache#61842 Problem Summary: Fix issues found during local testing of moved nereids_p0 tests: - test_decimalv2: Add ADMIN SET FRONTEND CONFIG to enable decimalv2 creation - test_variable_between: Fix truncated multi_sql block from nereids settings removal - Regenerate 123 .out golden output files via -forceGenOut ### Release note None ### Check List (For Author) - Test: Regression test (all moved tests verified locally) - Behavior changed: No - Does this need documentation: No Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
run buildall |
|
/review |
Code Review SummaryScope: This PR consolidates unique test content from Reviewed Checkpoints
Minor IssueIn VerdictThe PR is a straightforward and well-executed test consolidation. No functional concerns found. |
Proposed changes
Merge unique test content from
nereids_p0regression tests intoquery_p0to eliminate duplication.What problem does this PR solve?
Issue Number: close #xxx
Problem Summary: The
regression-test/suites/nereids_p0/folder was copied fromquery_p0approximately 4 years ago to develop the Nereids optimizer. Now that Nereids is the default optimizer, there are 119 files at the same relative path in both folders with overlapping test coverage. This PR merges all unique test content fromnereids_p0intoquery_p0to consolidate these tests into a single location.Scope of changes:
regression-test/suites/query_p0/modified to include unique test cases fromnereids_p0.outgolden output files updated with expected results for newly added tests.outfile created (session_variable/test_default_limit.out)enable_nereids_plannersettings removed from merged content (Nereids is now default)nereids_test_query_dbreferences replaced withtest_query_dbquery_p0already contained all content fromnereids_p0(no changes needed)Key large merges:
explain/test_pushdown_explain.groovy: +391 lines of pushdown predicate testssql_functions/spatial_functions/test_gis_function.groovy: +354 lines of spatial function testssubquery/test_subquery.groovy: +253 lines of subquery testssql_functions/datetime_functions/test_date_function.groovy: +190+ lines of datetime testsjoin/test_runtimefilter_on_datev2.groovy: +112 lines of runtime filter testsRelease note
None
Check List (For Author)