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

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

Author: brian@zim.(none)

mysql-test/r/archive.result

@@ -1,4 +1,4 @@
-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

@@ -0,0 +1,39 @@
+#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;
 }