Skip to content

[fix](table stream) remove base table cache & use dynamic schema - #67173

Merged
morrySnow merged 2 commits into
apache:masterfrom
TsukiokaKogane:remove_stream_base_table_cache_and_refactor_dynamic_schema
Aug 28, 2026
Merged

[fix](table stream) remove base table cache & use dynamic schema#67173
morrySnow merged 2 commits into
apache:masterfrom
TsukiokaKogane:remove_stream_base_table_cache_and_refactor_dynamic_schema

Conversation

@TsukiokaKogane

@TsukiokaKogane TsukiokaKogane commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

What problem does this PR solve?

Issue Number: close #67095 #67109 #67101

Related PR: #65418

Problem Summary:

Table Streams currently retain both a cached TableIf reference and a copied schema from the base table. These snapshots can become stale in two scenarios. First, if the original base table is dropped and another table is created with the same name, relation collection may lock the replacement table by name while stream binding continues to use the cached object of the dropped table, causing the planner lock target and scan target to refer to different table identities. Second, when the base table schema changes through supported ADD/DROP COLUMN operations, especially light schema changes, the stream continues exposing its creation-time schema through DESCRIBE, SHOW COLUMNS, information_schema, and query column resolution. The stale schema can also remain after an FE metadata reload.

This change removes the cached base-table object and resolves internal base tables from the persisted catalog, database, and table IDs on each access. It also removes the copied stream schema and derives the current stream schema dynamically from the visible columns of the base table, followed by the hidden stream sequence and change-type columns. As a result, a dropped and recreated table with the same name is not treated as the original base table, while supported base-table schema changes are reflected by stream metadata and query planning. The added regression case covers schema visibility before and after ADD/DROP COLUMN and verifies stream query output after ADD COLUMN.

Release note

None

Check List (For Author)

  • Test

    • Regression test
    • Unit Test
    • Manual test (add detailed scripts or steps below)
    • No need to test or manual test. Explain why:
      • This is a refactor/code format and no logic has been changed.
      • Previous test can cover this change.
      • No code files have been changed.
      • Other reason
  • Behavior changed:

    • No.
    • Yes.
  • Does this need documentation?

    • No.
    • Yes.

Check List (For Reviewer who merge this PR)

  • Confirm the release note
  • Confirm test cases
  • Confirm document
  • Add branch pick label

@hello-stephen

Copy link
Copy Markdown
Contributor

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@TsukiokaKogane

Copy link
Copy Markdown
Contributor Author

run buildall

@morrySnow

Copy link
Copy Markdown
Contributor

/review

morrySnow
morrySnow previously approved these changes Aug 26, 2026

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requesting changes for two correctness issues.

Goal and scope

The production change is focused, and the added regression covers live-FE schema reflection across ADD/DROP. However, removing the serialized stream schema breaks mixed-version metadata replay, so the PR does not yet meet its compatibility goal safely.

Critical checkpoints

  • Correctness and compatibility: a stream newly persisted by this code has no fullSchema field for an older FE reader, which can expose a zero-column stream during rolling upgrade or failover. This is blocking.
  • Persistence and lifecycle: create-table journal/image serialization and old-reader reconstruction were traced; no compatibility fallback or format gate is present.
  • Concurrency: statement collection/binding, stream/base locks, DROP/rename, and allowed row-binlog schema-change paths were checked. No additional PR-introduced lock-order, race, or identity defect was substantiated.
  • Parallel paths: local and Cloud stream construction and metadata access paths were checked; no distinct additional defect was found.
  • Tests and expected results: the golden output is ordered and consistent with the intended live schema behavior, but the ALTER wait helper does not actually assert completion. Mixed-version journal/image coverage is also missing. I did not run builds or tests in this review-only environment.
  • Configuration, FE/BE protocol variables, transactions, and data writes: this PR adds none and introduces no separate checkpoint issue.
  • Performance and observability: dynamic schema allocation/catalog lookup was reviewed; planning snapshots the wrapper and no actionable hot-path or observability issue was established.
  • User focus: no additional focus was provided; the whole PR was reviewed.
  • CI snapshot: BE UT, Cloud UT, and coverage are successful; compile, FE UT, performance, and code-review checks are still pending at submission time.

