sabbey37 commented on a change in pull request #6489: URL: https://github.com/apache/geode/pull/6489#discussion_r636838882
########## File path: geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java ########## @@ -0,0 +1,268 @@ +/* + * 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.data; + +import static org.apache.geode.redis.internal.data.RedisDataType.REDIS_SORTED_SET; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import it.unimi.dsi.fastutil.bytes.ByteArrays; +import it.unimi.dsi.fastutil.objects.Object2ObjectOpenCustomHashMap; + +import org.apache.geode.cache.Region; +import org.apache.geode.internal.InternalDataSerializer; +import org.apache.geode.internal.serialization.DeserializationContext; +import org.apache.geode.internal.serialization.KnownVersion; +import org.apache.geode.internal.serialization.SerializationContext; +import org.apache.geode.redis.internal.delta.AddsDeltaInfo; +import org.apache.geode.redis.internal.delta.DeltaInfo; +import org.apache.geode.redis.internal.delta.RemsDeltaInfo; +import org.apache.geode.redis.internal.executor.sortedset.SortedSetOptions; + +public class RedisSortedSet extends AbstractRedisData { + private Object2ObjectOpenCustomHashMap<byte[], byte[]> members; + + protected static final int BASE_REDIS_SORTED_SET_OVERHEAD = 184; + protected static final int PER_PAIR_OVERHEAD = 48; + + private int sizeInBytes = BASE_REDIS_SORTED_SET_OVERHEAD; + + @Override + public int getSizeInBytes() { + return sizeInBytes; + } + + private enum AddOrChange { + ADDED, CHANGED, NOOP + } + + private int calculateSizeOfFieldValuePair(byte[] member, byte[] score) { + return PER_PAIR_OVERHEAD + member.length + score.length; + } + + RedisSortedSet(List<byte[]> members) { + this.members = new Object2ObjectOpenCustomHashMap<>(members.size(), ByteArrays.HASH_STRATEGY); + Iterator<byte[]> iterator = members.iterator(); + + while (iterator.hasNext()) { + byte[] score = iterator.next(); + byte[] member = iterator.next(); + sizeInBytes += calculateSizeOfFieldValuePair(member, score); + this.members.put(member, score); + } + } + + // for serialization + public RedisSortedSet() {} + + @Override + protected void applyDelta(DeltaInfo deltaInfo) { + if (deltaInfo instanceof AddsDeltaInfo) { + AddsDeltaInfo addsDeltaInfo = (AddsDeltaInfo) deltaInfo; + membersAddAll(addsDeltaInfo); + } else { + RemsDeltaInfo remsDeltaInfo = (RemsDeltaInfo) deltaInfo; + membersRemoveAll(remsDeltaInfo); + } + } + + /** + * Since GII (getInitialImage) can come in and call toData while other threads are modifying this + * object, the striped executor will not protect toData. So any methods that modify "members" + * needs to be thread safe with toData. + */ + + @Override + public synchronized void toData(DataOutput out, SerializationContext context) throws IOException { + super.toData(out, context); + InternalDataSerializer.writePrimitiveInt(members.size(), out); + for (Map.Entry<byte[], byte[]> entry : members.entrySet()) { + byte[] member = entry.getKey(); + byte[] score = entry.getValue(); + InternalDataSerializer.writeByteArray(member, out); + InternalDataSerializer.writeByteArray(score, out); + } + InternalDataSerializer.writePrimitiveInt(sizeInBytes, out); + } + + @Override + public void fromData(DataInput in, DeserializationContext context) + throws IOException, ClassNotFoundException { + super.fromData(in, context); + int size = InternalDataSerializer.readPrimitiveInt(in); + members = new Object2ObjectOpenCustomHashMap<>(size, ByteArrays.HASH_STRATEGY); + for (int i = 0; i < size; i++) { + members.put(InternalDataSerializer.readByteArray(in), + InternalDataSerializer.readByteArray(in)); + } + sizeInBytes = InternalDataSerializer.readPrimitiveInt(in); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof RedisSortedSet)) { + return false; + } + if (!super.equals(o)) { + return false; + } + RedisSortedSet redisSortedSet = (RedisSortedSet) o; + if (members.size() != redisSortedSet.members.size()) { + return false; + } + + for (Map.Entry<byte[], byte[]> entry : members.entrySet()) { + if (!Arrays.equals(redisSortedSet.members.get(entry.getKey()), (entry.getValue()))) { + return false; + } + } + return true; + } + + @Override + public int getDSFID() { + return REDIS_SORTED_SET_ID; + } + + protected synchronized AddOrChange memberAdd(byte[] memberToAdd, byte[] scoreToAdd) { + boolean added = (members.put(memberToAdd, scoreToAdd) == null); + if (added) { + sizeInBytes += calculateSizeOfFieldValuePair(memberToAdd, scoreToAdd); + } else { + // TODO: calculate size for 'changed' + } + return added ? AddOrChange.ADDED : AddOrChange.NOOP; + } + + private synchronized void membersAddAll(AddsDeltaInfo addsDeltaInfo) { + Iterator<byte[]> iterator = addsDeltaInfo.getAdds().iterator(); + while (iterator.hasNext()) { + byte[] member = iterator.next(); + byte[] score = iterator.next(); + sizeInBytes += calculateSizeOfFieldValuePair(member, score); + members.put(member, score); Review comment: That is so true and good call out! It's different from a RedisSet... even though it is a delta, so we know it was added to the set on a different Geode member, we don't know if it was an updated score or an entirely new score. ########## File path: geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSortedSet.java ########## @@ -0,0 +1,268 @@ +/* + * 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.data; + +import static org.apache.geode.redis.internal.data.RedisDataType.REDIS_SORTED_SET; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import it.unimi.dsi.fastutil.bytes.ByteArrays; +import it.unimi.dsi.fastutil.objects.Object2ObjectOpenCustomHashMap; + +import org.apache.geode.cache.Region; +import org.apache.geode.internal.InternalDataSerializer; +import org.apache.geode.internal.serialization.DeserializationContext; +import org.apache.geode.internal.serialization.KnownVersion; +import org.apache.geode.internal.serialization.SerializationContext; +import org.apache.geode.redis.internal.delta.AddsDeltaInfo; +import org.apache.geode.redis.internal.delta.DeltaInfo; +import org.apache.geode.redis.internal.delta.RemsDeltaInfo; +import org.apache.geode.redis.internal.executor.sortedset.SortedSetOptions; + +public class RedisSortedSet extends AbstractRedisData { + private Object2ObjectOpenCustomHashMap<byte[], byte[]> members; + + protected static final int BASE_REDIS_SORTED_SET_OVERHEAD = 184; + protected static final int PER_PAIR_OVERHEAD = 48; + + private int sizeInBytes = BASE_REDIS_SORTED_SET_OVERHEAD; + + @Override + public int getSizeInBytes() { + return sizeInBytes; + } + + private enum AddOrChange { + ADDED, CHANGED, NOOP + } + + private int calculateSizeOfFieldValuePair(byte[] member, byte[] score) { + return PER_PAIR_OVERHEAD + member.length + score.length; + } + + RedisSortedSet(List<byte[]> members) { + this.members = new Object2ObjectOpenCustomHashMap<>(members.size(), ByteArrays.HASH_STRATEGY); + Iterator<byte[]> iterator = members.iterator(); + + while (iterator.hasNext()) { + byte[] score = iterator.next(); + byte[] member = iterator.next(); + sizeInBytes += calculateSizeOfFieldValuePair(member, score); + this.members.put(member, score); + } + } + + // for serialization + public RedisSortedSet() {} + + @Override + protected void applyDelta(DeltaInfo deltaInfo) { + if (deltaInfo instanceof AddsDeltaInfo) { + AddsDeltaInfo addsDeltaInfo = (AddsDeltaInfo) deltaInfo; + membersAddAll(addsDeltaInfo); + } else { + RemsDeltaInfo remsDeltaInfo = (RemsDeltaInfo) deltaInfo; + membersRemoveAll(remsDeltaInfo); + } + } + + /** + * Since GII (getInitialImage) can come in and call toData while other threads are modifying this + * object, the striped executor will not protect toData. So any methods that modify "members" + * needs to be thread safe with toData. + */ + + @Override + public synchronized void toData(DataOutput out, SerializationContext context) throws IOException { + super.toData(out, context); + InternalDataSerializer.writePrimitiveInt(members.size(), out); + for (Map.Entry<byte[], byte[]> entry : members.entrySet()) { + byte[] member = entry.getKey(); + byte[] score = entry.getValue(); + InternalDataSerializer.writeByteArray(member, out); + InternalDataSerializer.writeByteArray(score, out); + } + InternalDataSerializer.writePrimitiveInt(sizeInBytes, out); + } + + @Override + public void fromData(DataInput in, DeserializationContext context) + throws IOException, ClassNotFoundException { + super.fromData(in, context); + int size = InternalDataSerializer.readPrimitiveInt(in); + members = new Object2ObjectOpenCustomHashMap<>(size, ByteArrays.HASH_STRATEGY); + for (int i = 0; i < size; i++) { + members.put(InternalDataSerializer.readByteArray(in), + InternalDataSerializer.readByteArray(in)); + } + sizeInBytes = InternalDataSerializer.readPrimitiveInt(in); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof RedisSortedSet)) { + return false; + } + if (!super.equals(o)) { + return false; + } + RedisSortedSet redisSortedSet = (RedisSortedSet) o; + if (members.size() != redisSortedSet.members.size()) { + return false; + } + + for (Map.Entry<byte[], byte[]> entry : members.entrySet()) { + if (!Arrays.equals(redisSortedSet.members.get(entry.getKey()), (entry.getValue()))) { + return false; + } + } + return true; + } + + @Override + public int getDSFID() { + return REDIS_SORTED_SET_ID; + } + + protected synchronized AddOrChange memberAdd(byte[] memberToAdd, byte[] scoreToAdd) { + boolean added = (members.put(memberToAdd, scoreToAdd) == null); + if (added) { + sizeInBytes += calculateSizeOfFieldValuePair(memberToAdd, scoreToAdd); + } else { + // TODO: calculate size for 'changed' + } + return added ? AddOrChange.ADDED : AddOrChange.NOOP; + } + + private synchronized void membersAddAll(AddsDeltaInfo addsDeltaInfo) { + Iterator<byte[]> iterator = addsDeltaInfo.getAdds().iterator(); + while (iterator.hasNext()) { + byte[] member = iterator.next(); + byte[] score = iterator.next(); + sizeInBytes += calculateSizeOfFieldValuePair(member, score); + members.put(member, score); + } + } + + + private synchronized void membersRemoveAll(RemsDeltaInfo remsDeltaInfo) { + for (byte[] member : remsDeltaInfo.getRemoves()) { + sizeInBytes -= calculateSizeOfFieldValuePair(member, members.get(member)); + members.remove(member); Review comment: In this case, it is a delta, so we know the member was removed from a different Geode member, and this member receiving the delta should have the same key/values as the member sending the delta (minus the delta of course). I don't think there is a scenario where you can remove just a score without also removing the key itself.... Would it ever be possible for the receiving member's backing set to not have the value that was in the Delta-sending member's set? I guess it would be good to do a `memberRemove()` and check to be sure. Though since we're not implementing any removal methods yet, this method could potentially be removed and added back along with `membersRemove()` in a PR that adds removal functionality (like `ZREM`). -- 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
