Skip to content

Commit

Permalink
Upgrade to Lettuce 6.5.1.RELEASE.
Browse files Browse the repository at this point in the history
Closes #3070
  • Loading branch information
mp911de committed Dec 12, 2024
1 parent 8579857 commit c83f5ac
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<beanutils>1.9.4</beanutils>
<xstream>1.4.21</xstream>
<pool>2.11.1</pool>
<lettuce>6.4.1.RELEASE</lettuce>
<lettuce>6.5.1.RELEASE</lettuce>
<jedis>5.2.0</jedis>
<multithreadedtc>1.01</multithreadedtc>
<netty>4.1.115.Final</netty>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,7 @@ private void validateCommandIfRunningInTransactionMode(ProtocolKeyword cmd, byte

private void validateCommand(ProtocolKeyword command, @Nullable byte[]... args) {

RedisCommand redisCommand = RedisCommand.failsafeCommandLookup(command.name());
RedisCommand redisCommand = RedisCommand.failsafeCommandLookup(command.toString());

if (!RedisCommand.UNKNOWN.equals(redisCommand) && redisCommand.requiresArguments()) {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public KeyValues getLowCardinalityKeyValues(LettuceObservationContext context) {

Endpoint ep = context.getRequiredEndpoint();
KeyValues keyValues = KeyValues.of(LowCardinalityCommandKeyNames.DATABASE_SYSTEM.withValue("redis"), //
LowCardinalityCommandKeyNames.REDIS_COMMAND.withValue(context.getRequiredCommand().getType().name()));
LowCardinalityCommandKeyNames.REDIS_COMMAND.withValue(context.getRequiredCommand().getType().toString()));

if (ep instanceof SocketAddressEndpoint endpoint) {

Expand Down Expand Up @@ -70,7 +70,7 @@ public KeyValues getHighCardinalityKeyValues(LettuceObservationContext context)

if (command.getArgs() != null) {
return KeyValues.of(HighCardinalityCommandKeyNames.STATEMENT
.withValue(command.getType().name() + " " + command.getArgs().toCommandString()));
.withValue(command.getType().toString() + " " + command.getArgs().toCommandString()));
}
}

Expand All @@ -79,6 +79,6 @@ public KeyValues getHighCardinalityKeyValues(LettuceObservationContext context)

@Override
public String getContextualName(LettuceObservationContext context) {
return context.getRequiredCommand().getType().name().toLowerCase(Locale.ROOT);
return context.getRequiredCommand().getType().toString().toLowerCase(Locale.ROOT);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,6 @@ void maxRedirectsShouldBeSetOnClusterClientOptions() {

assertThat(options.getMaxRedirects()).isEqualTo(42);
assertThat(options.isValidateClusterNodeMembership()).isFalse();
assertThat(options.getTimeoutOptions().isApplyConnectionTimeout()).isFalse();
}

@Test // DATAREDIS-1142
Expand Down

0 comments on commit c83f5ac

Please sign in to comment.