From f063ace9080c8deaa2a2873722a9e5ce0682da82 Mon Sep 17 00:00:00 2001 From: oliviarla Date: Mon, 20 Jul 2026 12:17:58 +0900 Subject: [PATCH] CLEANUP: Remove SMGetMode class --- .../java/net/spy/memcached/ArcusClient.java | 17 --------- .../java/net/spy/memcached/ArcusClientIF.java | 35 ------------------- .../net/spy/memcached/ArcusClientPool.java | 19 ---------- .../spy/memcached/collection/SMGetMode.java | 22 ------------ 4 files changed, 93 deletions(-) delete mode 100644 src/main/java/net/spy/memcached/collection/SMGetMode.java diff --git a/src/main/java/net/spy/memcached/ArcusClient.java b/src/main/java/net/spy/memcached/ArcusClient.java index 26f4dfd75..97f39d03f 100644 --- a/src/main/java/net/spy/memcached/ArcusClient.java +++ b/src/main/java/net/spy/memcached/ArcusClient.java @@ -104,7 +104,6 @@ import net.spy.memcached.collection.MapUpdate; import net.spy.memcached.collection.MapUpsert; import net.spy.memcached.collection.SMGetElement; -import net.spy.memcached.collection.SMGetMode; import net.spy.memcached.collection.SetCreate; import net.spy.memcached.collection.SetDelete; import net.spy.memcached.collection.SetExist; @@ -1815,14 +1814,6 @@ public void complete() { return rv; } - @Deprecated - @Override - public SMGetFuture>> asyncBopSortMergeGet( - List keyList, long from, long to, ElementFlagFilter eFlagFilter, - int count, SMGetMode smgetMode) { - return this.asyncBopSortMergeGet(keyList, from, to, eFlagFilter, count, smgetMode == SMGetMode.UNIQUE); - } - private SMGetFuture>> smget( final List> smGetList, final int count, final boolean unique, final boolean reverse, final Transcoder tc) { @@ -2718,14 +2709,6 @@ public void gotStatus(Integer index, OperationStatus status) { return rv; } - @Deprecated - @Override - public SMGetFuture>> asyncBopSortMergeGet( - List keyList, byte[] from, byte[] to, ElementFlagFilter eFlagFilter, - int count, SMGetMode smgetMode) { - return this.asyncBopSortMergeGet(keyList, from, to, eFlagFilter, count, smgetMode == SMGetMode.UNIQUE); - } - @Override public SMGetFuture>> asyncBopSortMergeGet( List keyList, byte[] from, byte[] to, ElementFlagFilter eFlagFilter, diff --git a/src/main/java/net/spy/memcached/ArcusClientIF.java b/src/main/java/net/spy/memcached/ArcusClientIF.java index e2b7ad8a9..469808870 100644 --- a/src/main/java/net/spy/memcached/ArcusClientIF.java +++ b/src/main/java/net/spy/memcached/ArcusClientIF.java @@ -31,7 +31,6 @@ import net.spy.memcached.collection.ElementFlagUpdate; import net.spy.memcached.collection.ElementValueType; import net.spy.memcached.collection.SMGetElement; -import net.spy.memcached.collection.SMGetMode; import net.spy.memcached.internal.BTreeStoreAndGetFuture; import net.spy.memcached.internal.CollectionFuture; import net.spy.memcached.internal.CollectionGetBulkFuture; @@ -1394,23 +1393,6 @@ CollectionFuture> asyncSopPipedInser */ OperationFuture flush(final String prefix, final int delay); - /** - * Get elements that matched both filter and bkey range criteria from - * multiple b+tree. The result is sorted by order of bkey. - * - * @param keyList b+ tree key list - * @param from bkey index from - * @param to bkey index to - * @param eFlagFilter element flag filter - * @param count number of returning values. must be larger than 0 and not more than 1000. - * @param smgetMode smgetMode - * @return a future that will hold the return value list of the fetch. - */ - @Deprecated - SMGetFuture>> asyncBopSortMergeGet( - List keyList, long from, long to, ElementFlagFilter eFlagFilter, - int count, SMGetMode smgetMode); - /** * Update or insert an element. *

@@ -1928,23 +1910,6 @@ CollectionFuture>> asyncBopGet( int count, boolean withDelete, boolean dropIfEmpty, Transcoder tc); - /** - * Get elements that matched both filter and bkey range criteria from - * multiple b+tree. The result is sorted by order of bkey. - * - * @param keyList b+ tree key list - * @param from bkey index from - * @param to bkey index to - * @param eFlagFilter element flag filter - * @param count number of returning values. must be larger than 0 and not more than 1000. - * @param smgetMode smgetMode - * @return a future that will hold the return value list of the fetch. - */ - @Deprecated - SMGetFuture>> asyncBopSortMergeGet( - List keyList, byte[] from, byte[] to, ElementFlagFilter eFlagFilter, - int count, SMGetMode smgetMode); - /** * Get elements that matched both filter and bkey range criteria from * multiple b+tree. The result is sorted by order of bkey. diff --git a/src/main/java/net/spy/memcached/ArcusClientPool.java b/src/main/java/net/spy/memcached/ArcusClientPool.java index c3dae4a35..05e6a8a9f 100644 --- a/src/main/java/net/spy/memcached/ArcusClientPool.java +++ b/src/main/java/net/spy/memcached/ArcusClientPool.java @@ -37,7 +37,6 @@ import net.spy.memcached.collection.ElementFlagUpdate; import net.spy.memcached.collection.ElementValueType; import net.spy.memcached.collection.SMGetElement; -import net.spy.memcached.collection.SMGetMode; import net.spy.memcached.internal.BTreeStoreAndGetFuture; import net.spy.memcached.internal.BulkFuture; import net.spy.memcached.internal.CollectionFuture; @@ -1148,15 +1147,6 @@ public OperationFuture flush(String prefix, int delay) { return this.getClient().flush(prefix, delay); } - @Deprecated - @Override - public SMGetFuture>> asyncBopSortMergeGet( - List keyList, long from, long to, - ElementFlagFilter eFlagFilter, int count, SMGetMode smgetMode) { - return this.getClient().asyncBopSortMergeGet(keyList, from, to, - eFlagFilter, count, smgetMode); - } - @Override public CollectionFuture asyncBopUpsert(String key, long bkey, byte[] elementFlag, Object value, @@ -1400,15 +1390,6 @@ public CollectionFuture>> asyncBopGet( count, withDelete, dropIfEmpty, tc); } - @Deprecated - @Override - public SMGetFuture>> asyncBopSortMergeGet( - List keyList, byte[] from, byte[] to, - ElementFlagFilter eFlagFilter, int count, SMGetMode smgetMode) { - return this.getClient().asyncBopSortMergeGet(keyList, from, to, - eFlagFilter, count, smgetMode); - } - @Override public SMGetFuture>> asyncBopSortMergeGet( List keyList, byte[] from, byte[] to, ElementFlagFilter eFlagFilter, diff --git a/src/main/java/net/spy/memcached/collection/SMGetMode.java b/src/main/java/net/spy/memcached/collection/SMGetMode.java deleted file mode 100644 index 2ae47a1c5..000000000 --- a/src/main/java/net/spy/memcached/collection/SMGetMode.java +++ /dev/null @@ -1,22 +0,0 @@ -package net.spy.memcached.collection; - -/** - * A type component for "bop smgetmode" - */ -public enum SMGetMode { - @Deprecated - UNIQUE("unique"), - @Deprecated - DUPLICATE("duplicate"); - - private String mode; - - SMGetMode(String mode) { - this.mode = mode; - } - - @Deprecated - public String getMode() { - return mode; - } -}