Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch

into  zim.(none):/home/brian/mysql/archive-format-5.1


storage/archive/Makefile.am:
  Auto merged
storage/archive/archive_test.c:
  Auto merged
storage/archive/azio.c:
  Auto merged
storage/archive/ha_archive.h:
  Auto merged
storage/archive/ha_archive.cc:
  Merge

mysql-test/r/archive.result

-drop table if exists t1,t2,t3;
+drop table if exists t1,t2,t3,t4,t5;
 CREATE TABLE t1 (
 Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,
 Varor_period smallint(4) unsigned DEFAULT '0' NOT NULL

mysql-test/t/archive.test

@@ -6,7 +6,7 @@
 -- source include/have_binlog_format_mixed_or_statement.inc
 
 --disable_warnings
-drop table if exists t1,t2,t3;
+drop table if exists t1,t2,t3,t4,t5;
 --enable_warnings
 
 CREATE TABLE t1 (

storage/archive/Makefile.am

@@ -30,7 +30,7 @@ LDADD =
 DEFS =                  @DEFS@
 
 noinst_HEADERS =	ha_archive.h azlib.h
-noinst_PROGRAMS	=	archive_test
+noinst_PROGRAMS	=	archive_test archive_reader
 
 EXTRA_LTLIBRARIES =	ha_archive.la
 pkglib_LTLIBRARIES =	@plugin_archive_shared_target@
@@ -55,6 +55,14 @@ archive_test_LDADD =	$(top_builddir)/mysys/libmysys.a \
 			@ZLIB_LIBS@
 archive_test_LDFLAGS = @NOINST_LDFLAGS@
 
+archive_reader_SOURCES = archive_reader.c azio.c
+archive_reader_CFLAGS =	$(AM_CFLAGS)
+archive_reader_LDADD =	$(top_builddir)/mysys/libmysys.a \
+			$(top_builddir)/dbug/libdbug.a \
+			$(top_builddir)/strings/libmystrings.a \
+			@ZLIB_LIBS@
+archive_reader_LDFLAGS = @NOINST_LDFLAGS@
+
 
 EXTRA_DIST =		CMakeLists.txt plug.in
 # Don't update the files from bitkeeper

storage/archive/archive_reader.c

+#include "azlib.h"
+#include <string.h>
+#include <assert.h>
+#include <stdio.h>
+
+#define BUFFER_LEN 1024
+
+int main(int argc, char *argv[])
+{
+  unsigned int ret;
+  azio_stream reader_handle;
+
+  MY_INIT(argv[0]);
+
+  if (argc < 2)
+  {
+    printf("No file specified. \n");
+    return 0;
+  }
+
+  if (!(ret= azopen(&reader_handle, argv[1], O_RDONLY|O_BINARY)))
+  {
+    printf("Could not create test file\n");
+    return 0;
+  }
+
+  printf("Version :%u\n", reader_handle.version);
+  printf("Start position :%llu\n", (unsigned long long)reader_handle.start);
+  printf("Block size :%u\n", reader_handle.block_size);
+  printf("Rows: %llu\n", reader_handle.rows);
+  printf("Autoincrement: %llu\n", reader_handle.auto_increment);
+  printf("Check Point: %llu\n", reader_handle.check_point);
+  printf("Forced Flushes: %llu\n", reader_handle.forced_flushes);
+  printf("State: %s\n", ( reader_handle.dirty ? "dirty" : "clean"));
+
+  azclose(&reader_handle);
+
+  return 0;
+}

storage/archive/archive_test.c

@@ -14,50 +14,223 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
 #include "azlib.h"
+#include <string.h>
+#include <assert.h>
 #include <stdio.h>
 
-#define TEST_STRING "This is a test"
+#define TEST_FILENAME "test.az"
+#define TEST_STRING "YOU don't know about me without you have read a book by the name of The Adventures of Tom Sawyer; but that ain't no matter.  That book was made by Mr. Mark Twain, and he told the truth, mainly.  There was things which he stretched, but mainly he told the truth.  That is nothing.  I never seen anybody but lied one time or another, without it was Aunt Polly, or the widow, or maybe Mary.  Aunt Polly--Tom's Aunt Polly, she is--and Mary, and the Widow Douglas is all told about in that book, which is mostly a true book, with some stretchers, as I said before.  Now the way that the book winds up is this:  Tom and me found the money that the robbers hid in the cave, and it made us rich.  We got six thousand dollars apiece--all gold.  It was an awful sight of money when it was piled up.  Well, Judge Thatcher he took it and put it out at interest, and it fetched us a dollar a day apiece all the year round --more than a body could tell what to do with.  The Widow Douglas she took me for her son, and allowed she would..."
+#define TEST_LOOP_NUM 100
 #define BUFFER_LEN 1024
+#define TWOGIG 2147483648
+#define FOURGIG 4294967296
+#define EIGHTGIG 8589934592
 
-int main(int argc __attribute__((unused)), char *argv[])
+/* prototypes */
+int size_test(unsigned long long length, unsigned long long rows_to_test_for);
+
+
+int main(int argc, char *argv[])
 {
-  int ret;
-  azio_stream foo, foo1;
+  unsigned int ret;
+
+  int error;
+  unsigned int x;
+  int written_rows= 0;
+  azio_stream writer_handle, reader_handle;
   char buffer[BUFFER_LEN];
 
+  unlink(TEST_FILENAME);
+
+  if (argc > 1)
+    return 0;
+
   MY_INIT(argv[0]);
 
-  if (!(ret= azopen(&foo, "test", O_CREAT|O_WRONLY|O_TRUNC|O_BINARY)))
+  if (!(ret= azopen(&writer_handle, TEST_FILENAME, O_CREAT|O_RDWR|O_BINARY)))
   {
     printf("Could not create test file\n");
     return 0;
   }
-  azwrite(&foo, TEST_STRING, sizeof(TEST_STRING));
-  azflush(&foo, Z_FINISH);
 
-  if (!(ret= azopen(&foo1, "test", O_RDONLY|O_BINARY)))
+  if (!(ret= azopen(&reader_handle, TEST_FILENAME, O_RDONLY|O_BINARY)))
+  {
+    printf("Could not open test file\n");
+    return 0;
+  }
+
+  assert(reader_handle.rows == 0);
+  assert(reader_handle.auto_increment == 0);
+  assert(reader_handle.check_point == 0);
+  assert(reader_handle.forced_flushes == 0);
+  assert(reader_handle.dirty == 1);
+
+  for (x= 0; x < TEST_LOOP_NUM; x++)
+  {
+    ret= azwrite(&writer_handle, TEST_STRING, BUFFER_LEN);
+    assert(ret == BUFFER_LEN);
+    written_rows++;
+  }
+  azflush(&writer_handle,  Z_SYNC_FLUSH);
+
+  /* Lets test that our internal stats are good */
+  assert(writer_handle.rows == TEST_LOOP_NUM);
+
+  /* Reader needs to be flushed to make sure it is up to date */
+  azflush(&reader_handle,  Z_SYNC_FLUSH);
+  assert(reader_handle.rows == TEST_LOOP_NUM);
+  assert(reader_handle.auto_increment == 0);
+  assert(reader_handle.check_point == 0);
+  assert(reader_handle.forced_flushes == 1);
+  assert(reader_handle.dirty == 1);
+
+  writer_handle.auto_increment= 4;
+  azflush(&writer_handle, Z_SYNC_FLUSH);
+  assert(writer_handle.rows == TEST_LOOP_NUM);
+  assert(writer_handle.auto_increment == 4);
+  assert(writer_handle.check_point == 0);
+  assert(writer_handle.forced_flushes == 2);
+  assert(writer_handle.dirty == 1);
+
+  if (!(ret= azopen(&reader_handle, TEST_FILENAME, O_RDONLY|O_BINARY)))
   {
     printf("Could not open test file\n");
     return 0;
   }
-  ret= azread(&foo1, buffer, BUFFER_LEN);
-  printf("Read %d bytes\n", ret);
-  printf("%s\n", buffer);
-  azrewind(&foo1);
-  azclose(&foo);
-  if (!(ret= azopen(&foo, "test", O_APPEND|O_WRONLY|O_BINARY)))
+
+  /* Read the original data */
+  for (x= 0; x < writer_handle.rows; x++)
+  {
+    ret= azread(&reader_handle, buffer, BUFFER_LEN, &error);
+    assert(!error);
+    assert(ret == BUFFER_LEN);
+    assert(!memcmp(buffer, TEST_STRING, ret));
+  }
+  assert(writer_handle.rows == TEST_LOOP_NUM);
+
+  /* Test here for falling off the planet */
+
+  /* Final Write before closing */
+  ret= azwrite(&writer_handle, TEST_STRING, BUFFER_LEN);
+  assert(ret == BUFFER_LEN);
+
+  /* We don't use FINISH, but I want to have it tested */
+  azflush(&writer_handle,  Z_FINISH);
+
+  assert(writer_handle.rows == TEST_LOOP_NUM+1);
+
+  /* Read final write */
+  azrewind(&reader_handle);
+  for (x= 0; x < writer_handle.rows; x++)
+  {
+    ret= azread(&reader_handle, buffer, BUFFER_LEN, &error);
+    assert(ret == BUFFER_LEN);
+    assert(!error);
+    assert(!memcmp(buffer, TEST_STRING, ret));
+  }
+
+
+  azclose(&writer_handle);
+
+  /* Rewind and full test */
+  azrewind(&reader_handle);
+  for (x= 0; x < writer_handle.rows; x++)
+  {
+    ret= azread(&reader_handle, buffer, BUFFER_LEN, &error);
+    assert(ret == BUFFER_LEN);
+    assert(!error);
+    assert(!memcmp(buffer, TEST_STRING, ret));
+  }
+
+  printf("Finished reading\n");
+
+  if (!(ret= azopen(&writer_handle, TEST_FILENAME, O_RDWR|O_BINARY)))
+  {
+    printf("Could not open file (%s) for appending\n", TEST_FILENAME);
+    return 0;
+  }
+  ret= azwrite(&writer_handle, TEST_STRING, BUFFER_LEN);
+  assert(ret == BUFFER_LEN);
+  azflush(&writer_handle,  Z_SYNC_FLUSH);
+
+  /* Rewind and full test */
+  azrewind(&reader_handle);
+  for (x= 0; x < writer_handle.rows; x++)
+  {
+    ret= azread(&reader_handle, buffer, BUFFER_LEN, &error);
+    assert(!error);
+    assert(ret == BUFFER_LEN);
+    assert(!memcmp(buffer, TEST_STRING, ret));
+  }
+
+  azclose(&writer_handle);
+  azclose(&reader_handle);
+  unlink(TEST_FILENAME);
+
+  /* Start size tests */
+  printf("About to run 2/4/8 gig tests now, you may want to hit CTRL-C\n");
+  size_test(TWOGIG, 2097152);
+  size_test(FOURGIG, 4194304);
+  size_test(EIGHTGIG, 8388608);
+
+  return 0;
+}
+
+int size_test(unsigned long long length, unsigned long long rows_to_test_for)
+{
+  azio_stream writer_handle, reader_handle;
+  unsigned long long write_length;
+  unsigned long long read_length= 0;
+  unsigned int ret;
+  char buffer[BUFFER_LEN];
+  int error;
+
+  if (!(ret= azopen(&writer_handle, TEST_FILENAME, O_CREAT|O_RDWR|O_TRUNC|O_BINARY)))
   {
     printf("Could not create test file\n");
     return 0;
   }
-  azwrite(&foo, TEST_STRING, sizeof(TEST_STRING));
-  azflush(&foo, Z_FINISH);
-  ret= azread(&foo1, buffer, BUFFER_LEN);
-  printf("Read %d bytes\n", ret);
-  printf("%s\n", buffer);
-  azclose(&foo);
-  azclose(&foo1);
 
-  /* unlink("test"); */
+  for (write_length= 0; write_length < length ; write_length+= ret)
+  {
+    ret= azwrite(&writer_handle, TEST_STRING, BUFFER_LEN);
+    if (ret != BUFFER_LEN)
+    {
+      printf("Size %u\n", ret);
+      assert(ret != BUFFER_LEN);
+    }
+    if ((write_length % 14031) == 0)
+    {
+      azflush(&writer_handle,  Z_SYNC_FLUSH);
+    }
+  }
+  assert(write_length == length);
+  azflush(&writer_handle,  Z_SYNC_FLUSH);
+
+  printf("Reading back data\n");
+
+  if (!(ret= azopen(&reader_handle, TEST_FILENAME, O_RDONLY|O_BINARY)))
+  {
+    printf("Could not open test file\n");
+    return 0;
+  }
+
+  while ((ret= azread(&reader_handle, buffer, BUFFER_LEN, &error)))
+  {
+    read_length+= ret;
+    assert(!memcmp(buffer, TEST_STRING, ret));
+    if (ret != BUFFER_LEN)
+    {
+      printf("Size %u\n", ret);
+      assert(ret != BUFFER_LEN);
+    }
+  }
+
+  assert(read_length == length);
+  assert(writer_handle.rows == rows_to_test_for);
+  azclose(&writer_handle);
+  azclose(&reader_handle);
+  unlink(TEST_FILENAME);
+
   return 0;
 }

storage/archive/azlib.h

 /*
   This libary has been modified for use by the MySQL Archive Engine.
+     -Brian Aker
 */
+
 /* zlib.h -- interface of the 'zlib' general purpose compression library
   version 1.2.3, July 18th, 2005
 
@@ -34,10 +36,34 @@
 #include <zlib.h>
 
 #include "../../mysys/mysys_priv.h"
+#include <my_dir.h>
 
 #ifdef  __cplusplus
 extern "C" {
 #endif
+/* Start of MySQL Specific Information */
+
+/*
+  ulonglong + ulonglong + ulonglong + ulonglong + uchar
+*/
+#define AZMETA_BUFFER_SIZE sizeof(unsigned long long) \
+  + sizeof(unsigned long long) + sizeof(unsigned long long) + sizeof(unsigned long long) \
+  + sizeof(unsigned char)
+
+#define AZHEADER_SIZE 20
+
+#define AZ_MAGIC_POS 0
+#define AZ_VERSION_POS 1
+#define AZ_BLOCK_POS 2
+#define AZ_STRATEGY_POS 3
+#define AZ_FRM_POS 4
+#define AZ_META_POS 8
+#define AZ_START_POS 12
+#define AZ_ROW_POS 20
+#define AZ_FLUSH_POS 28
+#define AZ_CHECK_POS 36
+#define AZ_AUTOINCREMENT_POS 44
+#define AZ_DIRTY_POS 52
 
 /*
      The 'zlib' compression library provides in-memory compression and
@@ -152,7 +178,7 @@ extern "C" {
 /* The deflate compression method (the only one supported in this version) */
 
 #define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-#define Z_BUFSIZE 16384
+#define AZ_BUFSIZE 16384
 
 
 typedef struct azio_stream {
@@ -160,8 +186,8 @@ typedef struct azio_stream {
   int      z_err;   /* error code for last stream operation */
   int      z_eof;   /* set if end of input file */
   File     file;   /* .gz file */
-  Byte     inbuf[Z_BUFSIZE];  /* input buffer */
-  Byte     outbuf[Z_BUFSIZE]; /* output buffer */
+  Byte     inbuf[AZ_BUFSIZE];  /* input buffer */
+  Byte     outbuf[AZ_BUFSIZE]; /* output buffer */
   uLong    crc;     /* crc32 of uncompressed data */
   char     *msg;    /* error message */
   int      transparent; /* 1 if input file is not a .gz file */
@@ -171,6 +197,13 @@ typedef struct azio_stream {
   my_off_t  out;     /* bytes out of deflate or inflate */
   int      back;    /* one character push-back */
   int      last;    /* true if push-back is last character */
+  unsigned char version;   /* Version */
+  unsigned int block_size;   /* Block Size */
+  unsigned long long check_point;   /* Last position we checked */
+  unsigned long long forced_flushes;   /* Forced Flushes */
+  unsigned long long rows;   /* rows */
+  unsigned long long auto_increment;   /* auto increment field */
+  unsigned char dirty;   /* State of file */
 } azio_stream;
 
                         /* basic functions */
@@ -206,7 +239,7 @@ int azdopen(azio_stream *s,File fd, int Flags);
 */
 
 
-extern int azread(azio_stream *file, voidp buf, unsigned len);
+extern unsigned int azread ( azio_stream *s, voidp buf, unsigned int len, int *error);
 /*
      Reads the given number of uncompressed bytes from the compressed file.
    If the input file was not in gzip format, gzread copies the given number
@@ -214,10 +247,10 @@ extern int azread(azio_stream *file, voidp buf, unsigned len);
      gzread returns the number of uncompressed bytes actually read (0 for
    end of file, -1 for error). */
 
-extern int azwrite (azio_stream *file, voidpc buf, unsigned len);
+extern unsigned int azwrite (azio_stream *s, voidpc buf, unsigned int len);
 /*
      Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes actually written
+   azwrite returns the number of uncompressed bytes actually written
    (0 in case of error).
 */
 

storage/archive/ha_archive.h

@@ -26,34 +26,39 @@
   ha_example.h.
 */
 
+typedef struct st_archive_record_buffer {
+  byte *buffer;
+  int length;
+} archive_record_buffer;
+
+
 typedef struct st_archive_share {
   char *table_name;
   char data_file_name[FN_REFLEN];
   uint table_name_length,use_count;
   pthread_mutex_t mutex;
   THR_LOCK lock;
-  File meta_file;           /* Meta file we use */
   azio_stream archive_write;     /* Archive file we are working with */
   bool archive_write_open;
   bool dirty;               /* Flag for if a flush should occur */
   bool crashed;             /* Meta file is crashed */
   ha_rows rows_recorded;    /* Number of rows in tables */
-  ulonglong auto_increment_value;
-  ulonglong forced_flushes;
   ulonglong mean_rec_length;
-  char real_path[FN_REFLEN];
 } ARCHIVE_SHARE;
 
 /*
   Version for file format.
-  1 - Initial Version
+  1 - Initial Version (Never Released)
+  2 - Stream Compression, seperate blobs, no packing
+  3 - One steam (row and blobs), with packing
 */
-#define ARCHIVE_VERSION 2
+#define ARCHIVE_VERSION 3
 
 class ha_archive: public handler
 {
   THR_LOCK_DATA lock;        /* MySQL lock */
   ARCHIVE_SHARE *share;      /* Shared lock info */
+  
   azio_stream archive;            /* Archive file we are working with */
   my_off_t current_position;  /* The position of the row we just read */
   byte byte_buffer[IO_SIZE]; /* Initial buffer for our string */
@@ -64,6 +69,10 @@ class ha_archive: public handler
   const byte *current_key;
   uint current_key_len;
   uint current_k_offset;
+  archive_record_buffer *record_buffer;
+
+  archive_record_buffer *create_record_buffer(ulonglong length); 
+  void destroy_record_buffer(archive_record_buffer *r);
 
 public:
   ha_archive(handlerton *hton, TABLE_SHARE *table_arg);
@@ -104,21 +113,13 @@ class ha_archive: public handler
   int rnd_next(byte *buf);
   int rnd_pos(byte * buf, byte *pos);
   int get_row(azio_stream *file_to_read, byte *buf);
-  int read_meta_file(File meta_file, ha_rows *rows, 
-                     ulonglong *auto_increment,
-                     ulonglong *forced_flushes,
-                     char *real_path);
-  int write_meta_file(File meta_file, ha_rows rows, 
-                      ulonglong auto_increment, 
-                      ulonglong forced_flushes, 
-                      char *real_path,
-                      bool dirty);
+  int get_row_version2(azio_stream *file_to_read, byte *buf);
+  int get_row_version3(azio_stream *file_to_read, byte *buf);
   ARCHIVE_SHARE *get_share(const char *table_name, TABLE *table, int *rc);
   int free_share(ARCHIVE_SHARE *share);
   int init_archive_writer();
   bool auto_repair() const { return 1; } // For the moment we just do this
   int read_data_header(azio_stream *file_to_read);
-  int write_data_header(azio_stream *file_to_write);
   void position(const byte *record);
   int info(uint);
   void update_create_info(HA_CREATE_INFO *create_info);
@@ -136,5 +137,9 @@ class ha_archive: public handler
   bool is_crashed() const;
   int check(THD* thd, HA_CHECK_OPT* check_opt);
   bool check_and_repair(THD *thd);
+  int max_row_length(const byte *buf);
+  bool fix_rec_buff(int length);
+  int unpack_row(azio_stream *file_to_read, char *record);
+  unsigned int pack_row(const byte *record);
 };