carloea2 commented on code in PR #4146:
URL: https://github.com/apache/texera/pull/4146#discussion_r2669505395
##########
file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala:
##########
@@ -715,7 +727,55 @@ class DatasetResource {
if (session == null)
throw new NotFoundException("Upload session not found. Call type=init
first.")
- val expectedParts = session.getNumPartsRequested
+ val expectedParts: Int = session.getNumPartsRequested
+ val fileSizeBytesValue: Long = session.getFileSizeBytes
+ val partSizeBytesValue: Long = session.getPartSizeBytes
+
+ if (fileSizeBytesValue <= 0L) {
+ throw new WebApplicationException(
+ "Upload session has invalid file_size_bytes. Re-init the upload.",
+ Response.Status.INTERNAL_SERVER_ERROR
+ )
+ }
+ if (partSizeBytesValue <= 0L) {
+ throw new WebApplicationException(
+ "Upload session has invalid part size bytes value. Re-init the
upload.",
+ Response.Status.INTERNAL_SERVER_ERROR
+ )
+ }
+
+ // lastPartSize = fileSize - partSize*(expectedParts-1)
+ val nMinus1: Long = expectedParts.toLong - 1L
+ if (nMinus1 < 0L) {
+ throw new WebApplicationException(
+ "Upload session has invalid num_parts_requested. Re-init the
upload.",
+ Response.Status.INTERNAL_SERVER_ERROR
+ )
+ }
+ if (nMinus1 > 0L && partSizeBytesValue > Long.MaxValue / nMinus1) {
+ throw new WebApplicationException(
+ "Overflow while computing last part size",
+ Response.Status.INTERNAL_SERVER_ERROR
+ )
+ }
+ val prefixBytes: Long = partSizeBytesValue * nMinus1
+ if (prefixBytes > fileSizeBytesValue) {
+ throw new WebApplicationException(
+ "Upload session is inconsistent (prefixBytes > fileSizeBytes).
Re-init the upload.",
Review Comment:
I have changed them, can you let me now if they are still complex?
##########
file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala:
##########
@@ -715,7 +727,55 @@ class DatasetResource {
if (session == null)
throw new NotFoundException("Upload session not found. Call type=init
first.")
- val expectedParts = session.getNumPartsRequested
+ val expectedParts: Int = session.getNumPartsRequested
+ val fileSizeBytesValue: Long = session.getFileSizeBytes
+ val partSizeBytesValue: Long = session.getPartSizeBytes
+
+ if (fileSizeBytesValue <= 0L) {
+ throw new WebApplicationException(
+ "Upload session has invalid file_size_bytes. Re-init the upload.",
+ Response.Status.INTERNAL_SERVER_ERROR
+ )
+ }
+ if (partSizeBytesValue <= 0L) {
+ throw new WebApplicationException(
+ "Upload session has invalid part size bytes value. Re-init the
upload.",
+ Response.Status.INTERNAL_SERVER_ERROR
+ )
+ }
+
+ // lastPartSize = fileSize - partSize*(expectedParts-1)
+ val nMinus1: Long = expectedParts.toLong - 1L
+ if (nMinus1 < 0L) {
+ throw new WebApplicationException(
+ "Upload session has invalid num_parts_requested. Re-init the
upload.",
+ Response.Status.INTERNAL_SERVER_ERROR
+ )
+ }
+ if (nMinus1 > 0L && partSizeBytesValue > Long.MaxValue / nMinus1) {
+ throw new WebApplicationException(
+ "Overflow while computing last part size",
+ Response.Status.INTERNAL_SERVER_ERROR
+ )
+ }
+ val prefixBytes: Long = partSizeBytesValue * nMinus1
+ if (prefixBytes > fileSizeBytesValue) {
+ throw new WebApplicationException(
+ "Upload session is inconsistent (prefixBytes > fileSizeBytes).
Re-init the upload.",
Review Comment:
Thanks
--
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]
