Skip to content

Commit f8a300f

Browse files
committed
revert changes needed for resp3 erroring with multi, as now handled by attachCommand
1 parent 0f2e8d5 commit f8a300f

File tree

5 files changed

+6
-15
lines changed

5 files changed

+6
-15
lines changed

packages/client/lib/client/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -870,8 +870,7 @@ export default class RedisClient<
870870
type Multi = new (...args: ConstructorParameters<typeof RedisClientMultiCommand>) => RedisClientMultiCommandType<[], M, F, S, RESP, TYPE_MAPPING>;
871871
return new ((this as any).Multi as Multi)(
872872
this._executeMulti.bind(this),
873-
this._executePipeline.bind(this),
874-
this._self.#options
873+
this._executePipeline.bind(this)
875874
);
876875
}
877876

packages/client/lib/client/multi-command.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import COMMANDS from '../commands';
22
import RedisMultiCommand, { MULTI_REPLY, MultiReply, MultiReplyType, RedisMultiQueuedCommand } from '../multi-command';
33
import { ReplyWithTypeMapping, CommandReply, Command, CommandArguments, CommanderConfig, RedisFunctions, RedisModules, RedisScripts, RespVersions, TransformReply, RedisScript, RedisFunction, TypeMapping } from '../RESP/types';
44
import { attachConfig, functionArgumentsPrefix, getTransformReply } from '../commander';
5-
import { RedisClientOptions } from '.';
65

76
type CommandSignature<
87
REPLIES extends Array<unknown>,
@@ -154,12 +153,10 @@ export default class RedisClientMultiCommand<REPLIES = []> {
154153
readonly #executeMulti: ExecuteMulti;
155154
readonly #executePipeline: ExecuteMulti;
156155
#selectedDB?: number;
157-
readonly #options?: RedisClientOptions
158156

159-
constructor(executeMulti: ExecuteMulti, executePipeline: ExecuteMulti, options?: RedisClientOptions) {
157+
constructor(executeMulti: ExecuteMulti, executePipeline: ExecuteMulti) {
160158
this.#executeMulti = executeMulti;
161159
this.#executePipeline = executePipeline;
162-
this.#options = options;
163160
}
164161

165162
SELECT(db: number, transformReply?: TransformReply): this {

packages/client/lib/client/pool.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,7 @@ export class RedisClientPool<
426426
type Multi = new (...args: ConstructorParameters<typeof RedisClientMultiCommand>) => RedisClientMultiCommandType<[], M, F, S, RESP, TYPE_MAPPING>;
427427
return new ((this as any).Multi as Multi)(
428428
(commands, selectedDB) => this.execute(client => client._executeMulti(commands, selectedDB)),
429-
commands => this.execute(client => client._executePipeline(commands)),
430-
this._self.#options
429+
commands => this.execute(client => client._executePipeline(commands))
431430
);
432431
}
433432

packages/client/lib/cluster/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,8 +521,7 @@ export default class RedisCluster<
521521
const client = await this._self.#slots.getClient(firstKey, isReadonly);
522522
return client._executePipeline(commands);
523523
},
524-
routing,
525-
this._self.#options
524+
routing
526525
);
527526
}
528527

packages/client/lib/cluster/multi-command.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import COMMANDS from '../commands';
22
import RedisMultiCommand, { MULTI_REPLY, MultiReply, MultiReplyType, RedisMultiQueuedCommand } from '../multi-command';
33
import { ReplyWithTypeMapping, CommandReply, Command, CommandArguments, CommanderConfig, RedisFunctions, RedisModules, RedisScripts, RespVersions, TransformReply, RedisScript, RedisFunction, TypeMapping, RedisArgument } from '../RESP/types';
44
import { attachConfig, functionArgumentsPrefix, getTransformReply } from '../commander';
5-
import RedisCluster, { RedisClusterOptions } from '.';
5+
import RedisCluster from '.';
66

77
type CommandSignature<
88
REPLIES extends Array<unknown>,
@@ -191,18 +191,15 @@ export default class RedisClusterMultiCommand<REPLIES = []> {
191191
readonly #executePipeline: ClusterMultiExecute;
192192
#firstKey: RedisArgument | undefined;
193193
#isReadonly: boolean | undefined = true;
194-
readonly #options?: RedisClusterOptions;
195194

196195
constructor(
197196
executeMulti: ClusterMultiExecute,
198197
executePipeline: ClusterMultiExecute,
199-
routing: RedisArgument | undefined,
200-
options?: RedisClusterOptions
198+
routing: RedisArgument | undefined
201199
) {
202200
this.#executeMulti = executeMulti;
203201
this.#executePipeline = executePipeline;
204202
this.#firstKey = routing;
205-
this.#options = options;
206203
}
207204

208205
#setState(

0 commit comments

Comments
 (0)