Skip to content

Fix nondeterministic ordering with postgres on artifacts #3287

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
strailov merged 3 commits into from
Aug 14, 2026
+20 −22
Merged

Fix nondeterministic ordering with postgres on artifacts #3287

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20ef747
Fix nondeterministic ordering with postgres on artifacts
strailov Aug 13, 2026
76465da
change sort to id asc
strailov Aug 13, 2026
510d4ce
fix tests not to expect artifacts in specific order
strailov Aug 14, 2026
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
42 changes: 20 additions & 22 deletions ...ce/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/AbstractDDiApiIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,12 @@ private ResultActions verifyBasePayload(
final String prefix, final ResultActions resultActions, final String controllerId,
final DistributionSet ds, final Artifact artifact, final Artifact artifactSignature, final Long actionId,
final Long osModuleId, final String downloadType, final String updateType) throws Exception {
// artifacts are matched by filename rather than by index, since the DDI payload does not
// guarantee a specific artifact order (order is DB-dependent - see #3251)
final String osArtifact = prefix + ".chunks[?(@.part=='os')].artifacts[?(@.filename=='"
+ artifact.getFilename() + "')]";
final String osSignature = prefix + ".chunks[?(@.part=='os')].artifacts[?(@.filename=='"
+ artifactSignature.getFilename() + "')]";
return resultActions.andExpect(jsonPath("$.id", equalTo(String.valueOf(actionId))))
.andExpect(jsonPath(prefix + ".download", equalTo(downloadType)))
.andExpect(jsonPath(prefix + ".update", equalTo(updateType)))
Expand All @@ -339,34 +345,26 @@ private ResultActions verifyBasePayload(
contains(findFirstModuleByType(ds, osType).orElseThrow().getName())))
.andExpect(jsonPath(prefix + ".chunks[?(@.part=='os')].version",
contains(findFirstModuleByType(ds, osType).orElseThrow().getVersion())))
.andExpect(jsonPath(prefix + ".chunks[?(@.part=='os')].artifacts[0].size", contains(ARTIFACT_SIZE)))
.andExpect(jsonPath(prefix + ".chunks[?(@.part=='os')].artifacts[0].filename",
contains(artifact.getFilename())))
.andExpect(jsonPath(prefix + ".chunks[?(@.part=='os')].artifacts[0].hashes.md5",
contains(artifact.getMd5Hash())))
.andExpect(jsonPath(prefix + ".chunks[?(@.part=='os')].artifacts[0].hashes.sha1",
contains(artifact.getSha1Hash())))
.andExpect(jsonPath(prefix + ".chunks[?(@.part=='os')].artifacts[0].hashes.sha256",
contains(artifact.getSha256Hash())))
.andExpect(jsonPath(prefix + ".chunks[?(@.part=='os')].artifacts[0]._links.download-http.href",
.andExpect(jsonPath(osArtifact + ".size", contains(ARTIFACT_SIZE)))
.andExpect(jsonPath(osArtifact + ".filename", contains(artifact.getFilename())))
.andExpect(jsonPath(osArtifact + ".hashes.md5", contains(artifact.getMd5Hash())))
.andExpect(jsonPath(osArtifact + ".hashes.sha1", contains(artifact.getSha1Hash())))
.andExpect(jsonPath(osArtifact + ".hashes.sha256", contains(artifact.getSha256Hash())))
.andExpect(jsonPath(osArtifact + "._links.download-http.href",
contains(HTTP_LOCALHOST + AccessContext.tenant() + "/controller/v1/" + controllerId +
"/softwaremodules/" + osModuleId + "/artifacts/" + artifact.getFilename())))
.andExpect(jsonPath(prefix + ".chunks[?(@.part=='os')].artifacts[0]._links.md5sum-http.href",
.andExpect(jsonPath(osArtifact + "._links.md5sum-http.href",
contains(HTTP_LOCALHOST + AccessContext.tenant() + "/controller/v1/" + controllerId +
"/softwaremodules/" + osModuleId + "/artifacts/" + artifact.getFilename() + ".MD5SUM")))
.andExpect(jsonPath(prefix + ".chunks[?(@.part=='os')].artifacts[1].size", contains(ARTIFACT_SIZE)))
.andExpect(jsonPath(prefix + ".chunks[?(@.part=='os')].artifacts[1].filename",
contains(artifactSignature.getFilename())))
.andExpect(jsonPath(prefix + ".chunks[?(@.part=='os')].artifacts[1].hashes.md5",
contains(artifactSignature.getMd5Hash())))
.andExpect(jsonPath(prefix + ".chunks[?(@.part=='os')].artifacts[1].hashes.sha1",
contains(artifactSignature.getSha1Hash())))
.andExpect(jsonPath(prefix + ".chunks[?(@.part=='os')].artifacts[1].hashes.sha256",
contains(artifactSignature.getSha256Hash())))
.andExpect(jsonPath(prefix + ".chunks[?(@.part=='os')].artifacts[1]._links.download-http.href",
.andExpect(jsonPath(osSignature + ".size", contains(ARTIFACT_SIZE)))
.andExpect(jsonPath(osSignature + ".filename", contains(artifactSignature.getFilename())))
.andExpect(jsonPath(osSignature + ".hashes.md5", contains(artifactSignature.getMd5Hash())))
.andExpect(jsonPath(osSignature + ".hashes.sha1", contains(artifactSignature.getSha1Hash())))
.andExpect(jsonPath(osSignature + ".hashes.sha256", contains(artifactSignature.getSha256Hash())))
.andExpect(jsonPath(osSignature + "._links.download-http.href",
contains(HTTP_LOCALHOST + AccessContext.tenant() + "/controller/v1/" + controllerId +
"/softwaremodules/" + osModuleId + "/artifacts/" + artifactSignature.getFilename())))
.andExpect(jsonPath(prefix + ".chunks[?(@.part=='os')].artifacts[1]._links.md5sum-http.href",
.andExpect(jsonPath(osSignature + "._links.md5sum-http.href",
contains(HTTP_LOCALHOST + AccessContext.tenant() + "/controller/v1/" + controllerId +
"/softwaremodules/" + osModuleId + "/artifacts/" + artifactSignature.getFilename() + ".MD5SUM")))
.andExpect(jsonPath(prefix + ".chunks[?(@.part=='bApp')].version",
Expand Down
Loading