fix: byte

PKUHPC · Aug 9, 2024 · df83c01 · df83c01
1 parent 47aca6c
commit df83c01
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/apps/portal-web/src/pageComponents/filemanager/UploadModal.tsx b/apps/portal-web/src/pageComponents/filemanager/UploadModal.tsx
@@ -65,7 +65,7 @@ export const UploadModal: React.FC<Props> = ({ open, onClose, path, reload, clus
   };
 
   const startMultipartUpload = async (file: File, onProgress: OnProgressCallback) => {
-    const { tempFileDir, chunkSize, filesInfo } = await api.initMultipartUpload({
+    const { tempFileDir, chunkSizeByte, filesInfo } = await api.initMultipartUpload({
       body: { cluster, path, name: file.name },
     });
 
@@ -81,7 +81,7 @@ export const UploadModal: React.FC<Props> = ({ open, onClose, path, reload, clus
       }
     }).map((item) => item.name);
 
-    const totalCount = Math.ceil(file.size / chunkSize);
+    const totalCount = Math.ceil(file.size / chunkSizeByte);
     const concurrentChunks = 3;
     let uploadedCount = uploadedChunks.length;
 
@@ -105,7 +105,7 @@ export const UploadModal: React.FC<Props> = ({ open, onClose, path, reload, clus
         return;
       }
 
-      const chunk = file.slice(start * chunkSize, (start + 1) * chunkSize);
+      const chunk = file.slice(start * chunkSizeByte, (start + 1) * chunkSizeByte);
       const hash = await calculateBlobSHA256(chunk);
       const fileName = `${hash}_${start + 1}.scowuploadtemp`;
 
@@ -140,7 +140,7 @@ export const UploadModal: React.FC<Props> = ({ open, onClose, path, reload, clus
 
       await Promise.all(uploadPromises);
 
-      await api.mergeFileChunks({ body: { cluster, path, name: file.name, size: file.size } })
+      await api.mergeFileChunks({ body: { cluster, path, name: file.name, sizeByte: file.size } })
         .httpError(520, (err) => {
           message.error(t(p("mergeFileChunksErrorText"), [file.name]));
           throw err;

diff --git a/apps/portal-web/src/pages/api/file/initMultipartUpload.ts b/apps/portal-web/src/pages/api/file/initMultipartUpload.ts
@@ -37,7 +37,7 @@ export const InitMultipartUploadSchema = typeboxRouteSchema({
   responses: {
     200: Type.Object({
       tempFileDir: Type.String(),
-      chunkSize: Type.Number(),
+      chunkSizeByte: Type.Number(),
       filesInfo: Type.Array(FileInfo),
     }),
     403: Type.Object({ code: Type.Literal("PERMISSION_DENIED") }),

diff --git a/apps/portal-web/src/pages/api/file/mergeFileChunks.ts b/apps/portal-web/src/pages/api/file/mergeFileChunks.ts
@@ -30,7 +30,7 @@ export const MergeFileChunksSchema = typeboxRouteSchema({
     cluster: Type.String(),
     path: Type.String(),
     name: Type.String(),
-    size: Type.Number(),
+    sizeByte: Type.Number(),
   }),
 
   responses: {
@@ -49,7 +49,7 @@ export default route(MergeFileChunksSchema, async (req, res) => {
 
   if (!info) { return; }
 
-  const { cluster, path, name, size } = req.body;
+  const { cluster, path, name, sizeByte } = req.body;
 
   const client = getClient(FileServiceClient);
 
@@ -58,12 +58,12 @@ export default route(MergeFileChunksSchema, async (req, res) => {
     operatorIp: parseIp(req) ?? "",
     operationTypeName: OperationType.mergeFileChunks,
     operationTypePayload:{
-      clusterId: cluster, path, name, size,
+      clusterId: cluster, path, name, sizeByte,
     },
   };
 
   return asyncUnaryCall(client, "mergeFileChunks", {
-    cluster, path, userId: info.identityId, name, size,
+    cluster, path, userId: info.identityId, name, sizeByte,
   }).then(async () => {
     await callLog(logInfo, OperationResult.SUCCESS);
     return { 204: null };

diff --git a/protos/audit/operation_log.proto b/protos/audit/operation_log.proto
@@ -152,7 +152,7 @@ message MergeFileChunks {
   string cluster_id = 1;
   string path = 2;
   string name = 3;
-  uint64 size = 4;
+  uint64 size_byte = 4;
 }
 
 message CreateDirectory {