-
Notifications
You must be signed in to change notification settings - Fork 74
MLE-12345 Going back to clearing the database #1807
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
Merged
Merged
Changes from all commits
Commits
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 hidden or 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 |
---|---|---|
|
@@ -17,6 +17,7 @@ | |
import com.marklogic.client.impl.SSLUtil; | ||
import com.marklogic.client.io.DocumentMetadataHandle; | ||
import com.marklogic.client.io.DocumentMetadataHandle.Capability; | ||
import com.marklogic.client.query.QueryManager; | ||
import com.marklogic.mgmt.ManageClient; | ||
import com.marklogic.mgmt.ManageConfig; | ||
import com.marklogic.mgmt.resource.appservers.ServerManager; | ||
|
@@ -313,21 +314,13 @@ public static void deleteDB(String dbName) { | |
} | ||
|
||
public static void clearDB(int port) { | ||
DatabaseClientBuilder builder = newDatabaseClientBuilder() | ||
.withDigestAuth(admin_user, admin_password) | ||
.withPort(port); | ||
|
||
try (DatabaseClient client = builder.build()) { | ||
// Trying an eval instead of a "DELETE v1/search", which leads to intermittent errors on Jenkins involving | ||
// a "clear" operation on a forest failing. | ||
String count = client.newServerEval() | ||
.xquery("let $uris := " + | ||
" for $uri in cts:uris((), (), cts:true-query()) " + | ||
" let $_ := xdmp:document-delete($uri) " + | ||
" return $uri " + | ||
"return fn:count($uris)") | ||
.evalAs(String.class); | ||
LoggerFactory.getLogger(ConnectedRESTQA.class).info("Cleared database, deleting {} URIs", count); | ||
try (DatabaseClient client = newDatabaseClientBuilder().withPort(port).build()) { | ||
QueryManager mgr = client.newQueryManager(); | ||
mgr.delete(mgr.newDeleteDefinition()); | ||
// Clearing the database occasionally causes a forest to not be available for a moment or two when the tests | ||
// are running on Jenkins. This leads to intermittent failures. Waiting is not guaranteed to avoid the | ||
// error but simply hopes to minimize the chance of an intermittent failure. | ||
waitFor(2000); | ||
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. The magic number 2000 should be extracted to a named constant to improve code readability and maintainability. Consider defining a constant like FOREST_AVAILABILITY_WAIT_MS. Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||
} | ||
} | ||
|
||
|
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.
The authentication configuration (admin_user and admin_password) that was present in the original implementation has been removed. This may cause authentication failures if the database requires explicit credentials.
Copilot uses AI. Check for mistakes.