lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-04-05 20:31:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add mdb_find_row function

Browse Source
This commit is contained in:
whydoubt 2005-03-07 04:28:12 +00:00
parent 3f79bc4884
commit 3153f5dd1e
6 changed files with 70 additions and 64 deletions

5
ChangeLog
View File

@ -1,5 +1,10 @@
Sun Mar 6 22:09:09 CST 2005 Jeff Smith <whydoubt@yahoo.com>
* src/libmdb/table.c: Fix memory leak
* include/mdbtools.h:
* src/libmdb/data.c:
* src/libmdb/write.c:
* src/util/prfreemap.c:
* src/util/prindex.c: Add mdb_find_row function
Fri Feb 25 23:02:42 CST 2005 Jeff Smith <whydoubt@yahoo.com>
* src/libmdb/money.c: Fix bad declaration

1
include/mdbtools.h
View File

@ -443,6 +443,7 @@ extern int mdb_fetch_row(MdbTableDef *table);
extern int mdb_is_fixed_col(MdbColumn *col);
extern char *mdb_col_to_string(MdbHandle *mdb, unsigned char *buf, int start, int datatype, int size);
extern int mdb_find_pg_row(MdbHandle *mdb, int pg_row, char **buf, int *off, int *len);
extern int mdb_find_row(MdbHandle *mdb, int row, int *start, int *len);
extern int mdb_find_end_of_row(MdbHandle *mdb, int row);
extern int mdb_col_fixed_size(MdbColumn *col);
extern int mdb_col_disp_size(MdbColumn *col);

69
src/libmdb/data.c
View File

