xuang7 commented on code in PR #5929:
URL: https://github.com/apache/texera/pull/5929#discussion_r3493670057
##########
file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala:
##########
@@ -1030,6 +1034,62 @@ class DatasetResource extends LazyLogging {
}
}
+ @POST
+ @RolesAllowed(Array("REGULAR", "ADMIN"))
+ @Path("/{did}/existing-upload-files")
+ @Consumes(Array(MediaType.APPLICATION_JSON))
+ def findExistingUploadFiles(
+ @PathParam("did") did: Integer,
+ request: ExistingUploadFilesRequest,
+ @Auth user: SessionUser
+ ): Response = {
+ val uid = user.getUid
+ withTransaction(context) { ctx =>
+ if (!userHasWriteAccess(ctx, did, uid)) {
+ throw new ForbiddenException(ERR_USER_HAS_NO_ACCESS_TO_DATASET_MESSAGE)
+ }
+
+ val requested = Option(request)
+ .flatMap(request => Option(request.files))
+ .getOrElse(List.empty)
+ .map { file =>
+ val path = validateAndNormalizeFilePathOrThrow(file.path)
+ if (file.sizeBytes < 0L) throw new BadRequestException("sizeBytes
must be >= 0")
+ path -> file.sizeBytes
+ }
+ .toMap
+
+ val dataset = getDatasetByID(ctx, did)
+ val committed = getLatestDatasetVersion(ctx, did)
+ .map { v =>
+ withLakeFSErrorHandling(
+ s"retrieving committed files of dataset '${dataset.getName}'"
+ ) {
+ LakeFSStorageClient
+ .retrieveObjectsOfVersion(dataset.getRepositoryName,
v.getVersionHash)
+ .map(obj => obj.getPath -> obj.getSizeBytes.longValue())
+ }
+ }
+ .getOrElse(List.empty)
+
+ val staged = withLakeFSErrorHandling(
+ s"retrieving staged files of dataset '${dataset.getName}'"
+ ) {
+
LakeFSStorageClient.retrieveUncommittedObjects(dataset.getRepositoryName)
+ }
+ .filterNot(diff =>
Option(diff.getType).exists(_.getValue.equalsIgnoreCase("removed")))
+ .flatMap(diff => Option(diff.getSizeBytes).map(size => diff.getPath ->
size.longValue()))
+
+ val existing = (committed ++ staged).toMap
+ val matches = requested
+ .collect { case (path, size) if existing.get(path).contains(size) =>
path }
Review Comment:
The backend matches on the normalized path and returns that normalized key,
but the frontend compares against the original item.name. Suggest either
echoing back the original request path from the backend (use the original path
as the returned value), or normalizing symmetrically on the frontend.
##########
frontend/src/app/dashboard/component/user/files-uploader/files-uploader.component.ts:
##########
@@ -201,6 +237,27 @@ export class FilesUploaderComponent {
return out;
}
+ private async resolveExistingFiles(items: FileUploadItem[], existingPaths:
string[]): Promise<FileUploadItem[]> {
+ const existing = new Set(existingPaths ?? []);
Review Comment:
frontend compares against the original item.name.
--
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]
