Skip to content

Commit

Permalink
fixup! 37592f0
Browse files Browse the repository at this point in the history
  • Loading branch information
avifenesh committed Mar 6, 2024
1 parent ac46c3d commit bed8709
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 30 deletions.
44 changes: 22 additions & 22 deletions benchmarks/node/node_benchmark.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ async function redisBenchmark(
clients: IAsyncClient[],
totalCommands: number,
data: string,
actionLatencies: Record<ChosenAction, number[]>,
actionLatencies: Record<ChosenAction, number[]>
) {
while (startedTasksCounter < totalCommands) {
startedTasksCounter += 1;
Expand Down Expand Up @@ -97,14 +97,14 @@ async function createBenchTasks(
totalCommands: number,
numOfConcurrentTasks: number,
data: string,
actionLatencies: Record<ChosenAction, number[]>,
actionLatencies: Record<ChosenAction, number[]>
) {
startedTasksCounter = 0;
const tic = process.hrtime();

for (let i = 0; i < numOfConcurrentTasks; i++) {
runningTasks.push(
redisBenchmark(clients, totalCommands, data, actionLatencies),
redisBenchmark(clients, totalCommands, data, actionLatencies)
);
}

Expand All @@ -115,7 +115,7 @@ async function createBenchTasks(

function latencyResults(
prefix: string,
latencies: number[],
latencies: number[]
): Record<string, number> {
const result: Record<string, number> = {};
result[prefix + "_p50_latency"] = calculateLatency(latencies, 50);
Expand All @@ -136,13 +136,13 @@ async function runClients(
dataSize: number,
data: string,
clientDisposal: (client: IAsyncClient) => void,
isCluster: boolean,
isCluster: boolean
) {
const now = new Date();
console.log(
`Starting ${clientName} data size: ${dataSize} concurrency: ${numOfConcurrentTasks} client count: ${
clients.length
} isCluster: ${isCluster} ${now.toLocaleTimeString()}`,
} isCluster: ${isCluster} ${now.toLocaleTimeString()}`
);
const actionLatencies = {
[ChosenAction.SET]: [],
Expand All @@ -155,21 +155,21 @@ async function runClients(
totalCommands,
numOfConcurrentTasks,
data,
actionLatencies,
actionLatencies
);
const tps = Math.round(startedTasksCounter / time);

const getNonExistingLatencies =
actionLatencies[ChosenAction.GET_NON_EXISTING];
const getNonExistingLatencyResults = latencyResults(
"get_non_existing",
getNonExistingLatencies,
getNonExistingLatencies
);

const getExistingLatencies = actionLatencies[ChosenAction.GET_EXISTING];
const getExistingLatencyResults = latencyResults(
"get_existing",
getExistingLatencies,
getExistingLatencies
);

const setLatencies = actionLatencies[ChosenAction.SET];
Expand All @@ -193,10 +193,10 @@ async function runClients(

function createClients(
clientCount: number,
createAction: () => Promise<IAsyncClient>,
createAction: () => Promise<IAsyncClient>
): Promise<IAsyncClient[]> {
const creationActions = Array.from({ length: clientCount }, () =>
createAction(),
createAction()
);
return Promise.all(creationActions);
}
Expand All @@ -210,7 +210,7 @@ async function main(
clientCount: number,
useTLS: boolean,
clusterModeEnabled: boolean,
port: number,
port: number
) {
const data = generateValue(dataSize);

Expand All @@ -222,7 +222,7 @@ async function main(
clientClass.createClient({
addresses: [{ host, port }],
useTLS,
}),
})
);
await runClients(
clients,
Expand All @@ -234,7 +234,7 @@ async function main(
(client) => {
(client as RedisClient).close();
},
clusterModeEnabled,
clusterModeEnabled
);
await new Promise((resolve) => setTimeout(resolve, 100));
}
Expand Down Expand Up @@ -268,7 +268,7 @@ async function main(
(client) => {
(client as RedisClientType).disconnect();
},
clusterModeEnabled,
clusterModeEnabled
);
await new Promise((resolve) => setTimeout(resolve, 100));

Expand Down Expand Up @@ -297,7 +297,7 @@ async function main(
(client) => {
(client as RedisClientType).disconnect();
},
clusterModeEnabled,
clusterModeEnabled
);
}
}
Expand All @@ -313,20 +313,20 @@ Promise.resolve() // just added to clean the indentation of the rest of the call
const clientCount: string[] = receivedOptions.clientCount;
const lambda: (
numOfClients: string,
concurrentTasks: string,
concurrentTasks: string
) => [number, number, number] = (
numOfClients: string,
concurrentTasks: string,
concurrentTasks: string
) => [parseInt(concurrentTasks), dataSize, parseInt(numOfClients)];
const product: [number, number, number][] = concurrentTasks
.flatMap((concurrentTasks: string) =>
clientCount.map((clientCount) =>
lambda(clientCount, concurrentTasks),
),
lambda(clientCount, concurrentTasks)
)
)
.filter(
([concurrentTasks, , clientCount]) =>
clientCount <= concurrentTasks,
clientCount <= concurrentTasks
);

for (const [concurrentTasks, dataSize, clientCount] of product) {
Expand All @@ -342,7 +342,7 @@ Promise.resolve() // just added to clean the indentation of the rest of the call
clientCount,
receivedOptions.tls,
receivedOptions.clusterModeEnabled,
receivedOptions.port,
receivedOptions.port
);
}

Expand Down
6 changes: 3 additions & 3 deletions node/src/BaseClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -635,8 +635,8 @@ export class BaseClient {

/** Returns all values in the hash stored at key.
* See https://redis.io/commands/hvals/ for more details.
*
* @param key - The key of the hash.
*
* @param key - The key of the hash.
* @returns a list of values in the hash, or an empty list when the key does not exist.
*/
public hvals(key: string): Promise<string[]> {
Expand Down Expand Up @@ -1152,7 +1152,7 @@ export class BaseClient {

/** Echoes the provided `message` back.
* See https://redis.io/commands/echo for more details.
*
*
* @param message - The message to be echoed back.
* @returns The provided `message`.
*/
Expand Down
10 changes: 5 additions & 5 deletions node/src/Transaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -429,9 +429,9 @@ export class BaseTransaction<T extends BaseTransaction<T>> {

/** Returns all values in the hash stored at key.
* See https://redis.io/commands/hvals/ for more details.
*
* @param key - The key of the hash.
*
*
* @param key - The key of the hash.
*
* Command Response - a list of values in the hash, or an empty list when the key does not exist.
*/
public hvals(key: string): T {
Expand Down Expand Up @@ -915,9 +915,9 @@ export class BaseTransaction<T extends BaseTransaction<T>> {

/** Echoes the provided `message` back.
* See https://redis.io/commands/echo for more details.
*
*
* @param message - The message to be echoed back.
*
*
* Command Response - The provided `message`.
*/
public echo(message: string): T {
Expand Down

0 comments on commit bed8709

Please sign in to comment.