haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-19 01:17:26 +00:00
Code Issues Releases Wiki Activity

Use 8MB as block size for files uploaded from web.

Browse Source
This commit is contained in:
Jonathan Xu
2017-06-30 16:48:52 +08:00
parent 961e570653
commit 2597fa4df5
4 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/cdc/cdc.c
View File

@@ -22,6 +22,15 @@
#define finger rabin_checksum #define finger rabin_checksum
#define rolling_finger rabin_rolling_checksum #define rolling_finger rabin_rolling_checksum
#define BLOCK_SZ (1024*1024*1)
#define BLOCK_MIN_SZ (1024*256)
#define BLOCK_MAX_SZ (1024*1024*4)
#define BLOCK_WIN_SZ 48
#define NAME_MAX_SZ 4096
#define BREAK_VALUE 0x0013 ///0x0513
#define READ_SIZE 1024 * 4 #define READ_SIZE 1024 * 4
#define BYTE_TO_HEX(b) (((b)>=10)?('a'+b-10):('0'+b)) #define BYTE_TO_HEX(b) (((b)>=10)?('a'+b-10):('0'+b))

10
common/cdc/cdc.h
View File

@@ -6,16 +6,6 @@
#include <glib.h> #include <glib.h>
#include <stdint.h> #include <stdint.h>
#define BLOCK_SZ (1024*1024*1)
#define BLOCK_MIN_SZ (1024*256)
#define BLOCK_MAX_SZ (1024*1024*4)
#define BLOCK_WIN_SZ 48
#define NAME_MAX_SZ 4096
#define BREAK_VALUE 0x0013 ///0x0513
#ifdef HAVE_MD5 #ifdef HAVE_MD5
#include "md5.h" #include "md5.h"
#define get_checksum md5 #define get_checksum md5

16
common/fs-mgr.c
View File

@@ -761,6 +761,10 @@ out:
#endif /* SEAFILE_SERVER */ #endif /* SEAFILE_SERVER */
#define CDC_AVERAGE_BLOCK_SIZE (1 << 23) /* 8MB */
#define CDC_MIN_BLOCK_SIZE (6 * (1 << 20)) /* 6MB */
#define CDC_MAX_BLOCK_SIZE (10 * (1 << 20)) /* 10MB */
int int
seaf_fs_manager_index_blocks (SeafFSManager *mgr, seaf_fs_manager_index_blocks (SeafFSManager *mgr,
const char *repo_id, const char *repo_id,
@@ -791,9 +795,9 @@ seaf_fs_manager_index_blocks (SeafFSManager *mgr,
#if defined SEAFILE_SERVER && defined FULL_FEATURE #if defined SEAFILE_SERVER && defined FULL_FEATURE
if (use_cdc || version == 0) { if (use_cdc || version == 0) {
cdc.block_sz = calculate_chunk_size (sb.st_size); cdc.block_sz = CDC_AVERAGE_BLOCK_SIZE;
cdc.block_min_sz = cdc.block_sz >> 2; cdc.block_min_sz = CDC_MIN_BLOCK_SIZE;
cdc.block_max_sz = cdc.block_sz << 2; cdc.block_max_sz = CDC_MAX_BLOCK_SIZE;
cdc.write_block = seafile_write_chunk; cdc.write_block = seafile_write_chunk;
memcpy (cdc.repo_id, repo_id, 36); memcpy (cdc.repo_id, repo_id, 36);
cdc.version = version; cdc.version = version;
@@ -811,9 +815,9 @@ seaf_fs_manager_index_blocks (SeafFSManager *mgr,
} }
} }
#else #else
cdc.block_sz = calculate_chunk_size (sb.st_size); cdc.block_sz = CDC_AVERAGE_BLOCK_SIZE;
cdc.block_min_sz = cdc.block_sz >> 2; cdc.block_min_sz = CDC_MIN_BLOCK_SIZE;
cdc.block_max_sz = cdc.block_sz << 2; cdc.block_max_sz = CDC_MAX_BLOCK_SIZE;
cdc.write_block = seafile_write_chunk; cdc.write_block = seafile_write_chunk;
memcpy (cdc.repo_id, repo_id, 36); memcpy (cdc.repo_id, repo_id, 36);
cdc.version = version; cdc.version = version;

5
server/http-server.c
View File

@@ -33,6 +33,7 @@
#define DEFAULT_THREADS 50 #define DEFAULT_THREADS 50
#define DEFAULT_MAX_DOWNLOAD_DIR_SIZE 100 * ((gint64)1 << 20) /* 100MB */ #define DEFAULT_MAX_DOWNLOAD_DIR_SIZE 100 * ((gint64)1 << 20) /* 100MB */
#define DEFAULT_MAX_INDEXING_THREADS 1 #define DEFAULT_MAX_INDEXING_THREADS 1
#define DEFAULT_FIXED_BLOCK_SIZE ((gint64)1 << 23) /* 8MB */
#define HOST "host" #define HOST "host"
#define PORT "port" #define PORT "port"
@@ -150,11 +151,11 @@ load_http_config (HttpServerStruct *htp_server, SeafileSession *session)
"fixed_block_size", "fixed_block_size",
&error); &error);
if (error){ if (error){
htp_server->fixed_block_size = BLOCK_SZ; htp_server->fixed_block_size = DEFAULT_FIXED_BLOCK_SIZE;
g_clear_error(&error); g_clear_error(&error);
} else { } else {
if (fixed_block_size_mb <= 0) if (fixed_block_size_mb <= 0)
htp_server->fixed_block_size = BLOCK_SZ; htp_server->fixed_block_size = DEFAULT_FIXED_BLOCK_SIZE;
else else
htp_server->fixed_block_size = fixed_block_size_mb * ((gint64)1 << 20); htp_server->fixed_block_size = fixed_block_size_mb * ((gint64)1 << 20);
} }