From 134f35e2c728ffd3f64f829c7acd9da4a42aed9c Mon Sep 17 00:00:00 2001 From: yujun Date: Wed, 21 Oct 2026 15:10:12 +0800 Subject: [PATCH] [fix](ivm) Rename leftover row binlog to changelog in IVM tests ### What problem does this PR solve? Issue Number: close #xxx Related PR: #69311, #69268, #63639 Problem Summary: #69311 renamed the row binlog (the change stream IVM reads) to changelog and rejected the legacy keys `binlog.format` / `binlog.need_historical_value` in every DDL. Two test files merged just before it were outside that rename sweep and now fail: the regression suite `test_ivm_datetime_sequence` (#69268) and the FE unit test `RelationImpliedPredicateTest#testIvmOutputPredicatesSkipHiddenColumns` (#63639) still created IVM base tables with `binlog.enable = true` plus `binlog.format = ROW`, which CREATE TABLE now rejects, and the FE test also gated on `enable_feature_binlog` instead of the new `enable_feature_changelog`. Fix: switch both to `changelog.enable = true` (plus `changelog.need_historical_value` where needed) and `enable_feature_changelog`; the gate in the regression cluster conf is covered by the existing CI configuration. Verified locally: the two FE UT classes pass (35 tests, 0 failures) and the regression suite passes against a cluster rebuilt from current master ("All suites success", results unchanged so the .out is untouched). ### Release note None ### Check List (For Author) - Test: Regression test / Unit Test - fe: RelationImpliedPredicateTest and IvmUtilTest pass via run-fe-ut.sh - regression: mtmv_p0 suite test_ivm_datetime_sequence passes via run-regression-test.sh - Behavior changed: No - Does this need documentation: No --- .../doris/nereids/mv/RelationImpliedPredicateTest.java | 10 +++++----- .../mtmv_p0/ivm/test_ivm_datetime_sequence.groovy | 10 ++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/RelationImpliedPredicateTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/RelationImpliedPredicateTest.java index 72c3b257b36942..20b21225f835fe 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/RelationImpliedPredicateTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/nereids/mv/RelationImpliedPredicateTest.java @@ -414,17 +414,17 @@ void testDirectLowerMvQueryUsesUpperMv() throws Exception { void testIvmOutputPredicatesSkipHiddenColumns(boolean showHiddenColumns) throws Exception { initMvRewriteSession(); boolean originalEnableTableStream = Config.enable_table_stream; - boolean originalEnableFeatureBinlog = Config.enable_feature_binlog; + boolean originalEnableFeatureChangelog = Config.enable_feature_changelog; boolean originalShowHiddenColumns = connectContext.getSessionVariable().showHiddenColumns(); Config.enable_table_stream = true; - // master gates ROW-binlog table creation behind enable_feature_binlog; the IVM base table needs it. - Config.enable_feature_binlog = true; + // master gates changelog table creation behind enable_feature_changelog; the IVM base table needs it. + Config.enable_feature_changelog = true; try { dropMvByNereids("drop materialized view if exists mv_relation_implied_ivm"); dropTableWithSql("drop table if exists relation_implied_ivm_base"); createTable("create table relation_implied_ivm_base (id bigint, score bigint) " + "duplicate key(id) distributed by hash(id) buckets 1 " - + "properties('replication_num' = '1', 'binlog.enable' = 'true', 'binlog.format' = 'ROW')"); + + "properties('replication_num' = '1', 'changelog.enable' = 'true')"); createMvByNereids("create materialized view mv_relation_implied_ivm " + "BUILD DEFERRED REFRESH INCREMENTAL ON MANUAL\n" + "DISTRIBUTED BY RANDOM BUCKETS 1\n" @@ -458,7 +458,7 @@ void testIvmOutputPredicatesSkipHiddenColumns(boolean showHiddenColumns) throws } finally { connectContext.getSessionVariable().setShowHiddenColumns(originalShowHiddenColumns); Config.enable_table_stream = originalEnableTableStream; - Config.enable_feature_binlog = originalEnableFeatureBinlog; + Config.enable_feature_changelog = originalEnableFeatureChangelog; dropMvByNereids("drop materialized view if exists mv_relation_implied_ivm"); dropTableWithSql("drop table if exists relation_implied_ivm_base"); } diff --git a/regression-test/suites/mtmv_p0/ivm/test_ivm_datetime_sequence.groovy b/regression-test/suites/mtmv_p0/ivm/test_ivm_datetime_sequence.groovy index c27da16c8dae48..7d7795b6c483ff 100644 --- a/regression-test/suites/mtmv_p0/ivm/test_ivm_datetime_sequence.groovy +++ b/regression-test/suites/mtmv_p0/ivm/test_ivm_datetime_sequence.groovy @@ -48,9 +48,8 @@ suite("test_ivm_datetime_sequence") { PROPERTIES ( "replication_num" = "1", "enable_unique_key_merge_on_write" = "true", - "binlog.enable" = "true", - "binlog.format" = "ROW", - "binlog.need_historical_value" = "true", + "changelog.enable" = "true", + "changelog.need_historical_value" = "true", "function_column.sequence_col" = "seq_dt" ) """ @@ -64,9 +63,8 @@ suite("test_ivm_datetime_sequence") { PROPERTIES ( "replication_num" = "1", "enable_unique_key_merge_on_write" = "true", - "binlog.enable" = "true", - "binlog.format" = "ROW", - "binlog.need_historical_value" = "true" + "changelog.enable" = "true", + "changelog.need_historical_value" = "true" ) """ sql """