public BaseTableStream(long id, String streamName, List<Column> fullSchema, TableIf baseTable) {
super(id, streamName, TableType.STREAM, fullSchema);
public BaseTableStream(long id, String streamName, TableIf baseTable) {
super(id, streamName, TableType.STREAM, null);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[P1] Preserve a serialized schema for older FE readers

Passing null here leaves fullSchema absent because Doris's Gson configuration does not serialize null fields. A stream created by this FE is therefore written without the only schema representation understood by the pre-change reader: when an older FE replays the CreateTableInfo journal entry or loads an image during rolling upgrade/failover, its no-arg construction leaves an empty schema and its inherited accessors expose zero columns. Please retain a serialized compatibility snapshot (new code can still ignore it at runtime), or explicitly version/gate this metadata format and cover the new-writer/old-reader path.

@gavinchou gavinchou Aug 28, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed this is still unresolved in the merged head 6268e7a5548. BaseTableStream still passes null as fullSchema, and the Doris Gson builder still omits null fields. A stream created by this version is therefore persisted without the schema snapshot required by pre-change FE readers; replaying the journal or loading the image on an older FE leaves an empty schema. Please track a follow-up that preserves a compatibility snapshot or explicitly gates the metadata format, with new-writer/old-reader coverage for both journal replay and image loading.

@hello-stephen

Copy link
Copy Markdown
Contributor
TPC-H: Total hot run time: 16817 ms
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpch-tools
Tpch sf100 test result on commit 13bb4143d27c58911255bea84a83408da1aa452f, data reload: false

------ Round 1 ----------------------------------
============================================
q1	17654	3071	3037	3037
q2	2156	254	221	221
q3	10170	903	517	517
q4	4668	246	197	197
q5	7691	570	382	382
q6	136	115	93	93
q7	538	501	379	379
q8	9243	934	995	934
q9	3521	2378	2384	2378
q10	6485	847	696	696
q11	397	200	182	182
q12	627	253	192	192
q13	18278	1543	1148	1148
q14	160	151	134	134
q15	q16	430	396	362	362
q17	1462	882	784	784
q18	3016	2205	2215	2205
q19	1115	869	764	764
q20	371	278	198	198
q21	5199	1788	1918	1788
q22	321	274	226	226
Total cold run time: 93638 ms
Total hot run time: 16817 ms

----- Round 2, with runtime_filter_mode=off -----
============================================
q1	3418	3398	3361	3361
q2	502	396	377	377
q3	2210	2309	2100	2100
q4	1192	1158	872	872
q5	2146	2085	2068	2068
q6	170	121	91	91
q7	1046	924	850	850
q8	1614	1415	1398	1398
q9	3097	3074	3068	3068
q10	1849	1781	1588	1588
q11	356	268	252	252
q12	454	426	340	340
q13	1499	1541	1181	1181
q14	172	173	161	161
q15	q16	393	394	357	357
q17	3564	3304	3204	3204
q18	4784	4340	4705	4340
q19	886	804	925	804
q20	1011	991	809	809
q21	3831	3124	3365	3124
q22	398	353	319	319
Total cold run time: 34592 ms
Total hot run time: 30664 ms

@hello-stephen

Copy link
Copy Markdown
Contributor
TPC-DS: Total hot run time: 82299 ms
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpcds-tools
TPC-DS sf100 test result on commit 13bb4143d27c58911255bea84a83408da1aa452f, data reload: false

query5	4251	410	326	326
query6	417	131	118	118
query7	4948	437	231	231
query8	287	123	127	123
query9	8672	2874	2880	2874
query10	392	227	185	185
query11	5375	1028	914	914
query12	118	69	78	69
query13	1195	457	294	294
query14	5991	2186	2101	2101
query14_1	1979	1959	1959	1959
query15	196	118	118	118
query16	943	382	361	361
query17	824	488	371	371
query18	2337	341	241	241
query19	174	139	119	119
query20	73	70	71	70
query21	206	103	88	88
query22	5404	5440	5314	5314
query23	6685	6209	6084	6084
query23_1	5866	6034	6046	6034
query24	7292	1075	776	776
query24_1	778	771	781	771
query25	443	319	261	261
query26	1231	239	131	131
query27	2782	368	247	247
query28	4735	1489	1496	1489
query29	971	452	353	353
query30	255	156	133	133
query31	839	398	329	329
query32	134	84	80	80
query33	485	235	213	213
query34	1013	827	477	477
query35	408	401	329	329
query36	576	563	533	533
query37	122	81	68	68
query38	1001	833	819	819
query39	489	490	452	452
query39_1	465	455	465	455
query40	202	89	72	72
query41	52	51	51	51
query42	77	67	74	67
query43	245	241	208	208
query44	1017	538	543	538
query45	106	104	102	102
query46	769	853	530	530
query47	745	764	698	698
query48	310	327	229	229
query49	540	238	189	189
query50	783	257	195	195
query51	8227	8207	8261	8207
query52	66	65	57	57
query53	199	196	145	145
query54	231	166	159	159
query55	70	61	54	54
query56	214	243	181	181
query57	668	673	648	648
query58	188	154	163	154
query59	1212	1253	1111	1111
query60	239	191	205	191
query61	110	117	118	117
query62	357	212	176	176
query63	171	141	139	139
query64	2702	702	566	566
query65	1607	1581	1581	1581
query66	1891	253	252	252
query67	9685	10407	9737	9737
query68	2754	1204	766	766
query69	347	215	206	206
query70	660	638	628	628
query71	247	179	162	162
query72	2307	1728	1578	1578
query73	672	558	343	343
query74	1569	1219	1136	1136
query75	1174	1099	954	954
query76	2287	755	551	551
query77	260	267	196	196
query78	3977	3740	3234	3234
query79	2711	878	596	596
query80	1578	334	271	271
query81	512	155	132	132
query82	632	121	93	93
query83	289	210	190	190
query84	430	111	89	89
query85	813	345	310	310
query86	404	183	174	174
query87	1013	965	904	904
query88	2788	2098	2085	2085
query89	291	196	172	172
query90	1963	126	125	125
query91	130	135	99	99
query92	72	69	61	61
query93	1692	1128	725	725
query94	649	224	215	215
query95	536	251	223	223
query96	791	576	254	254
query97	1052	1065	984	984
query98	176	141	131	131
query99	421	349	309	309
Total cold run time: 177650 ms
Total hot run time: 82299 ms

@hello-stephen

Copy link
Copy Markdown
Contributor
ClickBench: Total hot run time: 14.53 s
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/clickbench-tools
ClickBench test result on commit 13bb4143d27c58911255bea84a83408da1aa452f, data reload: false

query1	0.01	0.00	0.01
query2	0.08	0.04	0.04
query3	0.27	0.11	0.11
query4	1.60	0.09	0.11
query5	0.18	0.16	0.16
query6	1.25	0.68	0.70
query7	0.03	0.00	0.01
query8	0.04	0.03	0.03
query9	0.29	0.22	0.21
query10	0.35	0.34	0.36
query11	0.16	0.11	0.13
query12	0.16	0.12	0.12
query13	0.31	0.32	0.30
query14	0.44	0.44	0.45
query15	0.36	0.35	0.34
query16	0.22	0.23	0.20
query17	0.67	0.74	0.65
query18	0.17	0.17	0.18
query19	1.20	1.16	1.15
query20	0.01	0.01	0.01
query21	15.43	0.16	0.12
query22	5.08	0.04	0.05
query23	16.17	0.25	0.11
query24	3.09	0.32	0.26
query25	0.11	0.04	0.03
query26	0.76	0.17	0.14
query27	0.04	0.03	0.03
query28	3.57	0.54	0.27
query29	12.49	3.23	2.56
query30	0.25	0.12	0.12
query31	2.76	0.38	0.17
query32	3.51	0.32	0.22
query33	1.43	1.37	1.53
query34	15.39	2.18	1.73
query35	1.72	1.72	1.71
query36	0.45	0.29	0.28
query37	0.06	0.04	0.04
query38	0.04	0.03	0.03
query39	0.03	0.03	0.02
query40	0.11	0.08	0.07
query41	0.08	0.02	0.02
query42	0.03	0.02	0.02
query43	0.03	0.03	0.02
Total cold run time: 90.43 s
Total hot run time: 14.53 s

@TsukiokaKogane

Copy link
Copy Markdown
Contributor Author

run cloud_p0

2 similar comments
@TsukiokaKogane

Copy link
Copy Markdown
Contributor Author

run cloud_p0

@TsukiokaKogane

Copy link
Copy Markdown
Contributor Author

run cloud_p0

@TsukiokaKogane
TsukiokaKogane force-pushed the remove_stream_base_table_cache_and_refactor_dynamic_schema branch from 13bb414 to fa9b9fd Compare August 27, 2026 06:29
@TsukiokaKogane

Copy link
Copy Markdown
Contributor Author

run buildall

1 similar comment
@TsukiokaKogane

Copy link
Copy Markdown
Contributor Author

run buildall

@hello-stephen

Copy link
Copy Markdown
Contributor
TPC-H: Total hot run time: 16692 ms
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpch-tools
Tpch sf100 test result on commit 86f6ea4562724c74bc59c166e1c0da04bd084f7d, data reload: false

------ Round 1 ----------------------------------
============================================
q1	17554	3067	3045	3045
q2	2062	249	220	220
q3	10265	866	504	504
q4	4667	249	196	196
q5	7687	581	396	396
q6	137	118	98	98
q7	532	505	376	376
q8	9250	869	851	851
q9	3380	2403	2372	2372
q10	6504	842	691	691
q11	389	194	173	173
q12	611	266	193	193
q13	18113	1521	1177	1177
q14	155	146	136	136
q15	q16	420	396	364	364
q17	1385	883	829	829
q18	3001	2234	2242	2234
q19	1108	929	785	785
q20	379	281	203	203
q21	5115	1622	1873	1622
q22	322	268	227	227
Total cold run time: 93036 ms
Total hot run time: 16692 ms

----- Round 2, with runtime_filter_mode=off -----
============================================
q1	3445	3347	3353	3347
q2	521	390	394	390
q3	2242	2331	2194	2194
q4	1177	1160	893	893
q5	2170	2116	2100	2100
q6	174	127	86	86
q7	1041	935	858	858
q8	1607	1414	1403	1403
q9	3109	3114	3102	3102
q10	1856	1756	1603	1603
q11	353	267	248	248
q12	450	432	345	345
q13	1483	1521	1140	1140
q14	171	177	175	175
q15	q16	398	393	359	359
q17	3607	3277	3284	3277
q18	4845	4367	4723	4367
q19	1114	797	895	797
q20	1019	977	849	849
q21	3774	3070	3235	3070
q22	393	348	310	310
Total cold run time: 34949 ms
Total hot run time: 30913 ms

@hello-stephen

Copy link
Copy Markdown
Contributor
TPC-DS: Total hot run time: 81403 ms
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpcds-tools
TPC-DS sf100 test result on commit 86f6ea4562724c74bc59c166e1c0da04bd084f7d, data reload: false

query5	4286	401	337	337
query6	383	136	130	130
query7	4953	428	230	230
query8	289	124	117	117
query9	8667	2861	2857	2857
query10	402	222	191	191
query11	5391	1020	909	909
query12	117	74	72	72
query13	1195	468	321	321
query14	6123	2168	2084	2084
query14_1	1960	1944	1938	1938
query15	173	122	109	109
query16	922	370	348	348
query17	805	452	363	363
query18	2337	334	243	243
query19	176	141	107	107
query20	74	67	74	67
query21	202	100	89	89
query22	5319	5213	5234	5213
query23	6533	6067	5911	5911
query23_1	6008	5954	6025	5954
query24	7284	1080	779	779
query24_1	782	788	774	774
query25	429	304	262	262
query26	1227	234	129	129
query27	2772	411	251	251
query28	4673	1531	1480	1480
query29	929	456	362	362
query30	260	152	134	134
query31	825	401	327	327
query32	125	76	78	76
query33	464	230	188	188
query34	985	830	499	499
query35	415	392	352	352
query36	587	565	514	514
query37	120	82	71	71
query38	993	837	799	799
query39	477	478	470	470
query39_1	452	455	462	455
query40	201	93	78	78
query41	57	55	55	55
query42	77	72	73	72
query43	238	237	206	206
query44	1019	559	559	559
query45	109	106	100	100
query46	823	834	524	524
query47	778	758	693	693
query48	310	313	227	227
query49	535	234	179	179
query50	774	266	194	194
query51	8282	8231	8129	8129
query52	73	67	59	59
query53	195	193	142	142
query54	222	177	154	154
query55	72	63	53	53
query56	194	164	152	152
query57	703	759	676	676
query58	191	187	157	157
query59	1211	1234	1088	1088
query60	232	189	176	176
query61	126	114	111	111
query62	335	206	175	175
query63	208	143	139	139
query64	2743	694	576	576
query65	1567	1585	1542	1542
query66	1838	264	213	213
query67	9988	9654	9608	9608
query68	2770	1144	711	711
query69	339	223	200	200
query70	654	587	614	587
query71	243	173	165	165
query72	2284	1730	1605	1605
query73	656	575	324	324
query74	1565	1218	1137	1137
query75	1163	1097	940	940
query76	2297	733	537	537
query77	257	253	201	201
query78	3794	3732	3158	3158
query79	2860	811	596	596
query80	1587	325	271	271
query81	484	156	130	130
query82	619	128	101	101
query83	287	217	196	196
query84	298	113	90	90
query85	817	352	290	290
query86	393	200	180	180
query87	1007	972	891	891
query88	2899	2081	2091	2081
query89	278	198	174	174
query90	1929	127	126	126
query91	130	119	103	103
query92	72	68	66	66
query93	1686	1064	682	682
query94	634	240	209	209
query95	511	278	222	222
query96	760	628	267	267
query97	1032	1059	997	997
query98	163	132	131	131
query99	414	343	302	302
Total cold run time: 177511 ms
Total hot run time: 81403 ms

@hello-stephen

Copy link
Copy Markdown
Contributor
ClickBench: Total hot run time: 14.44 s
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/clickbench-tools
ClickBench test result on commit 86f6ea4562724c74bc59c166e1c0da04bd084f7d, data reload: false

query1	0.00	0.00	0.00
query2	0.08	0.04	0.04
query3	0.25	0.11	0.11
query4	1.61	0.10	0.10
query5	0.18	0.16	0.15
query6	1.26	0.70	0.66
query7	0.03	0.01	0.00
query8	0.05	0.03	0.03
query9	0.28	0.21	0.21
query10	0.35	0.33	0.35
query11	0.15	0.11	0.12
query12	0.14	0.11	0.12
query13	0.29	0.30	0.31
query14	0.45	0.46	0.44
query15	0.35	0.35	0.34
query16	0.20	0.23	0.25
query17	0.71	0.64	0.67
query18	0.19	0.16	0.16
query19	1.10	1.16	1.09
query20	0.01	0.01	0.01
query21	15.43	0.16	0.11
query22	5.07	0.05	0.04
query23	16.17	0.25	0.10
query24	3.11	0.30	0.25
query25	0.12	0.04	0.03
query26	0.74	0.16	0.11
query27	0.03	0.03	0.03
query28	3.70	0.56	0.25
query29	12.53	3.07	2.54
query30	0.24	0.12	0.12
query31	2.75	0.36	0.17
query32	3.54	0.31	0.22
query33	1.46	1.48	1.42
query34	15.41	2.17	1.77
query35	1.73	1.72	1.72
query36	0.45	0.29	0.27
query37	0.06	0.04	0.04
query38	0.04	0.03	0.03
query39	0.03	0.02	0.02
query40	0.12	0.07	0.07
query41	0.07	0.02	0.02
query42	0.03	0.02	0.02
query43	0.04	0.03	0.03
Total cold run time: 90.55 s
Total hot run time: 14.44 s

fix format

remove redundant check

remove redundant check
@TsukiokaKogane
TsukiokaKogane force-pushed the remove_stream_base_table_cache_and_refactor_dynamic_schema branch from 86f6ea4 to 6268e7a Compare August 27, 2026 10:05
@TsukiokaKogane

Copy link
Copy Markdown
Contributor Author

run buildall

@hello-stephen

Copy link
Copy Markdown
Contributor
TPC-H: Total hot run time: 16964 ms
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpch-tools
Tpch sf100 test result on commit 6268e7a5548365fba4ad82606ba93880984cde45, data reload: false

------ Round 1 ----------------------------------
============================================
q1	17575	3035	3023	3023
q2	2097	260	249	249
q3	10216	868	521	521
q4	4665	252	203	203
q5	7674	571	383	383
q6	139	117	94	94
q7	534	507	393	393
q8	9231	926	916	916
q9	3507	2451	2432	2432
q10	6508	888	707	707
q11	384	199	179	179
q12	608	259	201	201
q13	18122	1531	1179	1179
q14	155	158	142	142
q15	q16	431	391	369	369
q17	1311	914	830	830
q18	3080	2249	2228	2228
q19	1257	942	792	792
q20	370	284	202	202
q21	5625	1700	1944	1700
q22	327	270	221	221
Total cold run time: 93816 ms
Total hot run time: 16964 ms

----- Round 2, with runtime_filter_mode=off -----
============================================
q1	3420	3352	3318	3318
q2	507	400	364	364
q3	2222	2285	2134	2134
q4	1184	1178	892	892
q5	2198	2103	2097	2097
q6	176	119	88	88
q7	1022	924	841	841
q8	1612	1408	1401	1401
q9	3114	3094	3085	3085
q10	1885	1821	1643	1643
q11	359	269	252	252
q12	452	444	336	336
q13	1484	1532	1177	1177
q14	171	177	163	163
q15	q16	392	394	359	359
q17	3535	3249	3188	3188
q18	4847	4409	4726	4409
q19	900	947	908	908
q20	985	967	866	866
q21	3833	3129	3175	3129
q22	392	346	324	324
Total cold run time: 34690 ms
Total hot run time: 30974 ms

@hello-stephen

Copy link
Copy Markdown
Contributor
TPC-DS: Total hot run time: 81981 ms
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpcds-tools
TPC-DS sf100 test result on commit 6268e7a5548365fba4ad82606ba93880984cde45, data reload: false

query5	4266	412	343	343
query6	382	147	133	133
query7	4920	428	239	239
query8	295	127	121	121
query9	8686	2883	2892	2883
query10	409	226	191	191
query11	5374	1031	919	919
query12	116	72	72	72
query13	1198	462	329	329
query14	6077	2189	2062	2062
query14_1	1953	1954	1946	1946
query15	171	118	112	112
query16	917	385	339	339
query17	802	474	381	381
query18	2322	329	246	246
query19	168	149	110	110
query20	71	69	70	69
query21	202	103	87	87
query22	5409	5447	5364	5364
query23	6583	6133	6037	6037
query23_1	6032	6128	6067	6067
query24	7315	1072	767	767
query24_1	780	786	782	782
query25	439	315	270	270
query26	1233	238	131	131
query27	2774	405	253	253
query28	4695	1509	1501	1501
query29	940	460	367	367
query30	249	154	139	139
query31	825	403	337	337
query32	124	74	76	74
query33	465	223	182	182
query34	991	807	461	461
query35	415	420	347	347
query36	601	545	543	543
query37	118	84	70	70
query38	999	836	812	812
query39	507	480	471	471
query39_1	475	452	478	452
query40	205	95	79	79
query41	57	56	55	55
query42	75	76	71	71
query43	238	239	209	209
query44	1014	546	546	546
query45	110	104	125	104
query46	792	843	550	550
query47	762	765	728	728
query48	325	287	219	219
query49	536	234	181	181
query50	794	254	187	187
query51	8006	7967	7929	7929
query52	71	70	59	59
query53	194	209	153	153
query54	212	165	176	165
query55	73	62	55	55
query56	180	176	156	156
query57	720	732	659	659
query58	202	159	159	159
query59	1184	1199	1089	1089
query60	243	180	172	172
query61	123	115	143	115
query62	355	205	194	194
query63	174	141	133	133
query64	2689	712	672	672
query65	1606	1598	1621	1598
query66	1858	269	210	210
query67	9946	9734	9668	9668
query68	3032	1139	749	749
query69	344	231	187	187
query70	654	616	606	606
query71	247	176	169	169
query72	2332	1714	1358	1358
query73	646	567	332	332
query74	1992	1221	1128	1128
query75	1173	1129	958	958
query76	2359	730	562	562
query77	261	257	205	205
query78	3920	3591	3225	3225
query79	2530	869	564	564
query80	1571	327	262	262
query81	483	155	133	133
query82	621	125	92	92
query83	270	227	201	201
query84	289	110	87	87
query85	790	351	297	297
query86	380	179	173	173
query87	1001	966	890	890
query88	2775	2106	2098	2098
query89	284	196	174	174
query90	1989	126	124	124
query91	133	120	100	100
query92	79	71	68	68
query93	1542	1144	754	754
query94	644	262	225	225
query95	519	271	223	223
query96	786	606	302	302
query97	1031	1032	1038	1032
query98	159	134	136	134
query99	415	343	297	297
Total cold run time: 177761 ms
Total hot run time: 81981 ms

@hello-stephen

Copy link
Copy Markdown
Contributor
ClickBench: Total hot run time: 14.45 s
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/clickbench-tools
ClickBench test result on commit 6268e7a5548365fba4ad82606ba93880984cde45, data reload: false

query1	0.00	0.01	0.01
query2	0.08	0.04	0.04
query3	0.24	0.09	0.11
query4	1.60	0.08	0.08
query5	0.17	0.15	0.16
query6	1.33	0.68	0.69
query7	0.04	0.01	0.01
query8	0.04	0.03	0.03
query9	0.28	0.21	0.22
query10	0.35	0.34	0.34
query11	0.16	0.11	0.12
query12	0.15	0.12	0.12
query13	0.30	0.29	0.30
query14	0.46	0.47	0.45
query15	0.36	0.33	0.33
query16	0.22	0.21	0.23
query17	0.72	0.66	0.63
query18	0.18	0.16	0.17
query19	1.22	1.07	1.12
query20	0.02	0.01	0.01
query21	15.44	0.15	0.11
query22	5.09	0.05	0.05
query23	16.17	0.26	0.10
query24	3.09	0.32	0.23
query25	0.12	0.07	0.13
query26	0.73	0.16	0.13
query27	0.04	0.02	0.02
query28	3.60	0.55	0.27
query29	12.47	3.18	2.58
query30	0.25	0.11	0.12
query31	2.76	0.36	0.17
query32	3.54	0.31	0.23
query33	1.36	1.36	1.38
query34	15.38	2.16	1.77
query35	1.76	1.77	1.71
query36	0.45	0.30	0.28
query37	0.06	0.04	0.04
query38	0.05	0.03	0.03
query39	0.03	0.02	0.02
query40	0.11	0.08	0.07
query41	0.08	0.03	0.02
query42	0.03	0.03	0.03
query43	0.04	0.03	0.03
Total cold run time: 90.57 s
Total hot run time: 14.45 s

@hello-stephen

Copy link
Copy Markdown
Contributor

FE Regression Coverage Report

Increment line coverage 70.45% (31/44) 🎉
Increment coverage report
Complete coverage report

@morrySnow
morrySnow merged commit 18e939b into apache:master Aug 28, 2026
28 of 29 checks passed
luwei16 added a commit to luwei16/Doris that referenced this pull request Aug 28, 2026
### What problem does this PR solve?

Issue Number: close apache#67109

Related PR: apache#67173

Problem Summary: Sync the branch with the latest master and resolve the overlapping table stream dynamic-schema implementation. Keep the upstream base-table ID lookup and stream LSN support while retaining schema generation under the base-table read lock, explicit failure when the base table is unavailable, and an empty persisted stream schema.

### Release note

None

### Check List (For Author)

- Test: Unit Test
    - CreateTableStreamTest
    - ExplainTableStreamPlanTest
    - TableStreamBaseTableInfoTest
- Behavior changed: No (merge conflict resolution preserves the intended PR behavior)
- Does this need documentation: No
@github-actions

Copy link
Copy Markdown
Contributor

PR approved by anyone and no changes requested.

@github-actions github-actions Bot added the approved Indicates a PR has been approved by one committer. label Aug 28, 2026
@github-actions

Copy link
Copy Markdown
Contributor

PR approved by at least one committer and no changes requested.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by one committer. reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Table Stream] Recreating a base table with the same name can make planner locks and scan targets disagree

4 participants