Skip to content

Commit

Permalink
Rename missed places to valkey
Browse files Browse the repository at this point in the history
  • Loading branch information
shohamazon committed Jul 8, 2024
1 parent 6ff4952 commit 260de84
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion glide-core/src/cluster_scan_container.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright GLIDE-for-Redis Project Contributors - SPDX Identifier: Apache-2.0
* Copyright Valkey GLIDE Project Contributors - SPDX Identifier: Apache-2.0
*/
use logger_core::log_debug;
use nanoid::nanoid;
Expand Down
4 changes: 2 additions & 2 deletions java/DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@ Refer to https://valkey.io/docs/topics/transactions/ for more details about how
[BaseTransaction.java](https://github.com/aws/glide-for-redis/blob/main/java/client/src/main/java/glide/api/models/BaseTransaction.java) and the methods within the command interfaces will both contain documentation on how the command operates.
In the command interface each command's javadoc should contain:
- Detail on when the Redis started supporting the command (if it wasn't initially implemented in 6.0.0 or before).
- A link to the Redis documentation.
- Detail on when Valkey started supporting the command (if it wasn't initially implemented in 6.0.0 or before).
- A link to the Valkey documentation.
- Information about the function parameters.
- Any glide-core implementation details, such as how glide-core manages default routing for the command. Reference this [link](https://github.com/aws/glide-for-redis/blob/4df0dd939b515dbf9da0a00bfca6d3ad2f27440b/java/client/src/main/java/glide/api/commands/SetBaseCommands.java#L119) for an example.
- The command's return type. In the [BaseTransaction.java](https://github.com/aws/glide-for-redis/blob/main/java/client/src/main/java/glide/api/models/BaseTransaction.java) file, include "Command Response" before specifying the return type.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public interface GenericClusterCommands {
* href="https://github.com/aws/glide-for-redis/wiki/General-Concepts#custom-command">Valkey
* GLIDE Wiki</a> for details on the restrictions and limitations of the custom command API.
* @param args Arguments for the custom command including the command name.
* @return Response from Redis containing an <code>Object</code>.
* @return The returning value depends on the executed command.
* @example
* <pre>{@code
* ClusterValue<Object> data = client.customCommand(new String[] {"ping"}).get();
Expand All @@ -51,7 +51,7 @@ public interface GenericClusterCommands {
* @param args Arguments for the custom command including the command name
* @param route Specifies the routing configuration for the command. The client will route the
* command to the nodes defined by <code>route</code>.
* @return The returning value depends on the executed command.
* @return The returning value depends on the executed command and route.
* @example
* <pre>{@code
* ClusterValue<Object> result = clusterClient.customCommand(new String[]{ "CONFIG", "GET", "maxmemory"}, ALL_NODES).get();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
@Builder
public class StreamPendingOptionsBinary {

/** Redis api string to designate IDLE or minimum idle time */
public static final GlideString IDLE_TIME_REDIS_API_GLIDE_STRING = gs("IDLE");
/** Valkey api string to designate IDLE or minimum idle time */
public static final GlideString IDLE_TIME_VALKEY_API_GLIDE_STRING = gs("IDLE");

/** Filters pending entries by their idle time - in Milliseconds */
private final Long minIdleTime; // Milliseconds
Expand All @@ -30,12 +30,12 @@ public class StreamPendingOptionsBinary {
/**
* Convert StreamPendingOptions arguments to a string array
*
* @return arguments converted to an array to be consumed by Redis
* @return arguments converted to an array to be consumed by Valkey
*/
public GlideString[] toArgs(StreamRange start, StreamRange end, long count) {
List<GlideString> optionArgs = new ArrayList<>();
if (minIdleTime != null) {
optionArgs.add(IDLE_TIME_REDIS_API_GLIDE_STRING);
optionArgs.add(IDLE_TIME_VALKEY_API_GLIDE_STRING);
optionArgs.add(gs(Long.toString(minIdleTime)));
}

Expand Down
2 changes: 1 addition & 1 deletion python/DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Before starting this step, make sure you've installed all software requirments.
```bash
pytest --asyncio-mode=auto
```
> **Note:** To run redis modules tests, add -k "test_redis_modules.py".
> **Note:** To run redis modules tests, add -k "test_server_modules.py".

- Install Python development requirements with:

Expand Down
2 changes: 1 addition & 1 deletion python/pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
markers =
smoke_test: mark a test as a build verification testing.
# TODO: Remove pubsub exclusion after the flakey tests are fixed
addopts = -k "not redis_modules and not pubsub"
addopts = -k "not server_modules and not pubsub"
2 changes: 1 addition & 1 deletion python/python/glide/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
InsertPosition,
UpdateOptions,
)
from glide.async_commands.redis_modules import json
from glide.async_commands.server_modules import json
from glide.async_commands.sorted_set import (
AggregationType,
GeoSearchByBox,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

import pytest
from glide.async_commands.core import ConditionalChange, InfoSection
from glide.async_commands.redis_modules import json
from glide.async_commands.redis_modules.json import JsonGetOptions
from glide.async_commands.server_modules import json
from glide.async_commands.server_modules.json import JsonGetOptions
from glide.config import ProtocolVersion
from glide.constants import OK
from glide.exceptions import RequestError
Expand Down

0 comments on commit 260de84

Please sign in to comment.