[Enhancement] Support Gson subtype rollback (backport #50471) #51166

mergify · 2024-09-19T09:35:44Z

Why I'm doing:

What I'm doing:

SubtypeNotFoundException will be thrown when there is a undefined class when deserialize a subclass. The readCollection and readMapEntry will ignore the SubtypeNotFoundException if ignore_unknown_subtype is true.

Fixes #issue

What type of PR is this:

Does this PR entail a change in behavior?

Yes, this PR will result in a change in behavior.
No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

Interface/UI changes: syntax, type conversion, expression evaluation, display information
Parameter changes: default values, similar parameters but with different default values
Policy changes: use new policy to replace old one, functionality automatically enabled
Feature removed
Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

I have added test cases for my bug fix or my new feature
This pr needs user documentation (for new or modified features or behaviors)
- I have added documentation for my new feature or new function
This is a backport pr

Bugfix cherry-pick branch check:

This is an automatic backport of pull request #50471 done by [Mergify](https://mergify.com). ## Why I'm doing:

What I'm doing:

SubtypeNotFoundException will be thrown when there is a undefined class when deserialize a subclass. The readCollection and readMapEntry will ignore the SubtypeNotFoundException if ignore_unknown_subtype is true.

Fixes #issue

What type of PR is this:

Does this PR entail a change in behavior?

Yes, this PR will result in a change in behavior.
No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

Interface/UI changes: syntax, type conversion, expression evaluation, display information
Parameter changes: default values, similar parameters but with different default values
Policy changes: use new policy to replace old one, functionality automatically enabled
Feature removed
Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

I have added test cases for my bug fix or my new feature
This pr needs user documentation (for new or modified features or behaviors)
- I have added documentation for my new feature or new function
This is a backport pr

SubtypeNotFoundException will be thrown when there is a undefined class when deserialize a subclass. The `readCollection` and `readMapEntry` will ignore the SubtypeNotFoundException if ignore_unknown_subtype is true. Signed-off-by: gengjun-git <[email protected]> (cherry picked from commit 790a2b0) # Conflicts: # fe/fe-core/src/main/java/com/starrocks/journal/JournalEntity.java # fe/fe-core/src/main/java/com/starrocks/qe/VariableMgr.java # fe/fe-core/src/test/java/com/starrocks/plugin/PluginMgrTest.java

mergify · 2024-09-19T09:35:46Z

Cherry-pick of 790a2b0 has failed:

On branch mergify/bp/branch-3.3/pr-50471
Your branch is up to date with 'origin/branch-3.3'.

You are currently cherry-picking commit 790a2b0b24.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   fe/fe-core/src/main/java/com/starrocks/alter/AlterJobMgr.java
	deleted:    fe/fe-core/src/main/java/com/starrocks/alter/ForwardCompatibleAlterJobV2Object.java
	modified:   fe/fe-core/src/main/java/com/starrocks/authentication/AuthenticationMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/backup/BackupHandler.java
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/CatalogRecycleBin.java
	deleted:    fe/fe-core/src/main/java/com/starrocks/catalog/ForwardCompatibleRecyclePartitionInfoV2.java
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/GlobalFunctionMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/ResourceGroupMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/common/Config.java
	modified:   fe/fe-core/src/main/java/com/starrocks/common/util/SmallFileMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/encryption/KeyMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/load/DeleteMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/load/ExportMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/load/loadv2/LoadMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/load/pipe/PipeRepo.java
	modified:   fe/fe-core/src/main/java/com/starrocks/load/routineload/RoutineLoadMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/load/streamload/StreamLoadMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/persist/EditLog.java
	modified:   fe/fe-core/src/main/java/com/starrocks/persist/gson/GsonUtils.java
	modified:   fe/fe-core/src/main/java/com/starrocks/persist/gson/RuntimeTypeAdapterFactory.java
	new file:   fe/fe-core/src/main/java/com/starrocks/persist/gson/SubtypeNotFoundException.java
	renamed:    fe/fe-core/src/main/java/com/starrocks/persist/gson/IForwardCompatibleObject.java -> fe/fe-core/src/main/java/com/starrocks/persist/metablock/CollectionConsumer.java
	renamed:    fe/fe-core/src/main/java/com/starrocks/persist/metablock/LongObject.java -> fe/fe-core/src/main/java/com/starrocks/persist/metablock/MapEntryConsumer.java
	renamed:    fe/fe-core/src/main/java/com/starrocks/persist/metablock/IntObject.java -> fe/fe-core/src/main/java/com/starrocks/persist/metablock/PrimitiveObject.java
	modified:   fe/fe-core/src/main/java/com/starrocks/persist/metablock/SRMetaBlockReader.java
	modified:   fe/fe-core/src/main/java/com/starrocks/persist/metablock/SRMetaBlockReaderV1.java
	modified:   fe/fe-core/src/main/java/com/starrocks/persist/metablock/SRMetaBlockReaderV2.java
	modified:   fe/fe-core/src/main/java/com/starrocks/persist/metablock/SRMetaBlockWriter.java
	modified:   fe/fe-core/src/main/java/com/starrocks/persist/metablock/SRMetaBlockWriterV1.java
	modified:   fe/fe-core/src/main/java/com/starrocks/persist/metablock/SRMetaBlockWriterV2.java
	modified:   fe/fe-core/src/main/java/com/starrocks/plugin/PluginMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/privilege/AuthorizationMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/scheduler/TaskManager.java
	modified:   fe/fe-core/src/main/java/com/starrocks/scheduler/mv/MaterializedViewMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/server/CatalogMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/server/GlobalStateMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.java
	modified:   fe/fe-core/src/main/java/com/starrocks/statistic/AnalyzeMgr.java
	modified:   fe/fe-core/src/main/java/com/starrocks/transaction/GlobalTransactionMgr.java
	deleted:    fe/fe-core/src/test/java/com/starrocks/alter/AlterJobV2ForwardCompatibilityTest.java
	deleted:    fe/fe-core/src/test/java/com/starrocks/catalog/RecyclePartitionInfoForwardCompatibilityTest.java
	modified:   fe/fe-core/src/test/java/com/starrocks/persist/metablock/SRMetaBlockV1Test.java
	modified:   fe/fe-core/src/test/java/com/starrocks/persist/metablock/SRMetaBlockV2Test.java
	deleted:    fe/fe-core/src/test/java/com/starrocks/utframe/GsonReflectUtils.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/journal/JournalEntity.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/qe/VariableMgr.java
	both modified:   fe/fe-core/src/test/java/com/starrocks/plugin/PluginMgrTest.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

mergify · 2024-09-19T09:36:19Z

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

Signed-off-by: gengjun-git <[email protected]>

sonarcloud · 2024-09-20T04:39:57Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

mergify bot added the conflicts label Sep 19, 2024

mergify bot mentioned this pull request Sep 19, 2024

[Enhancement] Support Gson subtype rollback #50471

Merged

24 tasks

github-actions bot assigned gengjun-git Sep 19, 2024

mergify bot closed this Sep 19, 2024

github-actions bot added the automerge label Sep 19, 2024

mergify bot deleted the mergify/bp/branch-3.3/pr-50471 branch September 19, 2024 09:36

gengjun-git restored the mergify/bp/branch-3.3/pr-50471 branch September 20, 2024 04:15

resolve

a533321

Signed-off-by: gengjun-git <[email protected]>

gengjun-git reopened this Sep 20, 2024

gengjun-git removed the conflicts label Sep 20, 2024

wanpengfei-git enabled auto-merge (squash) September 20, 2024 04:32

gengjun-git approved these changes Sep 20, 2024

View reviewed changes

wanpengfei-git merged commit 0c2c01e into branch-3.3 Sep 20, 2024
38 of 39 checks passed

wanpengfei-git deleted the mergify/bp/branch-3.3/pr-50471 branch September 20, 2024 05:20

github-actions bot added the version:3.3.4 label Sep 20, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Enhancement] Support Gson subtype rollback (backport #50471) #51166

[Enhancement] Support Gson subtype rollback (backport #50471) #51166

mergify bot commented Sep 19, 2024 •

edited by wanpengfei-git

Loading

mergify bot commented Sep 19, 2024

mergify bot commented Sep 19, 2024

sonarcloud bot commented Sep 20, 2024

[Enhancement] Support Gson subtype rollback (backport #50471) #51166

[Enhancement] Support Gson subtype rollback (backport #50471) #51166

Conversation

mergify bot commented Sep 19, 2024 • edited by wanpengfei-git Loading

Why I'm doing:

What I'm doing:

What type of PR is this:

Checklist:

Bugfix cherry-pick branch check:

What I'm doing:

What type of PR is this:

Checklist:

mergify bot commented Sep 19, 2024

mergify bot commented Sep 19, 2024

sonarcloud bot commented Sep 20, 2024

Quality Gate passed

mergify bot commented Sep 19, 2024 •

edited by wanpengfei-git

Loading