dschneider-pivotal commented on a change in pull request #6861:
URL: https://github.com/apache/geode/pull/6861#discussion_r715110221
##########
File path:
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java
##########
@@ -288,6 +288,49 @@ long zcount(SortedSetScoreRangeOptions rangeOptions) {
return Coder.doubleToBytes(score);
}
+ long zinterstore(RegionProvider regionProvider, RedisKey key,
List<ZKeyWeight> keyWeights,
+ ZAggregator aggregator) {
+ List<RedisSortedSet> sets = new ArrayList<>(keyWeights.size());
+ for (ZKeyWeight keyWeight : keyWeights) {
+ RedisSortedSet set =
+ regionProvider.getTypedRedisData(REDIS_SORTED_SET,
keyWeight.getKey(), false);
+
+ if (set == NULL_REDIS_SORTED_SET) {
+ continue;
+ }
+
+ double weight = keyWeight.getWeight();
+ RedisSortedSet weightedSet = new RedisSortedSet(Collections.emptyList(),
new double[] {});
+
+ for (AbstractOrderedSetEntry entry : set.members.values()) {
+ OrderedSetEntry existingValue = members.get(entry.getMember());
+ if (existingValue == null) {
+ double score;
+ // Redis math and Java math are different when handling infinity.
Specifically:
+ // Java: INFINITY * 0 = NaN
+ // Redis: INFINITY * 0 = 0
+ if (weight == 0) {
+ score = 0;
+ } else if (weight == 1) {
+ score = entry.getScore();
+ } else if (Double.isInfinite(weight) && entry.score == 0D) {
Review comment:
I think entry.score should be entry.getScore(). Should we make those
fields private on AbstractOrderedSetEntry to force the use of the gettor?
##########
File path:
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java
##########
@@ -288,6 +288,49 @@ long zcount(SortedSetScoreRangeOptions rangeOptions) {
return Coder.doubleToBytes(score);
}
+ long zinterstore(RegionProvider regionProvider, RedisKey key,
List<ZKeyWeight> keyWeights,
+ ZAggregator aggregator) {
+ List<RedisSortedSet> sets = new ArrayList<>(keyWeights.size());
+ for (ZKeyWeight keyWeight : keyWeights) {
+ RedisSortedSet set =
+ regionProvider.getTypedRedisData(REDIS_SORTED_SET,
keyWeight.getKey(), false);
+
+ if (set == NULL_REDIS_SORTED_SET) {
+ continue;
+ }
+
+ double weight = keyWeight.getWeight();
+ RedisSortedSet weightedSet = new RedisSortedSet(Collections.emptyList(),
new double[] {});
+
+ for (AbstractOrderedSetEntry entry : set.members.values()) {
+ OrderedSetEntry existingValue = members.get(entry.getMember());
Review comment:
since you never really use "existingValue" it seems like it might be
better to
change these two lines to just be:
if (!members.contains(entry.getMember())
##########
File path:
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java
##########
@@ -288,6 +288,49 @@ long zcount(SortedSetScoreRangeOptions rangeOptions) {
return Coder.doubleToBytes(score);
}
+ long zinterstore(RegionProvider regionProvider, RedisKey key,
List<ZKeyWeight> keyWeights,
+ ZAggregator aggregator) {
+ List<RedisSortedSet> sets = new ArrayList<>(keyWeights.size());
+ for (ZKeyWeight keyWeight : keyWeights) {
+ RedisSortedSet set =
+ regionProvider.getTypedRedisData(REDIS_SORTED_SET,
keyWeight.getKey(), false);
+
+ if (set == NULL_REDIS_SORTED_SET) {
+ continue;
+ }
+
+ double weight = keyWeight.getWeight();
+ RedisSortedSet weightedSet = new RedisSortedSet(Collections.emptyList(),
new double[] {});
Review comment:
it seems kind of odd to create this with empty lists and then turn right
around add up to set.size() items.
I think it would be good to add a RedisSortedSet(int size) {
this.members = new MemberMap(size);
} constructor
and use that constructor here
##########
File path:
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java
##########
@@ -607,6 +650,84 @@ private void addIfMatching(GlobPattern matchPattern,
List<byte[]> resultList, by
}
}
+ private RedisSortedSet getIntersection(List<RedisSortedSet> sets,
ZAggregator aggregator) {
+ RedisSortedSet retVal = new RedisSortedSet(Collections.emptyList(), new
double[] {});
+ RedisSortedSet smallestSet = sets.get(0);
+
+ for (RedisSortedSet set : sets) {
+ if (set.getSortedSetSize() < smallestSet.getSortedSetSize()) {
+ smallestSet = set;
+ }
+ }
+
+ for (byte[] member : smallestSet.members.keySet()) {
+ Double newScore;
Review comment:
I think this can be "double" instead of "Double"
##########
File path:
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java
##########
@@ -607,6 +650,84 @@ private void addIfMatching(GlobPattern matchPattern,
List<byte[]> resultList, by
}
}
+ private RedisSortedSet getIntersection(List<RedisSortedSet> sets,
ZAggregator aggregator) {
+ RedisSortedSet retVal = new RedisSortedSet(Collections.emptyList(), new
double[] {});
+ RedisSortedSet smallestSet = sets.get(0);
+
+ for (RedisSortedSet set : sets) {
+ if (set.getSortedSetSize() < smallestSet.getSortedSetSize()) {
+ smallestSet = set;
+ }
+ }
+
+ for (byte[] member : smallestSet.members.keySet()) {
+ Double newScore;
+ if (aggregator.equals(ZAggregator.SUM)) {
+ newScore = getSumOfScoresForMember(sets, member, retVal);
+ } else if (aggregator.equals(ZAggregator.MAX)) {
+ newScore = getMaxScoreForMember(sets, member, retVal);
+ } else {
+ newScore = getMinScoreForMember(sets, member, retVal);
+ }
+
+ if (newScore != null) {
+ if (newScore.isNaN()) {
+ throw new ArithmeticException(ERROR_OPERATION_PRODUCED_NAN);
+ }
+ retVal.memberAdd(member, newScore);
+ }
+ }
+ return retVal;
+ }
+
+ private Double getSumOfScoresForMember(List<RedisSortedSet> sets, byte[]
member,
+ RedisSortedSet retVal) {
+ double runningTotal = 0;
+ for (RedisSortedSet set : sets) {
+ if (set.members.containsKey(member)) {
+ runningTotal += set.members.get(member).score;
+ } else {
+ return null;
+ }
+ }
+ retVal.memberAdd(member, runningTotal);
+ return runningTotal;
+ }
+
+ private Double getMaxScoreForMember(List<RedisSortedSet> sets, byte[] member,
Review comment:
change "Double" to "double"
##########
File path:
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java
##########
@@ -288,6 +288,49 @@ long zcount(SortedSetScoreRangeOptions rangeOptions) {
return Coder.doubleToBytes(score);
}
+ long zinterstore(RegionProvider regionProvider, RedisKey key,
List<ZKeyWeight> keyWeights,
+ ZAggregator aggregator) {
+ List<RedisSortedSet> sets = new ArrayList<>(keyWeights.size());
+ for (ZKeyWeight keyWeight : keyWeights) {
+ RedisSortedSet set =
+ regionProvider.getTypedRedisData(REDIS_SORTED_SET,
keyWeight.getKey(), false);
+
+ if (set == NULL_REDIS_SORTED_SET) {
+ continue;
+ }
+
+ double weight = keyWeight.getWeight();
+ RedisSortedSet weightedSet = new RedisSortedSet(Collections.emptyList(),
new double[] {});
+
+ for (AbstractOrderedSetEntry entry : set.members.values()) {
+ OrderedSetEntry existingValue = members.get(entry.getMember());
+ if (existingValue == null) {
+ double score;
+ // Redis math and Java math are different when handling infinity.
Specifically:
+ // Java: INFINITY * 0 = NaN
+ // Redis: INFINITY * 0 = 0
+ if (weight == 0) {
+ score = 0;
+ } else if (weight == 1) {
+ score = entry.getScore();
+ } else if (Double.isInfinite(weight) && entry.score == 0D) {
+ score = 0D;
+ } else {
+ score = entry.score * weight;
+ }
+ weightedSet.memberAdd(entry.member, score);
Review comment:
use getMember()
##########
File path:
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java
##########
@@ -288,6 +288,49 @@ long zcount(SortedSetScoreRangeOptions rangeOptions) {
return Coder.doubleToBytes(score);
}
+ long zinterstore(RegionProvider regionProvider, RedisKey key,
List<ZKeyWeight> keyWeights,
+ ZAggregator aggregator) {
+ List<RedisSortedSet> sets = new ArrayList<>(keyWeights.size());
+ for (ZKeyWeight keyWeight : keyWeights) {
+ RedisSortedSet set =
+ regionProvider.getTypedRedisData(REDIS_SORTED_SET,
keyWeight.getKey(), false);
+
+ if (set == NULL_REDIS_SORTED_SET) {
+ continue;
+ }
+
+ double weight = keyWeight.getWeight();
+ RedisSortedSet weightedSet = new RedisSortedSet(Collections.emptyList(),
new double[] {});
+
+ for (AbstractOrderedSetEntry entry : set.members.values()) {
+ OrderedSetEntry existingValue = members.get(entry.getMember());
+ if (existingValue == null) {
+ double score;
+ // Redis math and Java math are different when handling infinity.
Specifically:
+ // Java: INFINITY * 0 = NaN
+ // Redis: INFINITY * 0 = 0
+ if (weight == 0) {
+ score = 0;
+ } else if (weight == 1) {
+ score = entry.getScore();
+ } else if (Double.isInfinite(weight) && entry.score == 0D) {
+ score = 0D;
+ } else {
+ score = entry.score * weight;
+ }
+ weightedSet.memberAdd(entry.member, score);
+ }
+ }
+ sets.add(weightedSet);
+ }
+
+ RedisSortedSet intersection = getIntersection(sets, aggregator);
Review comment:
We already have a new RedisSortedSet instance we created and called this
method on it. It is "this". So instead of having getIntersection create and
return a new instance, I think it should just be something like "void
computeIntersection(sets, aggregator)" and the intersection will be stored in
itself. Then the next two lines would store "this" in the region and return
getSortedSetSize().
##########
File path:
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java
##########
@@ -288,6 +288,49 @@ long zcount(SortedSetScoreRangeOptions rangeOptions) {
return Coder.doubleToBytes(score);
}
+ long zinterstore(RegionProvider regionProvider, RedisKey key,
List<ZKeyWeight> keyWeights,
+ ZAggregator aggregator) {
+ List<RedisSortedSet> sets = new ArrayList<>(keyWeights.size());
+ for (ZKeyWeight keyWeight : keyWeights) {
+ RedisSortedSet set =
+ regionProvider.getTypedRedisData(REDIS_SORTED_SET,
keyWeight.getKey(), false);
+
+ if (set == NULL_REDIS_SORTED_SET) {
+ continue;
+ }
+
+ double weight = keyWeight.getWeight();
+ RedisSortedSet weightedSet = new RedisSortedSet(Collections.emptyList(),
new double[] {});
+
+ for (AbstractOrderedSetEntry entry : set.members.values()) {
+ OrderedSetEntry existingValue = members.get(entry.getMember());
+ if (existingValue == null) {
+ double score;
+ // Redis math and Java math are different when handling infinity.
Specifically:
+ // Java: INFINITY * 0 = NaN
+ // Redis: INFINITY * 0 = 0
+ if (weight == 0) {
+ score = 0;
+ } else if (weight == 1) {
+ score = entry.getScore();
+ } else if (Double.isInfinite(weight) && entry.score == 0D) {
+ score = 0D;
+ } else {
+ score = entry.score * weight;
Review comment:
use getScore()
##########
File path:
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java
##########
@@ -607,6 +650,84 @@ private void addIfMatching(GlobPattern matchPattern,
List<byte[]> resultList, by
}
}
+ private RedisSortedSet getIntersection(List<RedisSortedSet> sets,
ZAggregator aggregator) {
+ RedisSortedSet retVal = new RedisSortedSet(Collections.emptyList(), new
double[] {});
+ RedisSortedSet smallestSet = sets.get(0);
+
+ for (RedisSortedSet set : sets) {
+ if (set.getSortedSetSize() < smallestSet.getSortedSetSize()) {
+ smallestSet = set;
+ }
+ }
+
+ for (byte[] member : smallestSet.members.keySet()) {
+ Double newScore;
+ if (aggregator.equals(ZAggregator.SUM)) {
+ newScore = getSumOfScoresForMember(sets, member, retVal);
+ } else if (aggregator.equals(ZAggregator.MAX)) {
+ newScore = getMaxScoreForMember(sets, member, retVal);
+ } else {
+ newScore = getMinScoreForMember(sets, member, retVal);
+ }
+
+ if (newScore != null) {
+ if (newScore.isNaN()) {
+ throw new ArithmeticException(ERROR_OPERATION_PRODUCED_NAN);
+ }
+ retVal.memberAdd(member, newScore);
+ }
+ }
+ return retVal;
+ }
+
+ private Double getSumOfScoresForMember(List<RedisSortedSet> sets, byte[]
member,
Review comment:
change "Double" to "double"
##########
File path:
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java
##########
@@ -607,6 +650,84 @@ private void addIfMatching(GlobPattern matchPattern,
List<byte[]> resultList, by
}
}
+ private RedisSortedSet getIntersection(List<RedisSortedSet> sets,
ZAggregator aggregator) {
+ RedisSortedSet retVal = new RedisSortedSet(Collections.emptyList(), new
double[] {});
+ RedisSortedSet smallestSet = sets.get(0);
+
+ for (RedisSortedSet set : sets) {
+ if (set.getSortedSetSize() < smallestSet.getSortedSetSize()) {
+ smallestSet = set;
+ }
+ }
+
+ for (byte[] member : smallestSet.members.keySet()) {
+ Double newScore;
+ if (aggregator.equals(ZAggregator.SUM)) {
Review comment:
instead of testing for the different ZAggregator types here and having
three methods that implement the logic, couldn't have just one method (name it
double getIntersectionScore(sets, member, aggregator)) and then when it comes
time to compute the new score value call "total =
aggregator.getFunction().apply(total, entry.score)"? If you need to you could
enhance Zaggregator but I think the Function on it is all you need.
##########
File path:
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSetCommandsFunctionExecutor.java
##########
@@ -164,6 +174,17 @@ public long zrevrank(RedisKey key, byte[] member) {
@Override
public long zunionstore(RedisKey destinationKey, List<ZKeyWeight> keyWeights,
ZAggregator aggregator) {
+ List<RedisKey> keysToLock = lockKeys(destinationKey, keyWeights);
+
+ return stripedExecute(destinationKey, keysToLock,
+ () -> new RedisSortedSet(Collections.emptyList(), new double[]
{}).zunionstore(
Review comment:
If you add that new RedisSortedSet constructor that just takes a size
then you should use it here with a size of 0.
##########
File path:
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java
##########
@@ -288,6 +288,49 @@ long zcount(SortedSetScoreRangeOptions rangeOptions) {
return Coder.doubleToBytes(score);
}
+ long zinterstore(RegionProvider regionProvider, RedisKey key,
List<ZKeyWeight> keyWeights,
+ ZAggregator aggregator) {
+ List<RedisSortedSet> sets = new ArrayList<>(keyWeights.size());
+ for (ZKeyWeight keyWeight : keyWeights) {
+ RedisSortedSet set =
+ regionProvider.getTypedRedisData(REDIS_SORTED_SET,
keyWeight.getKey(), false);
+
+ if (set == NULL_REDIS_SORTED_SET) {
+ continue;
+ }
+
+ double weight = keyWeight.getWeight();
+ RedisSortedSet weightedSet = new RedisSortedSet(Collections.emptyList(),
new double[] {});
+
+ for (AbstractOrderedSetEntry entry : set.members.values()) {
+ OrderedSetEntry existingValue = members.get(entry.getMember());
Review comment:
But at this point in the code I think "members" is empty. When this
method is called from the FunctionExecutor class it does it on a new empty
instance it creates. And at this point it has not added anything to that
instance. So I think looking at this instance's state here is wrong. Should
this loop just add the correct weight to each existing entry?
##########
File path:
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZStoreExecutor.java
##########
@@ -0,0 +1,129 @@
+/*
+ * 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_SYNTAX;
+import static
org.apache.geode.redis.internal.RedisConstants.ERROR_WEIGHT_NOT_A_FLOAT;
+import static org.apache.geode.redis.internal.RedisConstants.ERROR_WRONG_SLOT;
+import static org.apache.geode.redis.internal.netty.Coder.toUpperCaseBytes;
+import static
org.apache.geode.redis.internal.netty.StringBytesGlossary.bAGGREGATE;
+import static
org.apache.geode.redis.internal.netty.StringBytesGlossary.bWEIGHTS;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import org.apache.geode.redis.internal.data.RedisKey;
+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 abstract class ZStoreExecutor extends AbstractExecutor {
+
+ @Override
+ public RedisResponse executeCommand(Command command, ExecutionHandlerContext
context) {
+ List<byte[]> commandElements = command.getProcessedCommand();
+
+ Iterator<byte[]> argIterator = commandElements.iterator();
+ // Skip command and destination key
+ argIterator.next();
+ argIterator.next();
+
+ long numKeys;
+ try {
+ numKeys = Coder.bytesToLong(argIterator.next());
+ } catch (NumberFormatException ex) {
+ return RedisResponse.error(ERROR_SYNTAX);
+ }
+
+ // Rough validation so that we can use numKeys to initialize the array
sizes below.
+ if (numKeys > commandElements.size()) {
+ return RedisResponse.error(ERROR_SYNTAX);
+ }
+
+ List<ZKeyWeight> keyWeights = new ArrayList<>((int) numKeys);
+ ZAggregator aggregator = ZAggregator.SUM;
+
+ while (argIterator.hasNext()) {
+ byte[] arg = argIterator.next();
+
+ if (keyWeights.size() < numKeys) {
+ keyWeights.add(new ZKeyWeight(new RedisKey(arg), 1D));
+ continue;
+ }
+
+ arg = toUpperCaseBytes(arg);
+ if (Arrays.equals(arg, bWEIGHTS)) {
+ if (!allWeightsAreOne(keyWeights)) {
+ return RedisResponse.error(ERROR_SYNTAX);
+ }
+ for (int i = 0; i < numKeys; i++) {
+ if (!argIterator.hasNext()) {
+ return RedisResponse.error(ERROR_SYNTAX);
+ }
+ try {
+
keyWeights.get(i).setWeight(Coder.bytesToDouble(argIterator.next()));
+ } catch (NumberFormatException nex) {
+ return RedisResponse.error(ERROR_WEIGHT_NOT_A_FLOAT);
+ }
+ }
+ continue;
+ }
+
+ if (Arrays.equals(arg, bAGGREGATE)) {
+ try {
+ aggregator =
ZAggregator.valueOf(Coder.bytesToString(argIterator.next()));
+ } catch (IllegalArgumentException | NoSuchElementException e) {
+ return RedisResponse.error(ERROR_SYNTAX);
+ }
+ continue;
+ }
+
+ // End up here if we have more keys than weights
+ return RedisResponse.error(ERROR_SYNTAX);
+ }
+
+ if (keyWeights.size() != numKeys) {
+ return RedisResponse.error(ERROR_SYNTAX);
+ }
+
+ int bucket = command.getKey().getBucketId();
+ for (ZKeyWeight keyWeight : keyWeights) {
+ if (keyWeight.getKey().getBucketId() != bucket) {
+ return RedisResponse.crossSlot(ERROR_WRONG_SLOT);
Review comment:
I saw another place in your code were you checked that all the sets are
local. That probably is not needed since you check that they are all on the
same bucket here.
##########
File path:
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java
##########
@@ -607,6 +650,84 @@ private void addIfMatching(GlobPattern matchPattern,
List<byte[]> resultList, by
}
}
+ private RedisSortedSet getIntersection(List<RedisSortedSet> sets,
ZAggregator aggregator) {
+ RedisSortedSet retVal = new RedisSortedSet(Collections.emptyList(), new
double[] {});
+ RedisSortedSet smallestSet = sets.get(0);
+
+ for (RedisSortedSet set : sets) {
+ if (set.getSortedSetSize() < smallestSet.getSortedSetSize()) {
+ smallestSet = set;
+ }
+ }
+
+ for (byte[] member : smallestSet.members.keySet()) {
+ Double newScore;
+ if (aggregator.equals(ZAggregator.SUM)) {
+ newScore = getSumOfScoresForMember(sets, member, retVal);
+ } else if (aggregator.equals(ZAggregator.MAX)) {
+ newScore = getMaxScoreForMember(sets, member, retVal);
+ } else {
+ newScore = getMinScoreForMember(sets, member, retVal);
+ }
+
+ if (newScore != null) {
+ if (newScore.isNaN()) {
+ throw new ArithmeticException(ERROR_OPERATION_PRODUCED_NAN);
+ }
+ retVal.memberAdd(member, newScore);
+ }
+ }
+ return retVal;
+ }
+
+ private Double getSumOfScoresForMember(List<RedisSortedSet> sets, byte[]
member,
Review comment:
Oh you needed to use Double so you could return null. I think with the
idea that we are computing the intersection on "this" (i.e. the retVal
parameter goes away) and since these three methods will become one (by passing
the aggregator into it) instead of it returning a Double/double it can return
void and when it would have returned a non-null total it can instead check it
for NAN and then just store it in this (i.e. memberAdd(member, total)).
##########
File path:
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/sortedset/ZStoreExecutor.java
##########
@@ -0,0 +1,129 @@
+/*
+ * 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_SYNTAX;
+import static
org.apache.geode.redis.internal.RedisConstants.ERROR_WEIGHT_NOT_A_FLOAT;
+import static org.apache.geode.redis.internal.RedisConstants.ERROR_WRONG_SLOT;
+import static org.apache.geode.redis.internal.netty.Coder.toUpperCaseBytes;
+import static
org.apache.geode.redis.internal.netty.StringBytesGlossary.bAGGREGATE;
+import static
org.apache.geode.redis.internal.netty.StringBytesGlossary.bWEIGHTS;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import org.apache.geode.redis.internal.data.RedisKey;
+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 abstract class ZStoreExecutor extends AbstractExecutor {
+
+ @Override
+ public RedisResponse executeCommand(Command command, ExecutionHandlerContext
context) {
+ List<byte[]> commandElements = command.getProcessedCommand();
+
+ Iterator<byte[]> argIterator = commandElements.iterator();
+ // Skip command and destination key
+ argIterator.next();
+ argIterator.next();
+
+ long numKeys;
+ try {
+ numKeys = Coder.bytesToLong(argIterator.next());
+ } catch (NumberFormatException ex) {
+ return RedisResponse.error(ERROR_SYNTAX);
+ }
+
+ // Rough validation so that we can use numKeys to initialize the array
sizes below.
+ if (numKeys > commandElements.size()) {
+ return RedisResponse.error(ERROR_SYNTAX);
+ }
+
+ List<ZKeyWeight> keyWeights = new ArrayList<>((int) numKeys);
+ ZAggregator aggregator = ZAggregator.SUM;
+
+ while (argIterator.hasNext()) {
+ byte[] arg = argIterator.next();
+
+ if (keyWeights.size() < numKeys) {
+ keyWeights.add(new ZKeyWeight(new RedisKey(arg), 1D));
+ continue;
+ }
+
+ arg = toUpperCaseBytes(arg);
+ if (Arrays.equals(arg, bWEIGHTS)) {
+ if (!allWeightsAreOne(keyWeights)) {
Review comment:
This seems like overkill (allWeightsAreOne). When I first saw it I
thought "why do all the weights have to be 1".
It only seems possible if they supply more than one WEIGHTS list. For
example "ZINTERSTORE dst 2 set1 set2 WEIGHTS 1 2 WEIGHTS 2 3". But isn't that
illegal any way? If you are trying to make sure that WEIGHTS does not happen
more than once wouldn't a simple boolean that it has been seen let you do that?
AGGREGATE may have the same issue (does native redis let you repeat it?). Does
native redis enforce the order (i.e. WEIGHTS first then AGGREGATE)? If so we
should also.
##########
File path:
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java
##########
@@ -607,6 +650,84 @@ private void addIfMatching(GlobPattern matchPattern,
List<byte[]> resultList, by
}
}
+ private RedisSortedSet getIntersection(List<RedisSortedSet> sets,
ZAggregator aggregator) {
+ RedisSortedSet retVal = new RedisSortedSet(Collections.emptyList(), new
double[] {});
+ RedisSortedSet smallestSet = sets.get(0);
+
+ for (RedisSortedSet set : sets) {
+ if (set.getSortedSetSize() < smallestSet.getSortedSetSize()) {
+ smallestSet = set;
+ }
+ }
+
+ for (byte[] member : smallestSet.members.keySet()) {
+ Double newScore;
+ if (aggregator.equals(ZAggregator.SUM)) {
+ newScore = getSumOfScoresForMember(sets, member, retVal);
+ } else if (aggregator.equals(ZAggregator.MAX)) {
+ newScore = getMaxScoreForMember(sets, member, retVal);
+ } else {
+ newScore = getMinScoreForMember(sets, member, retVal);
+ }
+
+ if (newScore != null) {
+ if (newScore.isNaN()) {
+ throw new ArithmeticException(ERROR_OPERATION_PRODUCED_NAN);
+ }
+ retVal.memberAdd(member, newScore);
+ }
+ }
+ return retVal;
+ }
+
+ private Double getSumOfScoresForMember(List<RedisSortedSet> sets, byte[]
member,
+ RedisSortedSet retVal) {
+ double runningTotal = 0;
+ for (RedisSortedSet set : sets) {
+ if (set.members.containsKey(member)) {
+ runningTotal += set.members.get(member).score;
+ } else {
+ return null;
+ }
+ }
+ retVal.memberAdd(member, runningTotal);
+ return runningTotal;
+ }
+
+ private Double getMaxScoreForMember(List<RedisSortedSet> sets, byte[] member,
+ RedisSortedSet retVal) {
+ double runningMax = Double.MIN_VALUE;
+ for (RedisSortedSet set : sets) {
+ if (set.members.containsKey(member)) {
+ double newScore = set.members.get(member).score;
+ if (newScore > runningMax) {
+ runningMax = newScore;
+ }
+ } else {
+ return null;
+ }
+ }
+ retVal.memberAdd(member, runningMax);
+ return runningMax;
+ }
+
+ private Double getMinScoreForMember(List<RedisSortedSet> sets, byte[] member,
Review comment:
change "Double" to "double"
##########
File path:
geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java
##########
@@ -607,6 +650,84 @@ private void addIfMatching(GlobPattern matchPattern,
List<byte[]> resultList, by
}
}
+ private RedisSortedSet getIntersection(List<RedisSortedSet> sets,
ZAggregator aggregator) {
+ RedisSortedSet retVal = new RedisSortedSet(Collections.emptyList(), new
double[] {});
+ RedisSortedSet smallestSet = sets.get(0);
+
+ for (RedisSortedSet set : sets) {
+ if (set.getSortedSetSize() < smallestSet.getSortedSetSize()) {
+ smallestSet = set;
+ }
+ }
+
+ for (byte[] member : smallestSet.members.keySet()) {
+ Double newScore;
+ if (aggregator.equals(ZAggregator.SUM)) {
+ newScore = getSumOfScoresForMember(sets, member, retVal);
+ } else if (aggregator.equals(ZAggregator.MAX)) {
+ newScore = getMaxScoreForMember(sets, member, retVal);
+ } else {
+ newScore = getMinScoreForMember(sets, member, retVal);
+ }
+
+ if (newScore != null) {
+ if (newScore.isNaN()) {
+ throw new ArithmeticException(ERROR_OPERATION_PRODUCED_NAN);
+ }
+ retVal.memberAdd(member, newScore);
+ }
+ }
+ return retVal;
+ }
+
+ private Double getSumOfScoresForMember(List<RedisSortedSet> sets, byte[]
member,
+ RedisSortedSet retVal) {
+ double runningTotal = 0;
+ for (RedisSortedSet set : sets) {
+ if (set.members.containsKey(member)) {
+ runningTotal += set.members.get(member).score;
Review comment:
use getScore()
Also instead of calling both containsKey and get (which does two map
lookups) just call get and if its result is not null compute the runningTotal.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
