-
Notifications
You must be signed in to change notification settings - Fork 258
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
Modify toQueryString to prevent SQLite expression tree from exceeding depth of 1000 #2565
Open
LZRS
wants to merge
14
commits into
google:master
Choose a base branch
from
opensrp:2561-fix-sqlite-crash
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+102
−12
Open
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
6b3d4c4
Modify toQueryString to chunk large list of ConditionParam
LZRS 8c720e2
Merge remote-tracking branch 'upstream/master' into 2561-fix-sqlite-c…
LZRS c73037d
Add test for condition params chunking and wrapping in brackets
LZRS 0264816
Merge remote-tracking branch 'upstream/master' into 2561-fix-sqlite-c…
LZRS 6a45013
Merge remote-tracking branch 'upstream/master' into 2561-fix-sqlite-c…
LZRS d764115
Add support for chunkSize param in SearchDsl filters
LZRS d509f53
Update workflow engine dependency to use latest
LZRS ab9a4a6
Merge branch 'master' into 2561-fix-sqlite-crash
LZRS 432f7af
Merge remote-tracking branch 'upstream/master' into 2561-fix-sqlite-c…
LZRS b5e67df
Refactor remove `chunkSize` parameter
LZRS b9708a6
Recursively bifurcate expression tree to reduce depth
LZRS 821feab
Revert touched files not relevant for the PR
LZRS a304c19
Merge remote-tracking branch 'upstream/master' into 2561-fix-sqlite-c…
LZRS 112344f
Refactor toQueryString
LZRS File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
* Copyright 2021-2023 Google LLC | ||
* Copyright 2021-2024 Google LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
|
@@ -86,15 +86,18 @@ internal sealed class FilterCriteria( | |
* intended. | ||
*/ | ||
private fun List<ConditionParam<*>>.toQueryString(operation: Operation) = | ||
this.joinToString( | ||
separator = " ${operation.logicalOperator} ", | ||
prefix = if (size > 1) "(" else "", | ||
postfix = if (size > 1) ")" else "", | ||
) { | ||
if (it.params.size > 1) { | ||
"(${it.condition})" | ||
} else { | ||
it.condition | ||
this.chunked(50) { conditionParams -> | ||
conditionParams.joinToString( | ||
separator = " ${operation.logicalOperator} ", | ||
prefix = if (size > 1) "(" else "", | ||
postfix = if (size > 1) ")" else "", | ||
) { | ||
if (it.params.size > 1) { | ||
"(${it.condition})" | ||
} else { | ||
it.condition | ||
} | ||
Comment on lines
+92
to
+96
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can you make this a function in the class |
||
} | ||
} | ||
} | ||
.joinToString(separator = " ${operation.logicalOperator} ") | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@MJ1998 do you have thoughts on what the chunk size should be?