Below is the list of changes that have just been committed into a local
6.0-falcon repository of . When does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-06-06 16:51:42-04:00, jas@rowvwade. +7 -0
Stylistic edit for consistency.
storage/falcon/AsciiBlob.cpp@stripped, 2007-06-06 16:51:33-04:00, jas@rowvwade. +6 -5
Track tablespace in blobs.
storage/falcon/AsciiBlob.h@stripped, 2007-06-06 16:51:33-04:00, jas@rowvwade. +18 -17
Track tablespace in blobs.
storage/falcon/BinaryBlob.cpp@stripped, 2007-06-06 16:51:34-04:00, jas@rowvwade. +6 -5
Track tablespace in blobs.
storage/falcon/BinaryBlob.h@stripped, 2007-06-06 16:51:34-04:00, jas@rowvwade. +21 -21
Track tablespace in blobs.
storage/falcon/Index.cpp@stripped, 2007-06-06 16:51:34-04:00, jas@rowvwade. +1 -0
Stylistic edit for consistency.
storage/falcon/Repository.cpp@stripped, 2007-06-06 16:51:35-04:00, jas@rowvwade. +6 -0
Stylistic edit for consistency.
storage/falcon/Table.cpp@stripped, 2007-06-06 16:51:35-04:00, jas@rowvwade. +2 -2
Track table space for blobs.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: jas
# Host: rowvwade.
# Root: D:/MySQL/mysql-5.1-falcon
--- 1.8/storage/falcon/AsciiBlob.cpp 2007-06-06 16:52:03 -04:00
+++ 1.9/storage/falcon/AsciiBlob.cpp 2007-06-06 16:52:03 -04:00
@@ -29,7 +29,7 @@
#include "Dbb.h"
#ifdef ENGINE
-#include "Database.h"
+#include "Dbb.h"
#include "Repository.h"
#include "Section.h"
#endif
@@ -75,10 +75,10 @@
}
#ifdef ENGINE
-AsciiBlob::AsciiBlob(Database * db, int32 recNumber, Section *blobSection)
+AsciiBlob::AsciiBlob(Dbb * db, int32 recNumber, Section *blobSection)
{
init (false);
- database = db;
+ dbb = db;
recordNumber = recNumber;
section = blobSection;
}
@@ -89,6 +89,7 @@
{
useCount = 1;
populated = pop;
+ dbb = NULL;
}
AsciiBlob::~AsciiBlob()
@@ -169,8 +170,8 @@
{
totalLength = exception.getSqlcode();
}
- else if (database)
- database->dbb->fetchRecord(section, recordNumber, this);
+ else if (dbb)
+ dbb->fetchRecord(section, recordNumber, this);
#endif
}
--- 1.5/storage/falcon/AsciiBlob.h 2007-06-06 16:52:03 -04:00
+++ 1.6/storage/falcon/AsciiBlob.h 2007-06-06 16:52:03 -04:00
@@ -31,34 +31,35 @@
#include "Blob.h"
#include "Stream.h"
-class Database;
+class Dbb;
class Section;
class AsciiBlob : public Clob, public Stream
{
public:
- void init (bool populated);
- virtual void unsetData();
- virtual Stream* getStream();
+ AsciiBlob(Dbb * db, int32 recNumber, Section *blobSection);
+ AsciiBlob (Blob *blob);
AsciiBlob (Clob *clob);
- virtual void putSegment (int32 length, const char *segment);
- virtual void putSegment (const char *string);
AsciiBlob (int minSegmentSize);
- void populate();
- AsciiBlob(Database * db, int32 recNumber, Section *blobSection);
- virtual const char* getSegment (int pos);
- virtual int getSegmentLength (int pos);
- AsciiBlob (Blob *blob);
- virtual void putSegment (int length, const char *data, bool copyFlag);
- virtual void getSubString (int32 pos, int32 length, char *buffer);
- virtual int length();
- virtual int release();
- virtual void addRef();
AsciiBlob();
virtual ~AsciiBlob();
+ void init (bool populated);
+ virtual void unsetData();
+ virtual Stream* getStream();
+ virtual void putSegment (int32 length, const char *segment);
+ virtual void putSegment (const char *string);
+ void populate();
+ virtual const char* getSegment (int pos);
+ virtual int getSegmentLength (int pos);
+ virtual void putSegment (int length, const char *data, bool copyFlag);
+ virtual void getSubString (int32 pos, int32 length, char *buffer);
+ virtual int length();
+ virtual int release();
+ virtual void addRef();
+
int useCount;
- Database *database;
+ Dbb *dbb;
Section *section;
int32 recordNumber;
bool populated;
--- 1.8/storage/falcon/BinaryBlob.cpp 2007-06-06 16:52:03 -04:00
+++ 1.9/storage/falcon/BinaryBlob.cpp 2007-06-06 16:52:03 -04:00
@@ -29,7 +29,7 @@
#include "Dbb.h"
#ifdef ENGINE
-#include "Database.h"
+#include "Dbb.h"
#include "Repository.h"
#include "Section.h"
#endif
@@ -56,10 +56,10 @@
}
#ifdef ENGINE
-BinaryBlob::BinaryBlob(Database * db, int32 recNumber, Section *blobSection)
+BinaryBlob::BinaryBlob(Dbb * db, int32 recNumber, Section *blobSection)
{
init (false);
- database = db;
+ dbb = db;
recordNumber = recNumber;
section = blobSection;
}
@@ -95,6 +95,7 @@
useCount = 1;
offset = 0;
populated = pop;
+ dbb = NULL;
}
BinaryBlob::~BinaryBlob()
@@ -174,8 +175,8 @@
{
totalLength = exception.getSqlcode();
}
- else if (database)
- database->dbb->fetchRecord(section, recordNumber, this);
+ else if (dbb)
+ dbb->fetchRecord(section, recordNumber, this);
#endif
}
--- 1.5/storage/falcon/BinaryBlob.h 2007-06-06 16:52:03 -04:00
+++ 1.6/storage/falcon/BinaryBlob.h 2007-06-06 16:52:03 -04:00
@@ -32,39 +32,39 @@
#include "Blob.h"
#include "Stream.h"
-class Database;
+class Dbb;
class AsciiBlob;
class Section;
class BinaryBlob : public Blob, public Stream
{
public:
- void init(bool populated);
- virtual void unsetData();
- Stream* getStream();
BinaryBlob (Blob *blob);
- virtual void putSegment (int32 length, const void *buffer);
- void putSegment (Blob *blob);
- void putSegment (Clob *blob);
-#ifdef ENGINE
- BinaryBlob (Database *db, int32 recordNumber, Section *blobSection);
-#endif
- virtual void* getSegment (int pos);
- virtual int getSegmentLength (int pos);
- BinaryBlob (Clob *blob);
- void putSegment (int length, const char *data, bool copyFlag);
- int length();
- void getBytes (int32 pos, int32 length, void *address);
- BinaryBlob (int minSegmentSize);
+ BinaryBlob (Dbb *db, int32 recordNumber, Section *blobSection);
+ BinaryBlob (Clob *blob);
+ BinaryBlob (int minSegmentSize);
BinaryBlob();
virtual ~BinaryBlob();
- virtual int release();
- virtual void addRef();
- void populate();
+
+ void init(bool populated);
+ virtual void unsetData();
+ Stream* getStream();
+ virtual void putSegment (int32 length, const void *buffer);
+ void putSegment (Blob *blob);
+ void putSegment (Clob *blob);
+
+ virtual void* getSegment (int pos);
+ virtual int getSegmentLength (int pos);
+ void putSegment (int length, const char *data, bool copyFlag);
+ int length();
+ void getBytes (int32 pos, int32 length, void *address);
+ virtual int release();
+ virtual void addRef();
+ void populate();
int useCount;
int offset;
- Database *database;
+ Dbb *dbb;
Section *section;
int32 recordNumber;
bool populated;
--- 1.54/storage/falcon/Index.cpp 2007-06-06 16:52:03 -04:00
+++ 1.55/storage/falcon/Index.cpp 2007-06-06 16:52:03 -04:00
@@ -413,6 +413,7 @@
if (transaction->visible(deferredIndex->transaction))
{
deferredIndex->scanIndex(lowKey, highKey, searchFlags, bitmap);
+
if (transaction->database->dbb->debug & (DEBUG_KEYS & DEBUG_DEFERRED_INDEX))
deferredIndex->print();
}
--- 1.5/storage/falcon/Repository.cpp 2007-06-06 16:52:03 -04:00
+++ 1.6/storage/falcon/Repository.cpp 2007-06-06 16:52:03 -04:00
@@ -236,27 +236,33 @@
for (const char *p = filePattern; *p;)
{
char c = *p++;
+
if (c == '%' && *p)
{
c = *p++;
+
if (c == '%')
*q++ = c;
else if (c == 'd')
{
const char *path = database->dbb->fileName;
char *last = NULL;
+
while (*path)
{
if (*path == '.')
last = q;
+
*q++ = *path++;
}
+
if (last)
q = last;
}
else if (c == 'v')
{
sprintf (q, "%d", volume);
+
while (*q)
++q;
}
--- 1.115/storage/falcon/Table.cpp 2007-06-06 16:52:03 -04:00
+++ 1.116/storage/falcon/Table.cpp 2007-06-06 16:52:03 -04:00
@@ -2477,7 +2477,7 @@
if (!blobSection)
blobSection = dbb->findSection(blobSectionId);
- AsciiBlob *blob = new AsciiBlob(database, recordId, blobSection);
+ AsciiBlob *blob = new AsciiBlob(dbb, recordId, blobSection);
if (recordId < 0)
getIndirectBlob(recordId, blob);
@@ -2490,7 +2490,7 @@
if (!blobSection)
blobSection = dbb->findSection(blobSectionId);
- BinaryBlob *blob = new BinaryBlob(database, recordId, blobSection);
+ BinaryBlob *blob = new BinaryBlob(dbb, recordId, blobSection);
if (recordId < 0)
getIndirectBlob(recordId, blob);
| Thread |
|---|
| • bk commit into 6.0-falcon tree (jas:1.2553) | U-ROWVWADEjas | 6 Jun |
