Skip to content

fix: TAP-5895 The associated key change function is turned on. The me… #491

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.

Sign up for GitHub

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

Merged
jarad0628 merged 2 commits into from
Mar 4, 2025
Merged

fix: TAP-5895 The associated key change function is turned on. The me… #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21c15f8
fix: TAP-5895 The associated key change function is turned on. The me…
ply0011 Mar 3, 2025
c06b31a
fix: TAP-5895 The associated key change function is turned on. The me…
ply0011 Mar 3, 2025
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
2 changes: 1 addition & 1 deletion connectors/mongodb-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<properties>
<java.version>8</java.version>
<tapdata.pdk.api.version>1.4.1-SNAPSHOT</tapdata.pdk.api.version>
<tapdata.pdk.api.version>1.4.3-SNAPSHOT</tapdata.pdk.api.version>
</properties>
<dependencies>
<dependency>
Expand Down
46 changes: 18 additions & 28 deletions ...ectors/mongodb-connector/src/main/java/io/tapdata/mongodb/writer/MongodbMergeOperate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ public static void recursiveMerge(
sharedJoinKeys,
null,
mergeFilter,
topLevel
topLevel,
1
);
}

Expand All @@ -130,7 +131,8 @@ public static void recursiveMerge(
Set<String> sharedJoinKeys,
MergeTableProperties parentProperties,
MergeFilter mergeFilter,
int topLevel
int topLevel,
int loopTime
) {
boolean unsetResultNull = null == unsetResult;
switch (properties.getMergeType()) {
Expand All @@ -149,7 +151,7 @@ public static void recursiveMerge(
mergeResult = updateMergeIfNeed(mergeBundle, properties, mergeResult, sharedJoinKeys, mergeFilter);
break;
case updateIntoArray:
unsetResult = updateIntoArrayUnsetMerge(mergeBundle, properties, updateJoinKeys, unsetResult, parentProperties, mergeFilter);
unsetResult = updateIntoArrayUnsetMerge(mergeBundle, properties, updateJoinKeys, unsetResult, parentProperties, mergeFilter, loopTime);
if (unsetResultNull && addUnsetMerge(mergeResults, unsetResult)) {
mergeBundle.setOperation(MergeBundle.EventOperation.INSERT);
}
Expand All @@ -161,8 +163,10 @@ public static void recursiveMerge(
}

boolean recursiveOnce = false;
int privateLoopTime = 0;
if (CollectionUtils.isNotEmpty(mergeLookupResults)) {
for (MergeLookupResult mergeLookupResult : mergeLookupResults) {
privateLoopTime++;
final Map<String, Object> data = mergeLookupResult.getData();
mergeBundle = new MergeBundle(MergeBundle.EventOperation.INSERT, null, data);
mergeBundle.setRecursive(true);
Expand All @@ -181,7 +185,8 @@ public static void recursiveMerge(
mergeLookupResult.getSharedJoinKeys(),
properties,
mergeFilter,
topLevel
topLevel,
privateLoopTime
);
recursiveOnce = true;
}
Expand Down Expand Up @@ -298,8 +303,11 @@ private static MergeResult updateWriteUnsetMerge(
public static MergeResult updateIntoArrayUnsetMerge(
MergeBundle mergeBundle, MergeTableProperties currentProperty,
Map<String, MergeInfo.UpdateJoinKey> updateJoinKeys, MergeResult mergeResult,
MergeTableProperties parentProperties, MergeFilter mergeFilter) {
MergeTableProperties parentProperties, MergeFilter mergeFilter, int loopTime) {
String id = currentProperty.getId();
if (loopTime != 1) {
return null;
}
if (null == mergeResult && (MapUtils.isEmpty(updateJoinKeys) || !updateJoinKeys.containsKey(id))) {
return mergeResult;
}
Expand Down Expand Up @@ -357,30 +365,12 @@ public static MergeResult updateIntoArrayUnsetMerge(
mergeResult.setOperation(MergeResult.Operation.UPDATE);
}
Document updateOpDoc;
if (mergeBundle.isDataExists()) {
Map<String, Object> data = mergeBeforeAndAfter(mergeBundle.getBefore(), mergeBundle.getAfter());
Map<String, Object> pullData = new HashMap<>();
for (String key : arrayKeys) {
Object value = MapUtil.getValueByKey(updateJoinKeyBefore, key);
if (null == value) {
value = MapUtil.getValueByKey(data, key);
}
pullData.put(key, value);
}
updateOpDoc = buildPullDocument(pullData, arrayKeys, array, targetPath);
if (mergeResult.getUpdate().containsKey("$pull")) {
mergeResult.getUpdate().get("$pull", Document.class).putAll(updateOpDoc);
if (StringUtils.isNotBlank(targetPath)) {
updateOpDoc = new Document(targetPath, new ArrayList<>());
if (mergeResult.getUpdate().containsKey("$set")) {
mergeResult.getUpdate().get("$set", Document.class).putAll(updateOpDoc);
} else {
mergeResult.getUpdate().put("$pull", updateOpDoc);
}
} else {
if (StringUtils.isNotBlank(targetPath)) {
updateOpDoc = new Document(targetPath, new ArrayList<>());
if (mergeResult.getUpdate().containsKey("$set")) {
mergeResult.getUpdate().get("$set", Document.class).putAll(updateOpDoc);
} else {
mergeResult.getUpdate().put("$set", updateOpDoc);
}
mergeResult.getUpdate().put("$set", updateOpDoc);
}
}
return mergeResult;
Expand Down
6 changes: 3 additions & 3 deletions ...rs/mongodb-connector/src/test/java/io/tapdata/mongodb/writer/MongodbMergeOperateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,9 +565,9 @@ void test1() {
parentProperties.setId("2");
parentProperties.setMergeType(MergeTableProperties.MergeType.updateOrInsert);
MergeFilter mergeFilter = new MergeFilter(true);
MergeResult result = MongodbMergeOperate.updateIntoArrayUnsetMerge(mergeBundle, currentProperty, updateJoinKeys, mergeResult, parentProperties, mergeFilter);
MergeResult result = MongodbMergeOperate.updateIntoArrayUnsetMerge(mergeBundle, currentProperty, updateJoinKeys, mergeResult, parentProperties, mergeFilter, 1);
assertEquals("{\"id\": 1, \"src\": \"x\"}", result.getFilter().toJson());
assertEquals("{\"$pull\": {\"array\": {\"id\": 1, \"src\": \"x\", \"seq\": 1}}}", result.getUpdate().toJson());
assertEquals("{\"$set\": {\"array\": []}}", result.getUpdate().toJson());
}

@Test
Expand Down Expand Up @@ -612,7 +612,7 @@ void test2() {
parentProperties.setId("2");
parentProperties.setMergeType(MergeTableProperties.MergeType.updateOrInsert);
MergeFilter mergeFilter = new MergeFilter(true);
MergeResult result = MongodbMergeOperate.updateIntoArrayUnsetMerge(mergeBundle, currentProperty, updateJoinKeys, mergeResult, parentProperties, mergeFilter);
MergeResult result = MongodbMergeOperate.updateIntoArrayUnsetMerge(mergeBundle, currentProperty, updateJoinKeys, mergeResult, parentProperties, mergeFilter, 1);
assertEquals("{\"id\": 1, \"src\": \"x\"}", result.getFilter().toJson());
assertEquals("{\"$set\": {\"array\": []}}", result.getUpdate().toJson());
}
Expand Down
Loading