1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into hundin.mysql.fi:/home/marko/mysql-4.1
This commit is contained in:
unknown 2005-06-28 15:33:41 +03:00
commit dadf91f0ff
3 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
innobase/fil/fil0fil.c
View File

@ -3400,9 +3400,9 @@ fil_extend_space_to_desired_size(
fil_space_t* space; fil_space_t* space;
byte* buf2; byte* buf2;
byte* buf; byte* buf;
ulint buf_size;
ulint start_page_no; ulint start_page_no;
ulint file_start_page_no; ulint file_start_page_no;
ulint n_pages;
ulint offset_high; ulint offset_high;
ulint offset_low; ulint offset_low;
ibool success = TRUE; ibool success = TRUE;
@ -3427,22 +3427,20 @@ fil_extend_space_to_desired_size(
fil_node_prepare_for_io(node, system, space); fil_node_prepare_for_io(node, system, space);
/* Extend 1 MB at a time */
buf2 = mem_alloc(1024 * 1024 + UNIV_PAGE_SIZE);
buf = ut_align(buf2, UNIV_PAGE_SIZE);
memset(buf, '\0', 1024 * 1024);
start_page_no = space->size; start_page_no = space->size;
file_start_page_no = space->size - node->size; file_start_page_no = space->size - node->size;
while (start_page_no < size_after_extend) { /* Extend at most 64 pages at a time */
n_pages = size_after_extend - start_page_no; buf_size = ut_min(64, size_after_extend - start_page_no)
* UNIV_PAGE_SIZE;
buf2 = mem_alloc(buf_size + UNIV_PAGE_SIZE);
buf = ut_align(buf2, UNIV_PAGE_SIZE);
if (n_pages > (1024 * 1024) / UNIV_PAGE_SIZE) { memset(buf, 0, buf_size);
n_pages = (1024 * 1024) / UNIV_PAGE_SIZE;
} while (start_page_no < size_after_extend) {
ulint n_pages = ut_min(buf_size / UNIV_PAGE_SIZE,
size_after_extend - start_page_no);
offset_high = (start_page_no - file_start_page_no) offset_high = (start_page_no - file_start_page_no)
/ (4096 * ((1024 * 1024) / UNIV_PAGE_SIZE)); / (4096 * ((1024 * 1024) / UNIV_PAGE_SIZE));

2
innobase/include/os0file.h
View File

@ -368,7 +368,7 @@ os_file_get_size_as_iblonglong(
/* out: size in bytes, -1 if error */ /* out: size in bytes, -1 if error */
os_file_t file); /* in: handle to a file */ os_file_t file); /* in: handle to a file */
/*************************************************************************** /***************************************************************************
Sets a file size. This function can be used to extend or truncate a file. */ Write the specified number of zeros to a newly created file. */
ibool ibool
os_file_set_size( os_file_set_size(

55
innobase/os/os0file.c
View File

@ -1642,7 +1642,7 @@ os_file_get_size_as_iblonglong(
} }
/*************************************************************************** /***************************************************************************
Sets a file size. This function can be used to extend or truncate a file. */ Write the specified number of zeros to a newly created file. */
ibool ibool
os_file_set_size( os_file_set_size(
@ -1655,47 +1655,46 @@ os_file_set_size(
size */ size */
ulint size_high)/* in: most significant 32 bits of size */ ulint size_high)/* in: most significant 32 bits of size */
{ {
ib_longlong offset; ib_longlong current_size;
ib_longlong low; ib_longlong desired_size;
ulint n_bytes;
ibool ret; ibool ret;
byte* buf; byte* buf;
byte* buf2; byte* buf2;
ulint i; ulint buf_size;
ut_a(size == (size & 0xFFFFFFFF)); ut_a(size == (size & 0xFFFFFFFF));
/* We use a very big 8 MB buffer in writing because Linux may be current_size = 0;
extremely slow in fsync on 1 MB writes */ desired_size = (ib_longlong)size + (((ib_longlong)size_high) << 32);
buf2 = ut_malloc(UNIV_PAGE_SIZE * 513); /* Write up to 1 megabyte at a time. */
buf_size = ut_min(64, (ulint) (desired_size / UNIV_PAGE_SIZE))
* UNIV_PAGE_SIZE;
buf2 = ut_malloc(buf_size + UNIV_PAGE_SIZE);
/* Align the buffer for possible raw i/o */ /* Align the buffer for possible raw i/o */
buf = ut_align(buf2, UNIV_PAGE_SIZE); buf = ut_align(buf2, UNIV_PAGE_SIZE);
/* Write buffer full of zeros */ /* Write buffer full of zeros */
for (i = 0; i < UNIV_PAGE_SIZE * 512; i++) { memset(buf, 0, buf_size);
buf[i] = '\0';
}
offset = 0; if (desired_size >= (ib_longlong)(100 * 1024 * 1024)) {
low = (ib_longlong)size + (((ib_longlong)size_high) << 32);
if (low >= (ib_longlong)(100 * 1024 * 1024)) {
fprintf(stderr, "InnoDB: Progress in MB:"); fprintf(stderr, "InnoDB: Progress in MB:");
} }
while (offset < low) { while (current_size < desired_size) {
if (low - offset < UNIV_PAGE_SIZE * 512) { ulint n_bytes;
n_bytes = (ulint)(low - offset);
} else { if (desired_size - current_size < (ib_longlong) buf_size) {
n_bytes = UNIV_PAGE_SIZE * 512; n_bytes = (ulint) (desired_size - current_size);
} } else {
n_bytes = buf_size;
}
ret = os_file_write(name, file, buf, ret = os_file_write(name, file, buf,
(ulint)(offset & 0xFFFFFFFF), (ulint)(current_size & 0xFFFFFFFF),
(ulint)(offset >> 32), (ulint)(current_size >> 32),
n_bytes); n_bytes);
if (!ret) { if (!ret) {
ut_free(buf2); ut_free(buf2);
@ -1703,18 +1702,18 @@ os_file_set_size(
} }
/* Print about progress for each 100 MB written */ /* Print about progress for each 100 MB written */
if ((offset + n_bytes) / (ib_longlong)(100 * 1024 * 1024) if ((current_size + n_bytes) / (ib_longlong)(100 * 1024 * 1024)
!= offset / (ib_longlong)(100 * 1024 * 1024)) { != current_size / (ib_longlong)(100 * 1024 * 1024)) {
fprintf(stderr, " %lu00", fprintf(stderr, " %lu00",
(ulong) ((offset + n_bytes) (ulong) ((current_size + n_bytes)
/ (ib_longlong)(100 * 1024 * 1024))); / (ib_longlong)(100 * 1024 * 1024)));
} }
offset += n_bytes; current_size += n_bytes;
} }
if (low >= (ib_longlong)(100 * 1024 * 1024)) { if (desired_size >= (ib_longlong)(100 * 1024 * 1024)) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }