Skip to content

Commit 134f35e

Browse files
committed
[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
1 parent 73a987e commit 134f35e

2 files changed

Lines changed: 9 additions & 11 deletions

File tree

‎fe/fe-core/src/test/java/org/apache/doris/nereids/mv/RelationImpliedPredicateTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -414,17 +414,17 @@ void testDirectLowerMvQueryUsesUpperMv() throws Exception {
414414
void testIvmOutputPredicatesSkipHiddenColumns(boolean showHiddenColumns) throws Exception {
415415
initMvRewriteSession();
416416
boolean originalEnableTableStream = Config.enable_table_stream;
417-
boolean originalEnableFeatureBinlog = Config.enable_feature_binlog;
417+
boolean originalEnableFeatureChangelog = Config.enable_feature_changelog;
418418
boolean originalShowHiddenColumns = connectContext.getSessionVariable().showHiddenColumns();
419419
Config.enable_table_stream = true;
420-
// master gates ROW-binlog table creation behind enable_feature_binlog; the IVM base table needs it.
421-
Config.enable_feature_binlog = true;
420+
// master gates changelog table creation behind enable_feature_changelog; the IVM base table needs it.
421+
Config.enable_feature_changelog = true;
422422
try {
423423
dropMvByNereids("drop materialized view if exists mv_relation_implied_ivm");
424424
dropTableWithSql("drop table if exists relation_implied_ivm_base");
425425
createTable("create table relation_implied_ivm_base (id bigint, score bigint) "
426426
+ "duplicate key(id) distributed by hash(id) buckets 1 "
427-
+ "properties('replication_num' = '1', 'binlog.enable' = 'true', 'binlog.format' = 'ROW')");
427+
+ "properties('replication_num' = '1', 'changelog.enable' = 'true')");
428428
createMvByNereids("create materialized view mv_relation_implied_ivm "
429429
+ "BUILD DEFERRED REFRESH INCREMENTAL ON MANUAL\n"
430430
+ "DISTRIBUTED BY RANDOM BUCKETS 1\n"
@@ -458,7 +458,7 @@ void testIvmOutputPredicatesSkipHiddenColumns(boolean showHiddenColumns) throws
458458
} finally {
459459
connectContext.getSessionVariable().setShowHiddenColumns(originalShowHiddenColumns);
460460
Config.enable_table_stream = originalEnableTableStream;
461-
Config.enable_feature_binlog = originalEnableFeatureBinlog;
461+
Config.enable_feature_changelog = originalEnableFeatureChangelog;
462462
dropMvByNereids("drop materialized view if exists mv_relation_implied_ivm");
463463
dropTableWithSql("drop table if exists relation_implied_ivm_base");
464464
}

‎regression-test/suites/mtmv_p0/ivm/test_ivm_datetime_sequence.groovy‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ suite("test_ivm_datetime_sequence") {
4848
PROPERTIES (
4949
"replication_num" = "1",
5050
"enable_unique_key_merge_on_write" = "true",
51-
"binlog.enable" = "true",
52-
"binlog.format" = "ROW",
53-
"binlog.need_historical_value" = "true",
51+
"changelog.enable" = "true",
52+
"changelog.need_historical_value" = "true",
5453
"function_column.sequence_col" = "seq_dt"
5554
)
5655
"""
@@ -64,9 +63,8 @@ suite("test_ivm_datetime_sequence") {
6463
PROPERTIES (
6564
"replication_num" = "1",
6665
"enable_unique_key_merge_on_write" = "true",
67-
"binlog.enable" = "true",
68-
"binlog.format" = "ROW",
69-
"binlog.need_historical_value" = "true"
66+
"changelog.enable" = "true",
67+
"changelog.need_historical_value" = "true"
7068
)
7169
"""
7270
sql """

0 commit comments

Comments
 (0)