airborne12 commented on code in PR #67342:
URL: https://github.com/apache/doris/pull/67342#discussion_r3900705058
##########
fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java:
##########
@@ -1283,25 +1283,23 @@ public static TInvertedIndexFileStorageFormat
analyzeInvertedIndexFileStorageFor
invertedIndexFileStorageFormat =
properties.get(PROPERTIES_INVERTED_INDEX_STORAGE_FORMAT);
properties.remove(PROPERTIES_INVERTED_INDEX_STORAGE_FORMAT);
} else {
- if (Config.inverted_index_storage_format.equalsIgnoreCase("V1")) {
- return TInvertedIndexFileStorageFormat.V1;
- } else if
(Config.inverted_index_storage_format.equalsIgnoreCase("V2")) {
+ if (Config.inverted_index_storage_format.equalsIgnoreCase("V2")) {
return TInvertedIndexFileStorageFormat.V2;
} else {
return TInvertedIndexFileStorageFormat.V3;
}
}
if (invertedIndexFileStorageFormat.equalsIgnoreCase("v1")) {
- return TInvertedIndexFileStorageFormat.V1;
+ throw new AnalysisException(
Review Comment:
Verified against master and this is upstream-identical, not
backport-specific: master PropertyAnalyzer has the exact same unconditional
throw for v1 (lines 1240-1243 there vs 1293-1296 here, byte-identical text),
and this PR ports that hunk verbatim.
So CCR/binlog replay of an existing explicit-V1 table hits the same
rejection on master today. I am keeping the backport faithful rather than
adding a 4.1-only sync/is_being_synced compatibility path, which would make the
branches diverge on a user-visible behaviour.
That said, this is the most impactful of the findings for 4.1 users, since
CCR replay of pre-existing V1 tables is a real upgrade scenario. Flagging it
for the maintainers as a follow-up that should land on master first and then be
picked here in the same shape. Leaving this thread open for that reason.
##########
fe/fe-common/src/main/java/org/apache/doris/common/Config.java:
##########
@@ -3264,10 +3264,12 @@ public class Config extends ConfigBase {
@ConfField(mutable = true)
public static boolean fix_tablet_partition_id_eq_0 = false;
- @ConfField(mutable = true, masterOnly = true, description = {
- "倒排索引默认存储格式",
- "Default storage format of inverted index, the default value is
V3."
- })
+ @ConfField(mutable = true, masterOnly = true,
+ callback =
InvertedIndexStorageFormatValidator.RuntimeConfigHandler.class,
Review Comment:
Same upstream-parity situation: master Config.java declares this field with
the identical callback =
InvertedIndexStorageFormatValidator.RuntimeConfigHandler.class, so the
_set_config persist reset-persistence interaction you describe exists on master
after #64522 as well. The only local adaptation in this hunk was keeping
branch-4.1 bilingual description array (plus re-indentation for checkstyle);
the callback wiring is verbatim.
Fixing the SetConfigAction / persistConfig interaction is a genuine
improvement but it belongs on master first so both branches behave the same.
Leaving this thread open for maintainer visibility.
--
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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
