ringles commented on a change in pull request #6489: URL: https://github.com/apache/geode/pull/6489#discussion_r639701106
########## File path: geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZAddExecutor.java ########## @@ -0,0 +1,115 @@ +/* + * 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.executor.sortedset; + + +import static org.apache.geode.redis.internal.RedisConstants.ERROR_INVALID_ZADD_OPTION_NX_XX; +import static org.apache.geode.redis.internal.RedisConstants.ERROR_NOT_A_VALID_FLOAT; +import static org.apache.geode.redis.internal.RedisConstants.ERROR_SYNTAX; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.apache.geode.redis.internal.executor.AbstractExecutor; +import org.apache.geode.redis.internal.executor.RedisResponse; +import org.apache.geode.redis.internal.netty.Coder; +import org.apache.geode.redis.internal.netty.Command; +import org.apache.geode.redis.internal.netty.ExecutionHandlerContext; + +public class ZAddExecutor extends AbstractExecutor { + private final ZAddExecutorState zAddExecutorState = new ZAddExecutorState(); + + @Override + public RedisResponse executeCommand(Command command, ExecutionHandlerContext context) { + zAddExecutorState.initialize(); + RedisSortedSetCommands redisSortedSetCommands = context.getRedisSortedSetCommands(); + List<byte[]> commandElements = command.getProcessedCommand(); + Iterator<byte[]> commandIterator = commandElements.iterator(); + + skipCommandAndKey(commandIterator); + + int optionsFoundCount = findAndValidateZAddOptions(command, commandIterator, zAddExecutorState); + if (zAddExecutorState.exceptionMessage != null) { + return RedisResponse.error(zAddExecutorState.exceptionMessage); + } + + return RedisResponse + .integer(redisSortedSetCommands.zadd(command.getKey(), + new ArrayList<>(commandElements.subList(optionsFoundCount + 2, commandElements.size())), + makeOptions(zAddExecutorState))); + } + + private void skipCommandAndKey(Iterator<byte[]> commandIterator) { + commandIterator.next(); + commandIterator.next(); + } + + private int findAndValidateZAddOptions(Command command, Iterator<byte[]> commandIterator, + ZAddExecutorState executorState) { + boolean scoreFound = false; + int optionsFoundCount = 0; + + while (commandIterator.hasNext() && !scoreFound) { + String subCommandString = Coder.bytesToString(commandIterator.next()).toLowerCase(); + switch (subCommandString) { + case "nx": + executorState.nxFound = true; + optionsFoundCount++; + break; + case "xx": + executorState.xxFound = true; + optionsFoundCount++; + break; + default: + try { + Double.valueOf(subCommandString); + } catch (NumberFormatException nfe) { + executorState.exceptionMessage = ERROR_NOT_A_VALID_FLOAT; + } + scoreFound = true; + } + } + if ((command.getProcessedCommand().size() - optionsFoundCount - 2) % 2 != 0) { + executorState.exceptionMessage = ERROR_SYNTAX; + } else if (executorState.nxFound && executorState.xxFound) { + executorState.exceptionMessage = ERROR_INVALID_ZADD_OPTION_NX_XX; + } + return optionsFoundCount; + } + + private ZAddOptions makeOptions(ZAddExecutorState executorState) { + ZAddOptions.Exists existsOption = ZAddOptions.Exists.NONE; + + if (executorState.nxFound) { + existsOption = ZAddOptions.Exists.NX; + } + if (executorState.xxFound) { + existsOption = ZAddOptions.Exists.XX; + } + return new ZAddOptions(existsOption); + } + + static class ZAddExecutorState { + public boolean nxFound = false, xxFound = false; Review comment: Pushed up a fix. Since the ZAddExecutorState is always initialized on the first line of the Executor, I also ditched the initialization. I'm pretty sure the compiler would optimize that, but what the heck. -- 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
