Move this to ttl update handler

linkedin · Aug 17, 2023 · 90af4af · 90af4af
1 parent 90d2f5c
commit 90af4af
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 32 deletions.
diff --git a/ambry-frontend/src/main/java/com/github/ambry/frontend/AmbryIdConverterFactory.java b/ambry-frontend/src/main/java/com/github/ambry/frontend/AmbryIdConverterFactory.java
@@ -169,18 +169,6 @@ private CompletionStage<String> convertId(String input, RestRequest restRequest,
           // on delete requests we can soft delete the record from NamedBlobDb and get the blob ID in one step.
           conversionFuture = getNamedBlobDb().delete(namedBlobPath.getAccountName(), namedBlobPath.getContainerName(),
               namedBlobPath.getBlobName()).thenApply(DeleteResult::getBlobId);
-        } else if (restRequest.getRestMethod() == RestMethod.PUT && RestUtils.getRequestPath(restRequest)
-            .matchesOperation(Operations.UPDATE_TTL)) {
-          NamedBlobRecord record = new NamedBlobRecord(namedBlobPath.getAccountName(), namedBlobPath.getContainerName(),
-              namedBlobPath.getBlobName(), null, Infinite_Time);
-          // Set named blob state as 'IN_PROGRESS', will set the state to be 'READY' in the ttlUpdate success callback: routerTtlUpdateCallback
-          NamedBlobState state = NamedBlobState.IN_PROGRESS;
-          // Always enable upsert to ttl update request.
-          conversionFuture = getNamedBlobDb().ttlUpdate(record, state).thenApply(result -> {
-            restRequest.setArg(RestUtils.InternalKeys.NAMED_BLOB_VERSION, result.getInsertedRecord().getVersion());
-            restRequest.setArg(RestUtils.InternalKeys.NAMED_BLOB_MAPPED_ID, result.getInsertedRecord().getBlobId());
-            return result.getInsertedRecord().getBlobId();
-          });
         } else {
           conversionFuture = getNamedBlobDb().get(namedBlobPath.getAccountName(), namedBlobPath.getContainerName(),
               namedBlobPath.getBlobName(), getOption).thenApply(NamedBlobRecord::getBlobId);

diff --git a/ambry-frontend/src/test/java/com/github/ambry/frontend/TestNamedBlobDb.java b/ambry-frontend/src/test/java/com/github/ambry/frontend/TestNamedBlobDb.java
@@ -141,6 +141,12 @@ public CompletableFuture<PutResult> put(NamedBlobRecord record, NamedBlobState s
     return future;
   }
 
+  @Override
+  public CompletableFuture<PutResult> ttlUpdate(NamedBlobRecord record, NamedBlobState state) {
+    //TODO: implement later
+    return null;
+  }
+
   @Override
   public CompletableFuture<PutResult> updateBlobStateToReady(NamedBlobRecord record) {
     CompletableFuture<PutResult> future = new CompletableFuture<>();
@@ -174,26 +180,6 @@ public CompletableFuture<DeleteResult> delete(String accountName, String contain
     return future;
   }
 
-  @Override
-  public CompletableFuture<PutResult> ttlUpdate(NamedBlobRecord record, NamedBlobState state) {
-    CompletableFuture<PutResult> future = new CompletableFuture<>();
-    if (exception != null) {
-      future.completeExceptionally(exception);
-      return future;
-    }
-    Pair<NamedBlobRecord, Long> recordFromDb = getInternal(record.getAccountName(), record.getContainerName(), record.getBlobName());
-    if (recordFromDb == null) {
-      future.completeExceptionally(new RestServiceException("NotFound", RestServiceErrorCode.NotFound));
-    } else if (recordFromDb.getSecond() != 0 && recordFromDb.getSecond() < time.milliseconds()) {
-      future.completeExceptionally(new RestServiceException("Deleted", RestServiceErrorCode.Deleted));
-    } else {
-      record.setBlobId(recordFromDb.getFirst().getBlobId());
-      putInternal(record, NamedBlobState.IN_PROGRESS, 0L);
-      future.complete(new PutResult(record));
-    }
-    return future;
-  }
-
   @Override
   public CompletableFuture<List<StaleNamedBlob>> pullStaleBlobs() {
     CompletableFuture<List<StaleNamedBlob>> future = new CompletableFuture<>();