Node: Rename instances of Redis to Valkey #2260

jonathanl-bq · 2024-09-10T00:03:52Z

No description provided.

Signed-off-by: Jonathan Louie <[email protected]>

Yury-Fridlyand

Changelog?

node/npm/glide/package.json

node/src/BaseClient.ts

node/src/Commands.ts

node/src/GlideClient.ts

node/src/GlideClusterClient.ts

Signed-off-by: Jonathan Louie <[email protected]>

jonathanl-bq · 2024-09-10T00:19:46Z

Changelog?

You're too fast :P I was in the middle of adding it.

Signed-off-by: Jonathan Louie <[email protected]>

shohamazon · 2024-09-10T07:44:13Z

node/npm/glide/index.ts

@@ -153,7 +153,7 @@ function initialize() {
 RangeByScore,
 RangeByLex,
 ReadFrom,
- RedisCredentials,
+ ValkeyCredentials,


its server credentials in python and java

Suggested change

ValkeyCredentials,

ServerCredentials,

shohamazon · 2024-09-10T07:44:26Z

node/npm/glide/index.ts

@@ -265,7 +265,7 @@ function initialize() {
 RangeByScore,
 RangeByLex,
 ReadFrom,
- RedisCredentials,
+ ValkeyCredentials,


Suggested change

ValkeyCredentials,

ServerCredentials,

shohamazon · 2024-09-10T07:45:50Z

node/rust-client/src/lib.rs

@@ -160,7 +160,7 @@ pub fn init(level: Option<Level>, file_name: Option<&str>) -> Level {
 logger_level.into()
 }

-fn redis_value_to_js(val: Value, js_env: Env, string_decoder: bool) -> Result<JsUnknown> {
+fn valkey_value_to_js(val: Value, js_env: Env, string_decoder: bool) -> Result<JsUnknown> {


can leave it redis_value_to_js like the other wrappers, since it is a redis value (from redis-rs)

Suggested change

fn valkey_value_to_js(val: Value, js_env: Env, string_decoder: bool) -> Result<JsUnknown> {

fn redis_value_to_js(val: Value, js_env: Env, string_decoder: bool) -> Result<JsUnknown> {

shohamazon · 2024-09-10T07:46:02Z

node/rust-client/src/lib.rs

@@ -189,7 +189,7 @@ fn redis_value_to_js(val: Value, js_env: Env, string_decoder: bool) -> Result<Js
 for (index, item) in array.into_iter().enumerate() {
 js_array_view.set_element(
 index as u32,
- redis_value_to_js(item, js_env, string_decoder)?,
+ valkey_value_to_js(item, js_env, string_decoder)?,


Suggested change

valkey_value_to_js(item, js_env, string_decoder)?,

redis_value_to_js(item, js_env, string_decoder)?,

shohamazon · 2024-09-10T07:46:11Z

node/rust-client/src/lib.rs

@@ -198,7 +198,7 @@ fn redis_value_to_js(val: Value, js_env: Env, string_decoder: bool) -> Result<Js
 let mut obj = js_env.create_object()?;
 for (key, value) in map {
 let field_name = String::from_owned_redis_value(key).map_err(to_js_error)?;
- let value = redis_value_to_js(value, js_env, string_decoder)?;
+ let value = valkey_value_to_js(value, js_env, string_decoder)?;


Suggested change

let value = valkey_value_to_js(value, js_env, string_decoder)?;

let value = redis_value_to_js(value, js_env, string_decoder)?;

shohamazon · 2024-09-10T07:47:00Z

node/rust-client/src/lib.rs

@@ -280,7 +280,7 @@ pub fn value_from_split_pointer(
 .unwrap();
 let pointer = u64::from_le_bytes(bytes);
 let value = unsafe { Box::from_raw(pointer as *mut Value) };
- redis_value_to_js(*value, js_env, string_decoder)
+ valkey_value_to_js(*value, js_env, string_decoder)


Suggested change

valkey_value_to_js(*value, js_env, string_decoder)

redis_value_to_js(*value, js_env, string_decoder)

shohamazon · 2024-09-10T07:47:13Z

node/src/BaseClient.ts

@@ -411,7 +411,7 @@ class PointerResponse {
 }

 /** Represents the credentials for connecting to a server. */
-export type RedisCredentials = {
+export type ValkeyCredentials = {


Suggested change

export type ValkeyCredentials = {

export type ServerCredentials = {

shohamazon · 2024-09-10T07:47:23Z

node/src/BaseClient.ts

@@ -467,7 +467,7 @@ export type BaseClientConfiguration = {
 * Credentials for authentication process.
 * If none are set, the client will not authenticate itself with the server.
 */
- credentials?: RedisCredentials;
+ credentials?: ValkeyCredentials;


Suggested change

credentials?: ValkeyCredentials;

credentials?: ServerCredentials;

shohamazon · 2024-09-10T07:48:49Z

node/tests/GlideClient.test.ts

@@ -20,7 +20,7 @@ import {
 RequestError,
 Transaction,
 } from "..";
-import { RedisCluster } from "../../utils/TestUtils.js";
+import { ValkeyCluster } from "../../utils/TestUtils.js";


I am pretty sure we left it in python as redis cluster as well

I'm pretty sure I also have a task to change instances of Redis in Python to Valkey as well

Ohh okay, it doesn't really matter tbh, but it's nice ig

shohamazon · 2024-09-10T07:49:08Z

node/tests/GlideClient.test.ts

@@ -481,22 +481,22 @@ describe("GlideClient", () => {
 );

 const result = await client.lolwut();
- expect(result).toEqual(expect.stringContaining("Redis ver. "));
+ expect(result).toEqual(expect.stringContaining("Valkey ver. "));


this will fail

Correct. The output is still "Redis ver. ". Please double check.

acarbonetto · 2024-09-10T16:45:04Z

node/rust-client/src/lib.rs

@@ -160,7 +160,7 @@ pub fn init(level: Option<Level>, file_name: Option<&str>) -> Level {
 logger_level.into()
 }

-fn redis_value_to_js(val: Value, js_env: Env, string_decoder: bool) -> Result<JsUnknown> {
+fn valkey_value_to_js(val: Value, js_env: Env, string_decoder: bool) -> Result<JsUnknown> {


Suggested change

fn valkey_value_to_js(val: Value, js_env: Env, string_decoder: bool) -> Result<JsUnknown> {

fn resp_value_to_js(val: Value, js_env: Env, string_decoder: bool) -> Result<JsUnknown> {

Signed-off-by: Jonathan Louie <[email protected]>

Signed-off-by: jonathanl-bq <[email protected]>

Signed-off-by: Jonathan Louie <[email protected]>

Signed-off-by: jonathanl-bq <[email protected]>

Signed-off-by: Jonathan Louie <[email protected]>

acarbonetto

please double check that you have the latest main changes.

node/src/BaseClient.ts

acarbonetto · 2024-09-11T21:07:54Z

node/tests/SharedTests.ts

- }
+ // Negative cursor
+ if (cluster.checkIfServerVersionLessThan("7.9.0")) {
+ result = await client.hscan(key1, "-1");


do you want to replace initialCursor throughout?

Signed-off-by: Jonathan Louie <[email protected]>

Co-authored-by: Andrew Carbonetto <[email protected]> Signed-off-by: jonathanl-bq <[email protected]>

Signed-off-by: Jonathan Louie <[email protected]>

Rename instances of Redis to Valkey in Node client

5930764

Signed-off-by: Jonathan Louie <[email protected]>

jonathanl-bq added the node label Sep 10, 2024

Yury-Fridlyand reviewed Sep 10, 2024

View reviewed changes

Update CHANGELOG.md and run Prettier

7724c48

Signed-off-by: Jonathan Louie <[email protected]>

jonathanl-bq marked this pull request as ready for review September 10, 2024 00:19

jonathanl-bq requested a review from a team as a code owner September 10, 2024 00:19

jonathanl-bq added 2 commits September 9, 2024 17:34

Address PR comments and run Prettier

7cde3c8

Signed-off-by: Jonathan Louie <[email protected]>

Update TestUtils to use Valkey instead of Redis

2f48fed

Signed-off-by: Jonathan Louie <[email protected]>

shohamazon reviewed Sep 10, 2024

View reviewed changes

acarbonetto reviewed Sep 10, 2024

View reviewed changes

Address PR comments

366a771

Signed-off-by: Jonathan Louie <[email protected]>

Yury-Fridlyand approved these changes Sep 10, 2024

View reviewed changes

jonathanl-bq and others added 7 commits September 10, 2024 16:52

Merge branch 'main' into node/lotjonat_valkey_273_rename_redis_to_valkey

f5a7658

Signed-off-by: jonathanl-bq <[email protected]>

Run Prettier

8dcf2ec

Signed-off-by: Jonathan Louie <[email protected]>

Merge branch 'main' into node/lotjonat_valkey_273_rename_redis_to_valkey

b03b120

Signed-off-by: jonathanl-bq <[email protected]>

Fix test error caused by incorrect merge conflict resolution

266dd3f

Signed-off-by: Jonathan Louie <[email protected]>

Merge branch 'main' into node/lotjonat_valkey_273_rename_redis_to_valkey

62f8d3e

Signed-off-by: Jonathan Louie <[email protected]>

Revert changes to SharedTests due to merge conflict resolution

afa3d28

Signed-off-by: Jonathan Louie <[email protected]>

Run Prettier and fix GlideClusterClient tests

88e27e3

Signed-off-by: Jonathan Louie <[email protected]>

acarbonetto approved these changes Sep 11, 2024

View reviewed changes

jonathanl-bq and others added 3 commits September 11, 2024 14:27

Match SharedTests with main

090b0d4

Signed-off-by: Jonathan Louie <[email protected]>

Change docs to say serialization protocol instead of just protocol

3f9d632

Co-authored-by: Andrew Carbonetto <[email protected]> Signed-off-by: jonathanl-bq <[email protected]>

Run Prettier

be93e25

Signed-off-by: Jonathan Louie <[email protected]>

jonathanl-bq merged commit ace6c16 into valkey-io:main Sep 11, 2024
15 checks passed

acarbonetto mentioned this pull request Sep 14, 2024

OPS tasks for release #2116

Closed

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Node: Rename instances of Redis to Valkey #2260

Node: Rename instances of Redis to Valkey #2260

jonathanl-bq commented Sep 10, 2024

Yury-Fridlyand left a comment

jonathanl-bq commented Sep 10, 2024

shohamazon Sep 10, 2024

shohamazon Sep 10, 2024

shohamazon Sep 10, 2024

shohamazon Sep 10, 2024

shohamazon Sep 10, 2024

shohamazon Sep 10, 2024

shohamazon Sep 10, 2024

shohamazon Sep 10, 2024

shohamazon Sep 10, 2024

jonathanl-bq Sep 10, 2024

shohamazon Sep 10, 2024

shohamazon Sep 10, 2024

yipin-chen Sep 10, 2024

acarbonetto Sep 10, 2024

acarbonetto left a comment

acarbonetto Sep 11, 2024

	fn valkey_value_to_js(val: Value, js_env: Env, string_decoder: bool) -> Result<JsUnknown> {
	fn redis_value_to_js(val: Value, js_env: Env, string_decoder: bool) -> Result<JsUnknown> {

	valkey_value_to_js(item, js_env, string_decoder)?,
	redis_value_to_js(item, js_env, string_decoder)?,

	let value = valkey_value_to_js(value, js_env, string_decoder)?;
	let value = redis_value_to_js(value, js_env, string_decoder)?;

	valkey_value_to_js(*value, js_env, string_decoder)
	redis_value_to_js(*value, js_env, string_decoder)

	export type ValkeyCredentials = {
	export type ServerCredentials = {

	credentials?: ValkeyCredentials;
	credentials?: ServerCredentials;

	fn valkey_value_to_js(val: Value, js_env: Env, string_decoder: bool) -> Result<JsUnknown> {
	fn resp_value_to_js(val: Value, js_env: Env, string_decoder: bool) -> Result<JsUnknown> {

Node: Rename instances of Redis to Valkey #2260

Node: Rename instances of Redis to Valkey #2260

Conversation

jonathanl-bq commented Sep 10, 2024

Yury-Fridlyand left a comment

Choose a reason for hiding this comment

jonathanl-bq commented Sep 10, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

acarbonetto left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment