jdeppe-pivotal commented on a change in pull request #7408: URL: https://github.com/apache/geode/pull/7408#discussion_r827964327
########## File path: geode-for-redis/src/main/java/org/apache/geode/redis/internal/eventing/EventListener.java ########## @@ -0,0 +1,59 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.apache.geode.redis.internal.eventing; + +import java.util.List; +import java.util.concurrent.ScheduledExecutorService; + +import org.apache.geode.redis.internal.commands.RedisCommandType; +import org.apache.geode.redis.internal.data.RedisKey; + +/** + * Interface intended to be implemented in order to receive Redis events. Specifically this would be + * keyspace events or blocking commands. EventListeners are registered with the + * {@link EventDistributor}. + */ +public interface EventListener { + + /** + * Receive and process an event. This method should execute very quickly. The return value + * determines additional process steps for the given event. + * + * @param commandType the command triggering the event + * @param key the key triggering the event + * @return response determining subsequent processing steps + */ + EventResponse process(RedisCommandType commandType, RedisKey key); + + /** + * Return the list of keys this listener is interested in. + */ + List<RedisKey> keys(); + + /** + * Method to resubmit a command if appropriate. This is only relevant for listeners that process + * events for blocking commands. Listeners that handle keyspace event notification will not use + * this. + */ + void resubmitCommand(); + + /** + * Retrieve the timeout in nanoseconds for this listener + */ + // long getTimeout(); + + void scheduleTimeout(ScheduledExecutorService executor, EventDistributor distributor); Review comment: Fixed ########## File path: geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/list/BLPopExecutor.java ########## @@ -0,0 +1,58 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package org.apache.geode.redis.internal.commands.executor.list; + +import static org.apache.geode.redis.internal.RedisConstants.ERROR_NEGATIVE_TIMEOUT; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.geode.redis.internal.RedisConstants; +import org.apache.geode.redis.internal.commands.Command; +import org.apache.geode.redis.internal.commands.executor.CommandExecutor; +import org.apache.geode.redis.internal.commands.executor.RedisResponse; +import org.apache.geode.redis.internal.data.RedisKey; +import org.apache.geode.redis.internal.data.RedisList; +import org.apache.geode.redis.internal.netty.Coder; +import org.apache.geode.redis.internal.netty.ExecutionHandlerContext; + +public class BLPopExecutor implements CommandExecutor { + + @Override + public RedisResponse executeCommand(Command command, ExecutionHandlerContext context) { + List<byte[]> arguments = command.getCommandArguments(); + double timeoutSeconds; + try { + timeoutSeconds = Coder.bytesToDouble(arguments.get(arguments.size() - 1)); + } catch (NumberFormatException e) { + return RedisResponse.error(RedisConstants.ERROR_TIMEOUT_INVALID); + } + + if (timeoutSeconds < 0) { + return RedisResponse.error(ERROR_NEGATIVE_TIMEOUT); + } + + int keyCount = arguments.size() - 1; + List<RedisKey> keys = new ArrayList<>(keyCount); + for (int i = 0; i < keyCount; i++) { + keys.add(new RedisKey(arguments.get(i))); + } + + List<byte[]> popped = context.lockedExecute(keys.get(0), keys, + () -> RedisList.blpop(context, command, keys, timeoutSeconds)); Review comment: Excellent catch! ########## File path: geode-for-redis/src/main/java/org/apache/geode/redis/internal/eventing/BlockingCommandListener.java ########## @@ -0,0 +1,121 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.apache.geode.redis.internal.eventing; + +import java.util.Collections; +import java.util.List; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.apache.geode.annotations.VisibleForTesting; +import org.apache.geode.redis.internal.commands.Command; +import org.apache.geode.redis.internal.commands.RedisCommandType; +import org.apache.geode.redis.internal.commands.executor.RedisResponse; +import org.apache.geode.redis.internal.data.RedisKey; +import org.apache.geode.redis.internal.netty.Coder; +import org.apache.geode.redis.internal.netty.ExecutionHandlerContext; + +public class BlockingCommandListener implements EventListener { + + private final ExecutionHandlerContext context; + private final Command command; + private final List<RedisKey> keys; + private final double timeoutSeconds; + private final long timeSubmitted; + private AtomicBoolean active = new AtomicBoolean(true); Review comment: Fixed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@geode.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
