Skip to content

Commit 6da0ef5

Browse files
authored
Merge branch 'datastax:master' into master
2 parents f492a8c + 9329d84 commit 6da0ef5

File tree

4 files changed

+6
-33
lines changed

4 files changed

+6
-33
lines changed

docs.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ title: DataStax Node.js Driver
22
summary: DataStax Node.js Driver for Apache Cassandra
33
theme: datastax
44
swiftype_drivers: nodejsdrivers
5+
homepage: https://docs.datastax.com/en/developer/nodejs-driver
56
sections:
67
- title: Features
78
prefix: /features
@@ -37,8 +38,10 @@ links:
3738
- title: Npm
3839
href: https://www.npmjs.org/package/cassandra-driver
3940
versions:
40-
- name: '4.7'
41+
- name: '4.8'
4142
ref: 'master'
43+
- name: '4.7'
44+
ref: 'v4.7.2'
4245
- name: '4.6'
4346
ref: 'v4.6.4'
4447
- name: '4.5'

lib/encoder.js

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -128,26 +128,10 @@ const zeroLengthTypesSupported = new Set([
128128
dataTypes.blob
129129
]);
130130

131-
/**
132-
* @typedef {(singleTypeNames[keyof singleTypeNames] | types.dataTypes.duration | types.dataTypes.text)} SingleTypeCodes
133-
* @typedef {('point' | 'polygon' | 'duration' | 'lineString' | 'dateRange')} CustomSimpleTypeCodes
134-
* @typedef {(customTypeNames[CustomSimpleTypeCodes]) | CustomSimpleTypeCodes | 'empty'} CustomSimpleTypeNames
135-
* @typedef {{code : SingleTypeCodes, info?: null, options? : {frozen?:boolean, reversed?:boolean} }} SingleColumnInfo
136-
* @typedef {{code : (types.dataTypes.custom), info : CustomSimpleTypeNames, options? : {frozen?:boolean, reversed?:boolean}}} CustomSimpleColumnInfo
137-
* @typedef {{code : (types.dataTypes.map), info : [ColumnInfo, ColumnInfo], options?: {frozen?: Boolean, reversed?: Boolean}}} MapColumnInfo
138-
* @typedef {{code : (types.dataTypes.tuple), info : Array<ColumnInfo>, options?: {frozen?: Boolean, reversed?: Boolean}}} TupleColumnInfo
139-
* @typedef {{code : (types.dataTypes.tuple | types.dataTypes.list)}} TupleListColumnInfoWithoutSubtype TODO: guessDataType can return null on tuple/list info, why?
140-
* @typedef {{code : (types.dataTypes.list | types.dataTypes.set), info : ColumnInfo, options?: {frozen?: Boolean, reversed?: Boolean}}} ListSetColumnInfo
141-
* @typedef {{code : (types.dataTypes.udt), info : {name : string, fields : Array<{name : string, type : ColumnInfo}>}, options? : {frozen?: Boolean, reversed?: Boolean}}} UdtColumnInfo
142-
* @typedef {{code : (types.dataTypes.custom), customTypeName : ('vector'), info : [ColumnInfo, number], options? : {frozen?:boolean, reversed?:boolean}}} VectorColumnInfo
143-
* @typedef {{code : (types.dataTypes.custom), info : string, options? : {frozen?:boolean, reversed?:boolean}}} OtherCustomColumnInfo
144-
* @typedef {SingleColumnInfo | CustomSimpleColumnInfo | MapColumnInfo | TupleColumnInfo | ListSetColumnInfo | VectorColumnInfo | OtherCustomColumnInfo | UdtColumnInfo | TupleListColumnInfoWithoutSubtype} ColumnInfo If this is a simple type, info is null; if this is a collection type with a simple subtype, info is a string, if this is a nested collection type, info is a ColumnInfo object
145-
*/
146131

147132
/**
148133
* Serializes and deserializes to and from a CQL type and a Javascript Type.
149134
* @param {Number} protocolVersion
150-
* @param {import('./client.js').ClientOptions} options
151135
* @constructor
152136
*/
153137
function Encoder(protocolVersion, options) {
@@ -212,7 +196,6 @@ function defineInstanceMembers() {
212196
*
213197
* @param {Buffer} bytes
214198
* @param {OtherCustomColumnInfo | VectorColumnInfo} columnInfo
215-
* @returns
216199
*/
217200
this.decodeCustom = function (bytes, columnInfo) {
218201

@@ -750,7 +733,6 @@ function defineInstanceMembers() {
750733
*
751734
* @param {any} value
752735
* @param {OtherCustomColumnInfo | VectorColumnInfo} columnInfo
753-
* @returns
754736
*/
755737
this.encodeCustom = function (value, columnInfo) {
756738

@@ -908,7 +890,6 @@ function defineInstanceMembers() {
908890
*
909891
* @param {any} value
910892
* @param {UdtColumnInfo} columnInfo
911-
* @returns
912893
*/
913894
this.encodeUdt = function (value, columnInfo) {
914895
const udtInfo = columnInfo.info;
@@ -939,7 +920,6 @@ function defineInstanceMembers() {
939920
*
940921
* @param {any} value
941922
* @param {TupleColumnInfo} columnInfo
942-
* @returns
943923
*/
944924
this.encodeTuple = function (value, columnInfo) {
945925
const tupleInfo = columnInfo.info;
@@ -1105,7 +1085,6 @@ function defineInstanceMembers() {
11051085
/**
11061086
* If not provided, it uses the array of buffers or the parameters and hints to build the routingKey
11071087
* @param {Array} params
1108-
* @param {import('..').ExecutionOptions} execOptions
11091088
* @param [keys] parameter keys and positions in the params array
11101089
* @throws TypeError
11111090
* @internal

lib/types/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ const dataTypes = {
136136
/**
137137
* Returns the typeInfo of a given type name
138138
* @param {string} name
139-
* @returns {import('../encoder').ColumnInfo}
140139
*/
141140
getByName: function(name) {
142141
name = name.toLowerCase();
@@ -416,7 +415,6 @@ function uuid(options, buffer, offset) {
416415
* @internal
417416
* @ignore
418417
* @throws {ArgumentError}
419-
* @param {import('../encoder').ColumnInfo} item
420418
*/
421419
function getDataTypeNameByCode(item) {
422420
if (!item || typeof item.code !== 'number') {

lib/types/vector.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
*/
1616
"use strict";
1717
/** @module types */
18-
/**
19-
* Creates a new instance of Cql Vector, also compatible with Float32Array.
20-
* @class
21-
*/
18+
2219
const util = require('node:util');
2320
class Vector {
2421
/**
@@ -98,16 +95,12 @@ class Vector {
9895
return Vector;
9996
}
10097

101-
/**
102-
*
103-
* @param {(value: any, index: number, array: any[]) => void} callback
104-
*/
10598
forEach(callback) {
10699
return this.elements.forEach(callback);
107100
}
108101

109102
/**
110-
* @returns {string | undefined} get the subtype string, e.g., "float", but it's optional so it can return null
103+
* @returns {string | undefined} get the subtype string, e.g., "float", but it's optional so it can return undefined
111104
*/
112105
getSubtype(){
113106
return this.subtype;

0 commit comments

Comments
 (0)