INTERNAL: Remove redudant operation type RW.

naver · Feb 21, 2025 · 8c9a6e3 · 8c9a6e3
1 parent a3bd40e
commit 8c9a6e3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/main/java/net/spy/memcached/ConnectionFactoryBuilder.java b/src/main/java/net/spy/memcached/ConnectionFactoryBuilder.java
@@ -392,7 +392,7 @@ public ConnectionFactoryBuilder setReadPriority(ReadPriority priority) {
   public ConnectionFactoryBuilder setAPIReadPriority(APIType apiType, ReadPriority readPriority) {
     OperationType type = apiType.getAPIOpType();
 
-    if (type == OperationType.READ || type == OperationType.RW) {
+    if (type == OperationType.READ) {
       this.apiReadPriorityList.put(apiType, readPriority);
     }
 
@@ -404,7 +404,7 @@ public ConnectionFactoryBuilder setAPIReadPriority(Map<APIType, ReadPriority> ap
 
     for (Map.Entry<APIType, ReadPriority> entry : apiList.entrySet()) {
       OperationType type = entry.getKey().getAPIOpType();
-      if (type == OperationType.READ || type == OperationType.RW) {
+      if (type == OperationType.READ) {
         this.apiReadPriorityList.put(entry.getKey(), entry.getValue());
       }
     }

diff --git a/src/main/java/net/spy/memcached/ops/APIType.java b/src/main/java/net/spy/memcached/ops/APIType.java
@@ -30,22 +30,22 @@ public enum APIType {
   LOP_CREATE(OperationType.WRITE),
   LOP_INSERT(OperationType.WRITE),
   LOP_DELETE(OperationType.WRITE),
-  LOP_GET(OperationType.RW),
+  LOP_GET(OperationType.READ),
 
   // Set API Type
   SOP_CREATE(OperationType.WRITE),
   SOP_INSERT(OperationType.WRITE),
   SOP_DELETE(OperationType.WRITE),
   SOP_EXIST(OperationType.READ),
-  SOP_GET(OperationType.RW),
+  SOP_GET(OperationType.READ),
 
   // Map API Type
   MOP_CREATE(OperationType.WRITE),
   MOP_INSERT(OperationType.WRITE),
   MOP_UPSERT(OperationType.WRITE),
   MOP_UPDATE(OperationType.WRITE),
   MOP_DELETE(OperationType.WRITE),
-  MOP_GET(OperationType.RW),
+  MOP_GET(OperationType.READ),
 
   // B+Tree API Type
   BOP_CREATE(OperationType.WRITE),
@@ -54,7 +54,7 @@ public enum APIType {
   BOP_UPDATE(OperationType.WRITE),
   BOP_INCR(OperationType.WRITE), BOP_DECR(OperationType.WRITE),
   BOP_COUNT(OperationType.READ),
-  BOP_GET(OperationType.RW),
+  BOP_GET(OperationType.READ),
   BOP_SMGET(OperationType.READ),
   BOP_POSITION(OperationType.READ),
   BOP_GBP(OperationType.READ),
@@ -72,7 +72,7 @@ public enum APIType {
   // undefined API
   UNDEFINED(OperationType.UNDEFINED);
 
-  private final OperationType apiOpType;
+  private OperationType apiOpType;
 
   APIType(OperationType t) {
     this.apiOpType = t;
@@ -81,4 +81,8 @@ public enum APIType {
   public OperationType getAPIOpType() {
     return this.apiOpType;
   }
+
+  public void setAPIOpType(OperationType t) {
+    this.apiOpType = t;
+  }
 }
diff --git a/src/main/java/net/spy/memcached/ops/OperationType.java b/src/main/java/net/spy/memcached/ops/OperationType.java
@@ -44,9 +44,6 @@ public enum OperationType {
    */
   READ,
 
-  /* for Collection Get API (with delete, dropIfEmpty) */
-  RW,
-
   /*
    * StatsOperationImpl (getStats)
    * VersionOperationImpl (getVersions)

diff --git a/src/main/java/net/spy/memcached/protocol/ascii/CollectionGetOperationImpl.java b/src/main/java/net/spy/memcached/protocol/ascii/CollectionGetOperationImpl.java
@@ -101,10 +101,9 @@ public CollectionGetOperationImpl(String key, CollectionGet collectionGet,
       setAPIType(APIType.BOP_GET);
     }
     if (collectionGet.isDelete()) {
-      setOperationType(OperationType.WRITE);
-    } else {
-      setOperationType(OperationType.READ);
+      getAPIType().setAPIOpType(OperationType.WRITE);
     }
+    setOperationType(getAPIType().getAPIOpType());
   }
 
   public void handleLine(String line) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,9 +44,6 @@ public enum OperationType { @@
        */
       READ,
-      /* for Collection Get API (with delete, dropIfEmpty) */
-      RW,
       /*
        * StatsOperationImpl (getStats)
        * VersionOperationImpl (getVersions)
@@ Expand Down @@