Skip to content

Commit 44a8533

Browse files
committed
MLE-15687 : Run auto-generation again to include server side code changes for 12-EA
1 parent 0a5af86 commit 44a8533

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

lib/plan-builder-generated.js

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5304,7 +5304,7 @@ class VecExpr {
53045304
constructor() {
53055305
}
53065306
/**
5307-
* Provides a client interface to a server function.
5307+
* Returns the sum of two vectors. The vectors must be of the same dimension. Provides a client interface to a server function. See {@link http://docs.marklogic.com/vec.add|vec.add}
53085308
* @method planBuilder.vec#add
53095309
* @since 3.5.0
53105310
* @param { VecVector } [vector1] - The first addend vector.
@@ -5321,7 +5321,7 @@ add(...args) {
53215321

53225322
}
53235323
/**
5324-
* Constructs a vector result by decoding the base64 binary input. Provides a client interface to a server function. See {@link http://docs.marklogic.com/vec.base64Decode|vec.base64Decode}
5324+
* Returns a vector value by decoding the base64 encoded string input. Provides a client interface to a server function. See {@link http://docs.marklogic.com/vec.base64Decode|vec.base64Decode}
53255325
* @method planBuilder.vec#base64Decode
53265326
* @since 3.5.0
53275327
* @param { XsString } [base64Vector] - The base64 binary encoded string vector to decode.
@@ -5412,7 +5412,7 @@ euclideanDistance(...args) {
54125412
* @method planBuilder.vec#get
54135413
* @since 3.5.0
54145414
* @param { VecVector } [vector1] - The vector to grab the k-th element of.
5415-
* @param { XsUnsignedInt } [k] - The zero-based index of vector1 to return.
5415+
* @param { XsUnsignedInt } [k] - The zero-based index of vector1 to return. If k is greater than the number of elements in the vector, throw VEC-OUTOFBOUNDS.
54165416
* @returns { XsFloat }
54175417
*/
54185418
get(...args) {
@@ -5449,7 +5449,7 @@ normalize(...args) {
54495449
return new types.VecVector('vec', 'normalize', checkedArgs);
54505450
}
54515451
/**
5452-
* Provides a client interface to a server function.
5452+
* Returns the difference of two vectors. The vectors must be of the same dimension. Provides a client interface to a server function. See {@link http://docs.marklogic.com/vec.subtract|vec.subtract}
54535453
* @method planBuilder.vec#subtract
54545454
* @since 3.5.0
54555455
* @param { VecVector } [vector1] - The minuend vector.
@@ -5466,28 +5466,28 @@ subtract(...args) {
54665466

54675467
}
54685468
/**
5469-
* Returns a subvector of the input vector, starting at the specified index and with the specified length. Provides a client interface to a server function. See {@link http://docs.marklogic.com/vec.subvector|vec.subvector}
5469+
* Returns a subvector of the input vector, starting at the specified index, with the specified length (optional). Provides a client interface to a server function. See {@link http://docs.marklogic.com/vec.subvector|vec.subvector}
54705470
* @method planBuilder.vec#subvector
54715471
* @since 3.5.0
54725472
* @param { VecVector } [vector] - The input vector.
5473-
* @param { XsUnsignedInt } [start] - The starting index of the subvector (inclusive).
5474-
* @param { XsUnsignedInt } [length] - The length of the subvector.
5473+
* @param { XsUnsignedInt } [start] - The zero-based index of the input vector from which to start (inclusive).
5474+
* @param { XsUnsignedInt } [length] - The length of the subvector. If not provided, returns a subvector beginning from index at start to the end of the input vector. If length is greater than the number of elements left in the input vector, throw VEC-OUTOFBOUNDS.
54755475
* @returns { VecVector }
54765476
*/
54775477
subvector(...args) {
54785478
const namer = bldrbase.getNamer(args, 'vector');
54795479
const paramdefs = [['vector', [types.VecVector, PlanColumn, PlanParam], true, false], ['start', [types.XsUnsignedInt, PlanColumn, PlanParam], true, false], ['length', [types.XsUnsignedInt, PlanColumn, PlanParam], false, false]];
54805480
const checkedArgs = (namer !== null) ?
5481-
bldrbase.makeNamedArgs(namer, 'vec.subvector', 3, new Set(['vector', 'start', 'length']), paramdefs, args) :
5482-
bldrbase.makePositionalArgs('vec.subvector', 3, false, paramdefs, args);
5481+
bldrbase.makeNamedArgs(namer, 'vec.subvector', 2, new Set(['vector', 'start', 'length']), paramdefs, args) :
5482+
bldrbase.makePositionalArgs('vec.subvector', 2, false, paramdefs, args);
54835483
return new types.VecVector('vec', 'subvector', checkedArgs);
54845484

54855485
}
54865486
/**
54875487
* Returns a vector value. Provides a client interface to a server function. See {@link http://docs.marklogic.com/vec.vector|vec.vector}
54885488
* @method planBuilder.vec#vector
54895489
* @since 3.5.0
5490-
* @param { XsAnyAtomicType } [values] - The values to create the vector from. Can be a sequence or json:array of integer or floating-point numbers.
5490+
* @param { XsAnyAtomicType } [values] - The value(s) to create the vector from. Can be a sequence or json:array of integer or floating-point numbers. Also accepts a string that has the format of a JSON array of Numbers. Also accepts a string that was created by vec:base64-encode().
54915491
* @returns { VecVector }
54925492
*/
54935493
vector(...args) {
@@ -5496,12 +5496,12 @@ vector(...args) {
54965496
return new types.VecVector('vec', 'vector', checkedArgs);
54975497
}
54985498
/**
5499-
* A helper function that returns the hybrid score using a cts:score and a vector similarity function. You can tune the effect of the vector similarity on the score using the "similarity-weight" option. Provides a client interface to a server function. See {@link http://docs.marklogic.com/vec.vectorScore|vec.vectorScore}
5499+
* A helper function that returns a hybrid score using a cts score and a vector similarity calculation result. You can tune the effect of the vector similarity on the score using the similarityWeight option. The ideal value for similarityWeight depends on your application. Provides a client interface to a server function. See {@link http://docs.marklogic.com/vec.vectorScore|vec.vectorScore}
55005500
* @method planBuilder.vec#vectorScore
55015501
* @since 3.5.0
55025502
* @param { XsUnsignedInt } [score] - The cts:score of the matching document.
5503-
* @param { XsDouble } [similarity] - The similarity between the vector in the matching document and the query vector. The result of a call to ovec:cosine-similarity() or op.vec.cosineSimilarity(). In the case that the vectors are normalized, pass ovec:dot-product() or op.vec.dotProduct(). Note that vec:euclideanDistance() should not be used here.
5504-
* @param { XsDouble } [similarityWeight] - The weight of the vector similarity on the score. The default value is 1.0. Values less than or equal to zero have no effect.
5503+
* @param { XsDouble } [similarity] - The similarity between the vector in the matching document and the query vector. The result of a call to ovec:cosine-similarity(). In the case that the vectors are normalized, pass ovec:dot-product(). Note that vec:euclidean-distance() should not be used here.
5504+
* @param { XsDouble } [similarityWeight] - The weight of the vector similarity on the score. The default value is 0.1. If 0.0 is passed in, vector similarity has no effect. If passed a value less than 0.0 or greater than 1.0, throw VEC-VECTORSCORE.
55055505
* @returns { XsUnsignedLong }
55065506
*/
55075507
vectorScore(...args) {
@@ -8513,7 +8513,7 @@ viewCol(...args) {
85138513
* Specifies a name for adding a fragment id column to the row set identifying the source documents for the rows from a view, lexicons or triples. The only use for the fragment id is joining other rows from the same document, the document uri, or the document content. The fragment id is only useful during execution of the query and not after. Provides a client interface to a server function. See {@link http://docs.marklogic.com/op.fragmentIdCol|op.fragmentIdCol}
85148514
* @method planBuilder#fragmentIdCol
85158515
* @since 2.1.1
8516-
* @param { XsString } [column] -
8516+
* @param { XsString } [column] - The name of the fragment ID column.
85178517
* @returns { planBuilder.PlanSystemColumn }
85188518
*/
85198519
fragmentIdCol(...args) {
@@ -8695,6 +8695,7 @@ fromSQL(...args) {
86958695
* @since 2.1.1
86968696
* @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.
86978697
* @param { XsString } [qualifierName] - Specifies a name for qualifying the column names.
8698+
* @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.
86988699
* @returns { planBuilder.AccessPlan }
86998700
*/
87008701
fromSearchDocs(...args) {

test-basic/plan-builder-generated.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -952,8 +952,8 @@ describe('plan builder', function() {
952952
});
953953
it('geo.geohashNeighbors#1', function(done) {
954954
testPlan([p.xs.string("s01mtw")], p.geo.geohashNeighbors(p.col("1")))
955-
.then(function(response) {
956-
should(getResult(response).value).eql({"NE":"s01mtz", "S":"s01mtt", "E":"s01mty", "W":"s01mtq", "N":"s01mtx", "SW":"s01mtm", "SE":"s01mtv", "NW":"s01mtr"});
955+
.then(function(response) {
956+
should(getResult(response).value).eql({"NE":"s01mtz", "S":"s01mtt", "E":"s01mty", "W":"s01mtq", "SW":"s01mtm", "N":"s01mtx", "SE":"s01mtv", "NW":"s01mtr"});
957957
done();
958958
}).catch(done);
959959
});
@@ -972,9 +972,8 @@ describe('plan builder', function() {
972972
.then(function(response) {
973973
should(getResult(response).value).eql(["s01mtw0", "s01mtw1", "s01mtw2", "s01mtw3", "s01mtw4", "s01mtw5", "s01mtw6", "s01mtw7", "s01mtw8", "s01mtw9", "s01mtwb", "s01mtwc", "s01mtwd", "s01mtwe", "s01mtwf", "s01mtwg", "s01mtwh", "s01mtwj", "s01mtwk", "s01mtwm", "s01mtwn", "s01mtwp", "s01mtwq", "s01mtwr", "s01mtws", "s01mtwt", "s01mtwu", "s01mtwv", "s01mtww", "s01mtwx", "s01mtwy", "s01mtwz"]);
974974
done();
975-
}).catch(done)
976-
.catch(error => done(error));
977-
});
975+
}).catch(error => done(error));
976+
});
978977
it('geo.geohashSubhashes#2', function(done) {
979978
testPlan([p.xs.string("s01mtw"), p.xs.string("S")], p.geo.geohashSubhashes(p.col("1"), p.col("2")))
980979
.then(function(response) {

0 commit comments

Comments
 (0)