Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge main into 4.3.x #4079

Merged
merged 26 commits into from
Dec 23, 2024
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
2ed89fb
feat(dlm): update dlm sdk version to 1.1.4.bp1 (#3251)
guowl3 Sep 2, 2024
74311e9
fix(statefulRoute): batchCompilations and getRecyclebinSettings will …
ungreat Sep 3, 2024
52d91ec
fix(resultset-export): the exported file is empty if use lower table …
LuckyPickleZZ Sep 3, 2024
42dd01a
fix(statefulRoute): sensitive column may can't get result (#3261)
ungreat Sep 4, 2024
97dd6dd
fix(manual execution): manual execution button should not be displaye…
zijiacj Sep 5, 2024
aacfb18
feat(dlm): support configure sharding strategy (#3275)
guowl3 Sep 5, 2024
e5d0f46
Merge remote-tracking branch 'origin/dev/4.3.1' into tianke_merge_202…
guowl3 Nov 22, 2024
b582b0b
merge 202406 into main (#3896)
yhilmare Nov 25, 2024
e845436
Merge remote-tracking branch 'origin/dev/4.3.1' into tianke_merge_202…
guowl3 Nov 25, 2024
b7457a2
merge from 202406 into 202407bp (#3906)
yhilmare Nov 25, 2024
eb45e40
fix(taskframework): cherry-pick the bug fix from obcloud_202409bp (#3…
guowl3 Nov 28, 2024
b2423cd
build: update 4.3.2 submodule (#3924)
LuckyPickleZZ Nov 28, 2024
b594173
merge 24v4bp into main (#3925)
guowl3 Nov 29, 2024
7e58bf1
fix (#3934)
ungreat Dec 2, 2024
d886fce
fix(osc): add version whitelist to enable lock table feature
LioRoger Dec 3, 2024
f43bf8d
fix(session): add svrIp in session list (#3961)
ungreat Dec 5, 2024
9de4b3a
fix(session): add non support kill version (#3979)
ungreat Dec 9, 2024
c3074a0
fix(actuator): diasble actuator by default (#3991)
ungreat Dec 10, 2024
01080cf
fix the issue of table not exist (#4003)
guowl3 Dec 11, 2024
0a4ada0
feat(common): reduce log of JsonUtils
LioRoger Dec 12, 2024
8d1e151
update 432bp2 submodule (#4007)
MarkPotato777 Dec 12, 2024
e1d2d5c
fix(actuator): disable actuator autoconfiguration in client mode (#4047)
ungreat Dec 17, 2024
e260dd9
merge dev/4.3.2 to main
LioRoger Dec 18, 2024
3f0d3dc
Merge pull request #4056 from oceanbase/longxuan_merge_dev_432_into_main
LioRoger Dec 18, 2024
af5cd98
Merge remote-tracking branch 'origin/main' into dev/4.3.x
guowl3 Dec 20, 2024
41c895c
rsp comments
guowl3 Dec 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(common): reduce log of JsonUtils
  • Loading branch information
LioRoger authored Dec 12, 2024
commit 0a4ada0662bbb13a38b56ca1b13b5f555ccdc847
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static <T> T fromJson(String json, Class<T> classType) {
try {
return OBJECT_MAPPER.readValue(json, classType);
} catch (JsonProcessingException e) {
log.warn("deserialize str = {} failed", json, e);
log.warn("deserialize str = {} failed, reason = {}", json, e.getMessage());
return null;
}
}
Expand All @@ -95,7 +95,7 @@ public static <T> T fromJson(String json, JavaType javaType) {
try {
return OBJECT_MAPPER.readValue(json, javaType);
} catch (JsonProcessingException e) {
log.warn("deserialize str = {} failed", json, e);
log.warn("deserialize str = {} failed, reason = {}", json, e.getMessage());
return null;
}
}
Expand All @@ -111,14 +111,14 @@ public static <T> T fromJson(String json, TypeReference<T> valueTypeRef) {
try {
return OBJECT_MAPPER.readValue(json, valueTypeRef);
} catch (JsonProcessingException e) {
log.warn("deserialize str = {} failed", json, e);
log.warn("deserialize str = {} failed, reason = {}", json, e.getMessage());
return null;
}
}

/**
* Ignore deserialize fail when json missing property annotation by @JsonTypeInfo
*
*
* @param json json string
* @param valueTypeRef represent the actual type of generic
* @return object represented by valueTypeRef
Expand Down
Loading