Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ pipeline {
agent none

triggers {
parameterizedCron(env.BRANCH_NAME == "develop" ? "00 02 * * * % regressions=true" : "")
parameterizedCron(env.BRANCH_NAME == "develop" ? "00 05 * * * % regressions=true" : "")
}

parameters {
Expand Down
12 changes: 11 additions & 1 deletion etc/test-setup-users.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2015-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
*/
var valcheck = require('core-util-is');

Expand Down Expand Up @@ -68,6 +68,16 @@ function setupUsers(manager, done) {
'privilege-name': 'xdmp-get-session-field',
action: 'http://marklogic.com/xdmp/privileges/xdmp-get-session-field',
kind: 'execute'
},
{
'privilege-name': 'xdmp-lock-acquire',
action: 'http://marklogic.com/xdmp/privileges/xdmp-lock-acquire',
kind: 'execute'
},
{
'privilege-name': 'xdmp-lock-release',
action: 'http://marklogic.com/xdmp/privileges/xdmp-lock-release',
kind: 'execute'
}
]
}
Expand Down
7 changes: 7 additions & 0 deletions lib/plan-builder-base.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,13 @@ function castArg(arg, funcName, paramName, argPos, paramTypes) {
throw new Error(
'bm25LengthWeight must be a number'
);
case 'fragment':
if (['document', 'properties', 'locks', 'any'].includes(value)) {
return true;
}
throw new Error(
`${argLabel(funcName, paramName, argPos)} fragment can only be 'document', 'properties', 'locks', or 'any'`
);
default:
return false;
}});
Expand Down
4 changes: 2 additions & 2 deletions lib/plan-builder-generated.js
Original file line number Diff line number Diff line change
Expand Up @@ -8993,7 +8993,7 @@ fromSQL(...args) {
* @since 2.1.1
* @param { PlanSearchQuery } [query] - Qualifies and establishes the scores for a set of documents. The query can be a cts:query or a string as a shortcut for a cts:word-query.
* @param { XsString } [qualifierName] - Specifies a name for qualifying the column names.
* @param { PlanSearchOption } [option] - Similar to the options of cts:search, supplies the 'scoreMethod' key with a value of 'logtfidf', 'logtf', 'simple', 'zero', 'random', or 'bm25' to specify the method for assigning a score to matched documents or supplies the 'qualityWeight' key with a numeric value to specify a multiplier for the quality contribution to the score. 'logtfidf' is the default score method and the results are ordered by score by default. Specify a value between 0 (exclusive) and 1 (inclusive) for bm25LengthWeight if 'bm25' scoring method is used.
* @param { PlanSearchOption } [option] - Similar to the options of cts:search, supplies the 'scoreMethod' key with a value of 'logtfidf', 'logtf', 'simple', 'zero', 'random', or 'bm25' to specify the method for assigning a score to matched documents or supplies the 'qualityWeight' key with a numeric value to specify a multiplier for the quality contribution to the score. 'logtfidf' is the default score method and the results are ordered by score by default. Specify a value between 0 (exclusive) and 1 (inclusive) for bm25LengthWeight if 'bm25' scoring method is used. As of MLS 12.1, supplies the 'fragment' key with a value of 'document' (default), 'properties', 'locks', or 'any' to specify which document fragment type to search. Note: on servers earlier than MLS 12.1, the 'fragment' option is silently ignored and all fragment types are searched.
* @returns { planBuilder.AccessPlan }
*/
fromSearchDocs(...args) {
Expand All @@ -9012,7 +9012,7 @@ fromSearchDocs(...args) {
* @param { PlanSearchQuery } [query] - Qualifies and establishes the scores for a set of documents. The query can be a cts:query or a string as a shortcut for a cts:word-query. The fragments are not filtered to ensure they match the query, but instead selected in the same manner as "unfiltered" cts:search operations.
* @param { PlanExprColName } [columns] - Specifies which of the available columns to include in the rows. The available columns include the metrics for relevance ('confidence', 'fitness', 'quality', and 'score') and fragmentId for the document identifier. By default, the rows have the fragmentId and score columns. To rename a column, use op:as specifying the new name for an op:col with the old name.
* @param { XsString } [qualifierName] - Specifies a name for qualifying the column names.
* @param { PlanSearchOption } [option] - Similar to the options of cts:search, supplies the 'scoreMethod' key with a value of 'logtfidf', 'logtf', 'simple', 'zero', 'random', or 'bm25' to specify the method for assigning a score to matched documents or supplies the 'qualityWeight' key with a numeric value to specify a multiplier for the quality contribution to the score. Specify a value between 0 (exclusive) and 1 (inclusive) for bm25LengthWeight if 'bm25' scoring method is used.
* @param { PlanSearchOption } [option] - Similar to the options of cts:search, supplies the 'scoreMethod' key with a value of 'logtfidf', 'logtf', 'simple', 'zero', 'random', or 'bm25' to specify the method for assigning a score to matched documents or supplies the 'qualityWeight' key with a numeric value to specify a multiplier for the quality contribution to the score. Specify a value between 0 (exclusive) and 1 (inclusive) for bm25LengthWeight if 'bm25' scoring method is used. As of MLS 12.1, supplies the 'fragment' key with a value of 'document' (default), 'properties', 'locks', or 'any' to specify which document fragment type to search. Note: on servers earlier than MLS 12.1, the 'fragment' option is silently ignored and all fragment types are searched.
* @returns { planBuilder.AccessPlan }
*/
fromSearch(...args) {
Expand Down
141 changes: 84 additions & 57 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"mocha": "^11.7.5",
"mocha-junit-reporter": "2.2.1",
"moment": "2.30.1",
"sanitize-html": "2.17.0",
"sanitize-html": "^2.17.4",
"should": "13.2.3",
"stream-to-array": "2.3.0",
"typescript": "5.7.2"
Expand All @@ -86,18 +86,19 @@
"ansi-styles": "4.3.0",
"ansi-regex": "5.0.1",
"braces": "3.0.3",
"brace-expansion": "2.0.2",
"brace-expansion": "5.0.6",
"chalk": "4.1.2",
"color-convert": "3.1.0",
"color-name": "2.0.0",
"cross-spawn": "7.0.6",
"debug": "4.3.6",
"diff": "9.0.0",
"glob": "12.0.0",
"glob-parent": "6.0.2",
"markdown-it": "14.1.1",
"minimatch": "10.2.4",
"semver": "7.5.3",
"serialize-javascript": "7.0.4",
"serialize-javascript": "7.0.5",
"strip-ansi": "6.0.0",
"supports-color": "7.2.0",
"tar-fs": "2.1.4",
Expand Down
Loading
Loading