@ -96,47 +96,57 @@ int mdb_find_pg_row(MdbHandle *mdb, int pg_row, char **buf, int *off, int *len)
if (mdb_read_alt_pg(mdb, pg) != mdb->fmt->pg_size)
return 1;
mdb_swap_pgbuf(mdb);
*off = mdb_pg_get_int16(mdb, mdb->fmt->row_count_offset + 2 + (row*2));
*len = mdb_find_end_of_row(mdb, row) - *off + 1;
mdb_find_row(mdb, row, off, len);
mdb_swap_pgbuf(mdb);
*buf = mdb->alt_pg_buf;
return 0;
}
int mdb_find_row(MdbHandle *mdb, int row, int *start, int *len)
{
int rco = mdb->fmt->row_count_offset;
int next_start;
if (row > 1000) return -1;
*start = mdb_get_int16(mdb->pg_buf, rco + 2 + row*2);
next_start = (row == 0) ? mdb->fmt->pg_size :
mdb_get_int16(mdb->pg_buf, rco + row*2) & OFFSET_MASK;
*len = next_start - *start;
return 0;
}
int
mdb_find_end_of_row(MdbHandle *mdb, int row)
{
MdbFormatConstants *fmt = mdb->fmt;
int rco = mdb->fmt->row_count_offset;
int row_end;
/* Search the previous "row start" values for the first non-'lookupflag' one.
* If we don't find one, then the end of the page is the correct value.
*/
#if 1
if (row==0) {
row_end = fmt->pg_size - 1;
} else {
row_end = (mdb_pg_get_int16(mdb, ((fmt->row_count_offset + 2) + (row - 1) * 2)) & OFFSET_MASK) - 1;
}
return row_end;
#else
int i, row_start;
if (row > 1000) return -1;
/* if lookupflag is not set, it's good (deleteflag is ok) */
for (i = row - 1; i >= 0; i--) {
row_start = mdb_pg_get_int16(mdb, ((fmt->row_count_offset + 2) + i * 2));
row_end = (row == 0) ? mdb->fmt->pg_size :
mdb_get_int16(mdb->pg_buf, rco + row*2) & OFFSET_MASK;
#else
/* Search the previous "row start" values for the first non-'lookupflag'
* one. If we don't find one, then the end of the page is the correct
* value.
*/
int i, row_start;
if (row > 1000) return -1;
/* if lookupflag is not set, it's good (deleteflag is ok) */
for (i = row; i > 0; i--) {
row_start = mdb_get_int16(mdb->pg_buf, (rco + i*2));
if (!(row_start & 0x8000)) {
break;
}
}
if (i == -1) {
row_end = fmt->pg_size - 1;
} else {
row_end = (row_start & OFFSET_MASK) - 1;
}
return row_end;
row_end = (i == 0) ? mdb->fmt->pg_size : row_start & OFFSET_MASK;
#endif
return row_end - 1;
}
int mdb_is_null(unsigned char *null_mask, int col_num)
{
@ -226,7 +236,7 @@ int mdb_read_row(MdbTableDef *table, unsigned int row)
MdbColumn *col;
unsigned int i;
int rc;
int row_start, row_end;
int row_start, row_size;
int delflag, lookupflag;
MdbField fields[256];
int num_fields;
@ -234,8 +244,7 @@ int mdb_read_row(MdbTableDef *table, unsigned int row)
if (table->num_rows == 0)
return 0;
row_start = mdb_pg_get_int16(mdb, (fmt->row_count_offset + 2) + (row*2));
row_end = mdb_find_end_of_row(mdb, row);
mdb_find_row(mdb, row, &row_start, &row_size);
delflag = lookupflag = 0;
if (row_start & 0x8000) lookupflag++;
@ -243,17 +252,17 @@ int mdb_read_row(MdbTableDef *table, unsigned int row)
row_start &= OFFSET_MASK; /* remove flags */
#if MDB_DEBUG
fprintf(stdout,"Row %d bytes %d to %d %s %s\n",
row, row_start, row_end,
row, row_start, row_start + row_size - 1,
lookupflag ? "[lookup]" : "",
delflag ? "[delflag]" : "");
#endif
if (!table->noskip_del && delflag) {
row_end = row_start-1;
return 0;
}
num_fields = mdb_crack_row(table, row_start, row_end, fields);
num_fields = mdb_crack_row(table, row_start, row_start + row_size - 1,
fields);
if (!mdb_test_sargs(table, fields, num_fields)) return 0;
#if MDB_DEBUG
@ -261,7 +270,7 @@ int mdb_read_row(MdbTableDef *table, unsigned int row)
#endif
#if MDB_DEBUG
buffer_dump(mdb->pg_buf, row_start, row_end);
buffer_dump(mdb->pg_buf, row_start, row_start + row_size - 1);
#endif
/* take advantage of mdb_crack_row() to clean up binding */

42
src/libmdb/write.c
View File

@ -593,7 +593,7 @@ guint16
mdb_add_row_to_pg(MdbTableDef *table, unsigned char *row_buffer, int new_row_size)
{
unsigned char *new_pg;
int num_rows, i, pos, row_start, row_end, row_size;
int num_rows, i, pos, row_start, row_size;
MdbCatalogEntry *entry = table->entry;
MdbHandle *mdb = entry->mdb;
MdbFormatConstants *fmt = mdb->fmt;
@ -622,9 +622,7 @@ mdb_add_row_to_pg(MdbTableDef *table, unsigned char *row_buffer, int new_row_siz
/* copy existing rows */
for (i=0;i<num_rows;i++) {
row_start = mdb_pg_get_int16(mdb, (fmt->row_count_offset + 2) + (i*2));
row_end = mdb_find_end_of_row(mdb, i);
row_size = row_end - row_start + 1;
mdb_find_row(mdb, i, &row_start, &row_size);
pos -= row_size;
memcpy(&new_pg[pos], &mdb->pg_buf[row_start], row_size);
_mdb_put_int16(new_pg, (fmt->row_count_offset + 2) + (i*2), pos);
@ -670,9 +668,8 @@ unsigned int num_fields;
fprintf(stderr, "File is not open for writing\n");
return 0;
}
row_start = mdb_pg_get_int16(mdb, (fmt->row_count_offset + 2) + ((table->cur_row-1)*2));
row_end = mdb_find_end_of_row(mdb, table->cur_row-1);
old_row_size = row_end - row_start;
mdb_find_row(mdb, table->cur_row-1, &row_start, &old_row_size);
row_end = row_start + old_row_size - 1;
row_start &= 0x0FFF; /* remove flags */
@ -719,58 +716,55 @@ mdb_replace_row(MdbTableDef *table, int row, unsigned char *new_row, int new_row
{
MdbCatalogEntry *entry = table->entry;
MdbHandle *mdb = entry->mdb;
MdbFormatConstants *fmt = mdb->fmt;
int pg_size = mdb->fmt->pg_size;
int rco = mdb->fmt->row_count_offset;
unsigned char *new_pg;
guint16 num_rows;
int row_start, row_end, row_size;
int row_start, row_size;
int i, pos;
if (mdb_get_option(MDB_DEBUG_WRITE)) {
buffer_dump(mdb->pg_buf, 0, 39);
buffer_dump(mdb->pg_buf, fmt->pg_size - 160, fmt->pg_size-1);
buffer_dump(mdb->pg_buf, pg_size - 160, pg_size-1);
}
mdb_debug(MDB_DEBUG_WRITE,"updating row %d on page %lu", row, (unsigned long) table->cur_phys_pg);
new_pg = mdb_new_data_pg(entry);
num_rows = mdb_pg_get_int16(mdb, fmt->row_count_offset);
_mdb_put_int16(new_pg, fmt->row_count_offset, num_rows);
num_rows = mdb_pg_get_int16(mdb, rco);
_mdb_put_int16(new_pg, rco, num_rows);
pos = mdb->fmt->pg_size;
pos = pg_size;
/* rows before */
for (i=0;i<row;i++) {
row_start = mdb_pg_get_int16(mdb, (fmt->row_count_offset + 2) + (i*2));
row_end = mdb_find_end_of_row(mdb, i);
row_size = row_end - row_start + 1;
mdb_find_row(mdb, i, &row_start, &row_size);
pos -= row_size;
memcpy(&new_pg[pos], &mdb->pg_buf[row_start], row_size);
_mdb_put_int16(new_pg, (fmt->row_count_offset + 2) + (i*2), pos);
_mdb_put_int16(new_pg, rco + 2 + i*2, pos);
}
/* our row */
pos -= new_row_size;
memcpy(&new_pg[pos], new_row, new_row_size);
_mdb_put_int16(new_pg, (fmt->row_count_offset + 2) + (row*2), pos);
_mdb_put_int16(new_pg, rco + 2 + row*2, pos);
/* rows after */
for (i=row+1;i<num_rows;i++) {
row_start = mdb_pg_get_int16(mdb, (fmt->row_count_offset + 2) + (i*2));
row_end = mdb_find_end_of_row(mdb, i);
row_size = row_end - row_start + 1;
mdb_find_row(mdb, i, &row_start, &row_size);
pos -= row_size;
memcpy(&new_pg[pos], &mdb->pg_buf[row_start], row_size);
_mdb_put_int16(new_pg, (fmt->row_count_offset + 2) + (i*2), pos);
_mdb_put_int16(new_pg, rco + 2 + i*2, pos);
}
/* almost done, copy page over current */
memcpy(mdb->pg_buf, new_pg, fmt->pg_size);
memcpy(mdb->pg_buf, new_pg, pg_size);
g_free(new_pg);
_mdb_put_int16(mdb->pg_buf, 2, mdb_pg_get_freespace(mdb));
if (mdb_get_option(MDB_DEBUG_WRITE)) {
buffer_dump(mdb->pg_buf, 0, 39);
buffer_dump(mdb->pg_buf, fmt->pg_size - 160, fmt->pg_size-1);
buffer_dump(mdb->pg_buf, pg_size - 160, pg_size-1);
}
/* drum roll, please */
if (!mdb_write_pg(mdb, table->cur_phys_pg)) {

7
src/util/prfreemap.c
View File

@ -25,7 +25,7 @@ main(int argc, char **argv)
{
MdbHandle *mdb;
int j;
long int pgnum = 0, row_start, row_end, map_sz;
long int pgnum = 0, row_start, map_sz;
int coln = 1;
unsigned char *map_buf;
@ -38,10 +38,9 @@ unsigned char *map_buf;
mdb = mdb_open(argv[1], MDB_NOFLAGS);
mdb_read_pg (mdb, 1);
row_start = mdb_get_int16(mdb, (mdb->fmt->row_count_offset + 2));
row_end = mdb_find_end_of_row(mdb, 0);
mdb_find_row(mdb, 0, &row_start, &map_sz);
map_buf = &mdb->pg_buf[row_start];
map_sz = row_end - row_start;
map_sz --;
/*
* trim the end of a type 0 map
*/

10
src/util/prindex.c
View File

@ -79,20 +79,18 @@ page_name(int page_type)
void check_row(MdbHandle *mdb, MdbIndex *idx, guint32 pg, int row, unsigned char *idxrow, int len)
{
MdbField fields[256];
MdbFormatConstants *fmt;
unsigned int num_fields, i, j;
int row_start, row_end;
int row_start, row_size;
MdbColumn *col;
guchar buf[256], key[256];
int elem;
MdbTableDef *table = idx->table;
fmt = mdb->fmt;
mdb_read_pg(mdb, pg);
row_start = mdb_pg_get_int16(mdb, (fmt->row_count_offset + 2) + (row*2));
row_end = mdb_find_end_of_row(mdb, row);
mdb_find_row(mdb, row, &row_start, &row_size);
num_fields = mdb_crack_row(table, row_start, row_end, fields);
num_fields = mdb_crack_row(table, row_start, row_start + row_size - 1,
fields);
for (i=0;i<idx->num_keys;i++) {
col=g_ptr_array_index(table->columns,idx->key_col_num[i]-1);
if (col->col_type==MDB_TEXT) {