database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Added tests for archive. Cleaned up a merge mistake and added some information on how well archive compresses.

Browse Source 
sql/examples/ha_archive.cc:
  Added in example information from testing archive with Slashdot's comments.
sql/handler.h:
  Fixed broken merge.
sql/set_var.cc:
  Adding in "have_archive" to variables shown to make tests work.
This commit is contained in:
unknown
2004-05-25 13:27:01 -07:00
parent 64285a73ff
commit 9a162f9abd
7 changed files with 2719 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/have_archive.inc Normal file
View File

@ -0,0 +1,4 @@
-- require r/have_archive.require
disable_query_log;
show variables like "have_archive";
enable_query_log;

1396
mysql-test/r/archive.result Normal file
View File

File diff suppressed because it is too large Load Diff

2
mysql-test/r/have_archive.require Normal file
View File

@ -0,0 +1,2 @@
Variable_name Value
have_archive YES

1300
mysql-test/t/archive.test Normal file
View File

File diff suppressed because it is too large Load Diff

18
sql/examples/ha_archive.cc
View File

@ -53,6 +53,18 @@
to be any faster. For writes it is always a bit slower then MyISAM. It has no to be any faster. For writes it is always a bit slower then MyISAM. It has no
internal limits though for row length. internal limits though for row length.
Examples between MyISAM and Archive.
Table with 76695844 identical rows:
29680807 a_archive.ARZ
920350317 a.MYD
Table with 8991478 rows (all of Slashdot's comments):
1922964506 comment_archive.ARZ
2944970297 comment_text.MYD
TODO: TODO:
Add bzip optional support. Add bzip optional support.
Allow users to set compression level. Allow users to set compression level.
@ -225,7 +237,7 @@ int ha_archive::close(void)
if (gzclose(archive) == Z_ERRNO) if (gzclose(archive) == Z_ERRNO)
rc =-1; rc =-1;
rc |= free_share(share); rc |= free_share(share);
DBUG_RETURN(); DBUG_RETURN(rc);
} }
@ -276,7 +288,7 @@ int ha_archive::write_row(byte * buf)
statistic_increment(ha_write_count,&LOCK_status); statistic_increment(ha_write_count,&LOCK_status);
if (table->timestamp_default_now) if (table->timestamp_default_now)
update_timestamp(record+table->timestamp_default_now-1); update_timestamp(buf+table->timestamp_default_now-1);
written = gzwrite(share->archive_write, buf, table->reclength); written = gzwrite(share->archive_write, buf, table->reclength);
share->dirty= true; share->dirty= true;
if (written == 0 || written != table->reclength) if (written == 0 || written != table->reclength)
@ -335,7 +347,7 @@ int ha_archive::rnd_init(bool scan)
intact. intact.
*/ */
read= gzread(archive, &version, sizeof(version)); read= gzread(archive, &version, sizeof(version));
if (written == 0 || written != sizeof(version)) if (read == 0 || read != sizeof(version))
DBUG_RETURN(-1); DBUG_RETURN(-1);
records = 0; records = 0;
DBUG_RETURN(0); DBUG_RETURN(0);

2
sql/handler.h
View File

@ -158,7 +158,7 @@ enum db_type
DB_TYPE_MRG_ISAM, DB_TYPE_MYISAM, DB_TYPE_MRG_MYISAM, DB_TYPE_MRG_ISAM, DB_TYPE_MYISAM, DB_TYPE_MRG_MYISAM,
DB_TYPE_BERKELEY_DB, DB_TYPE_INNODB, DB_TYPE_BERKELEY_DB, DB_TYPE_INNODB,
DB_TYPE_GEMINI, DB_TYPE_NDBCLUSTER, DB_TYPE_GEMINI, DB_TYPE_NDBCLUSTER,
DB_TYPE_EXAMPLE_DB, DB_TYPE_EXAMPLE_DB, DB_TYPE_ARCHIVE_DB,
DB_TYPE_DEFAULT // Must be last DB_TYPE_DEFAULT // Must be last
}; };

1
sql/set_var.cc
View File

@ -639,6 +639,7 @@ struct show_var_st init_vars[]= {
{"ft_query_expansion_limit",(char*) &ft_query_expansion_limit, SHOW_LONG}, {"ft_query_expansion_limit",(char*) &ft_query_expansion_limit, SHOW_LONG},
{"ft_stopword_file", (char*) &ft_stopword_file, SHOW_CHAR_PTR}, {"ft_stopword_file", (char*) &ft_stopword_file, SHOW_CHAR_PTR},
{sys_group_concat_max_len.name, (char*) &sys_group_concat_max_len, SHOW_SYS}, {sys_group_concat_max_len.name, (char*) &sys_group_concat_max_len, SHOW_SYS},
{"have_archive", (char*) &have_archive_db, SHOW_HAVE},
{"have_bdb", (char*) &have_berkeley_db, SHOW_HAVE}, {"have_bdb", (char*) &have_berkeley_db, SHOW_HAVE},
{"have_compress", (char*) &have_compress, SHOW_HAVE}, {"have_compress", (char*) &have_compress, SHOW_HAVE},
{"have_crypt", (char*) &have_crypt, SHOW_HAVE}, {"have_crypt", (char*) &have_crypt, SHOW_HAVE},