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-01 11:58:19-04:00, jas@rowvwade. +37 -0
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Application.cpp@stripped, 2007-06-01 11:58:00-04:00, jas@rowvwade. +1 -1
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/BigInteger.cpp@stripped, 2007-06-01 11:58:00-04:00, jas@rowvwade. +1 -1
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/BlobReference.cpp@stripped, 2007-06-01 11:58:00-04:00, jas@rowvwade. +2 -2
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Btn.cpp@stripped, 2007-06-01 11:58:00-04:00, jas@rowvwade. +1 -1
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Connection.cpp@stripped, 2007-06-01 11:58:01-04:00, jas@rowvwade. +5 -5
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Connection.h@stripped, 2007-06-01 11:58:01-04:00, jas@rowvwade. +5 -5
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/DataOutputStream.cpp@stripped, 2007-06-01 11:58:01-04:00, jas@rowvwade. +1 -1
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Database.cpp@stripped, 2007-06-01 11:58:02-04:00, jas@rowvwade. +2 -2
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Database.h@stripped, 2007-06-01 11:58:02-04:00, jas@rowvwade. +2 -2
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Dbb.cpp@stripped, 2007-06-01 11:58:02-04:00, jas@rowvwade. +3 -3
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/EditString.cpp@stripped, 2007-06-01 11:58:03-04:00, jas@rowvwade. +1 -1
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Engine.h@stripped, 2007-06-01 11:58:03-04:00, jas@rowvwade. +11 -2
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Field.cpp@stripped, 2007-06-01 11:58:03-04:00, jas@rowvwade. +3 -3
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/IO.cpp@stripped, 2007-06-01 11:58:04-04:00, jas@rowvwade. +1 -1
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/IndexKey.cpp@stripped, 2007-06-01 11:58:04-04:00, jas@rowvwade. +1 -1
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/License.cpp@stripped, 2007-06-01 11:58:04-04:00, jas@rowvwade. +1 -1
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/MACAddress.cpp@stripped, 2007-06-01 11:58:05-04:00, jas@rowvwade. +8 -8
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/NSequence.cpp@stripped, 2007-06-01 11:58:05-04:00, jas@rowvwade. +1 -1
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/PreparedStatement.cpp@stripped, 2007-06-01 11:58:05-04:00, jas@rowvwade. +6 -6
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/PreparedStatement.h@stripped, 2007-06-01 11:58:06-04:00, jas@rowvwade. +2 -2
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Record.cpp@stripped, 2007-06-01 11:58:06-04:00, jas@rowvwade. +10 -10
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Repository.cpp@stripped, 2007-06-01 11:58:06-04:00, jas@rowvwade. +5 -5
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Repository.h@stripped, 2007-06-01 11:58:07-04:00, jas@rowvwade. +3 -3
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/RepositoryVolume.cpp@stripped, 2007-06-01 11:58:07-04:00, jas@rowvwade. +11 -11
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/RepositoryVolume.h@stripped, 2007-06-01 11:58:07-04:00, jas@rowvwade. +7 -7
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/ResultSet.cpp@stripped, 2007-06-01 11:58:08-04:00, jas@rowvwade. +8 -8
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/ResultSet.h@stripped, 2007-06-01 11:58:08-04:00, jas@rowvwade. +3 -3
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/SequenceResultSet.cpp@stripped, 2007-06-01 11:58:08-04:00, jas@rowvwade. +1 -1
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Server.cpp@stripped, 2007-06-01 11:58:08-04:00, jas@rowvwade. +2 -2
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Socket.h@stripped, 2007-06-01 11:58:09-04:00, jas@rowvwade. +6 -6
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Statement.cpp@stripped, 2007-06-01 11:58:09-04:00, jas@rowvwade. +6 -6
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Synchronize.cpp@stripped, 2007-06-01 11:58:09-04:00, jas@rowvwade. +4 -4
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Synchronize.h@stripped, 2007-06-01 11:58:10-04:00, jas@rowvwade. +1 -1
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Syntax.cpp@stripped, 2007-06-01 11:58:10-04:00, jas@rowvwade. +2 -2
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/TriggerRecord.cpp@stripped, 2007-06-01 11:58:10-04:00, jas@rowvwade. +4 -4
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/TriggerRecord.h@stripped, 2007-06-01 11:58:11-04:00, jas@rowvwade. +4 -4
Phased out artificial type "QUAD" in favor of "int64".
storage/falcon/Types.h@stripped, 2007-06-01 11:58:11-04:00, jas@rowvwade. +1 -1
Phased out artificial type "QUAD" in favor of "int64".
# 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.4/storage/falcon/Application.cpp 2007-06-01 11:58:38 -04:00
+++ 1.5/storage/falcon/Application.cpp 2007-06-01 11:58:38 -04:00
@@ -258,7 +258,7 @@
// Not there; make up a new one
- QUAD sequence = connection->getSequenceValue ("alias_sequence");
+ int64 sequence = connection->getSequenceValue ("alias_sequence");
JString alias;
alias.Format ("a%d", (int) sequence);
node = insertAlias (alias, queryString);
--- 1.4/storage/falcon/BigInteger.cpp 2007-06-01 11:58:38 -04:00
+++ 1.5/storage/falcon/BigInteger.cpp 2007-06-01 11:58:38 -04:00
@@ -20,7 +20,7 @@
#include "Engine.h"
#include "BigInteger.h"
-#define REF(r) (*(QUAD*)(r.bytes))
+#define REF(r) (*(int64*)(r.bytes))
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
--- 1.3/storage/falcon/BlobReference.cpp 2007-06-01 11:58:38 -04:00
+++ 1.4/storage/falcon/BlobReference.cpp 2007-06-01 11:58:38 -04:00
@@ -49,7 +49,7 @@
return !repositoryName.IsEmpty();
}
-void BlobReference::setBlobReference(JString repo, int volume, QUAD id)
+void BlobReference::setBlobReference(JString repo, int volume, int64 id)
{
repositoryName = repo;
repositoryVolume = volume;
@@ -148,7 +148,7 @@
*q++ = *p++;
int n;
- if (q + sizeof (int) + sizeof (QUAD) >= end)
+ if (q + sizeof (int) + sizeof (int64) >= end)
return -1;
for (n = 0; n < 32; n += 8)
--- 1.12/storage/falcon/Btn.cpp 2007-06-01 11:58:38 -04:00
+++ 1.13/storage/falcon/Btn.cpp 2007-06-01 11:58:38 -04:00
@@ -111,7 +111,7 @@
{
union {
double dbl;
- QUAD quad;
+ int64 quad;
UCHAR chars [8];
} stuff;
--- 1.14/storage/falcon/Connection.cpp 2007-06-01 11:58:38 -04:00
+++ 1.15/storage/falcon/Connection.cpp 2007-06-01 11:58:38 -04:00
@@ -1120,7 +1120,7 @@
return NULL;
}
-QUAD Connection::getSequenceValue(const char *sequenceName)
+int64 Connection::getSequenceValue(const char *sequenceName)
{
Sequence *sequence = findSequence (sequenceName);
@@ -1131,20 +1131,20 @@
}
-QUAD Connection::getSequenceValue(const WCString *sequenceName)
+int64 Connection::getSequenceValue(const WCString *sequenceName)
{
return getSequenceValue (database->getSymbol (sequenceName));
}
-QUAD Connection::getSequenceValue(const char *schemaName, const char *sequenceName)
+int64 Connection::getSequenceValue(const char *schemaName, const char *sequenceName)
{
Sequence *sequence = getSequence (database->getSymbol (schemaName), database->getSymbol (sequenceName));
return sequence->update (1, getTransaction());
}
-QUAD Connection::getSequenceValue(const WCString *schemaName, const WCString *sequenceName)
+int64 Connection::getSequenceValue(const WCString *schemaName, const WCString *sequenceName)
{
Sequence *sequence = getSequence (database->getSymbol (schemaName), database->getSymbol (sequenceName));
@@ -1560,7 +1560,7 @@
return oldValue;
}
-void Connection::deleteRepositoryBlob(const char *schema, const char *repositoryName, int volume, QUAD blobId)
+void Connection::deleteRepositoryBlob(const char *schema, const char *repositoryName, int volume, int64 blobId)
{
database->deleteRepositoryBlob (schema, repositoryName, volume, blobId, getTransaction());
}
--- 1.13/storage/falcon/Connection.h 2007-06-01 11:58:38 -04:00
+++ 1.14/storage/falcon/Connection.h 2007-06-01 11:58:38 -04:00
@@ -151,7 +151,7 @@
virtual void setTransactionIsolation (int level);
int32 getNextHandle();
- void deleteRepositoryBlob (const char *schema, const char *repositoryName, int volume, QUAD blobId);
+ void deleteRepositoryBlob (const char *schema, const char *repositoryName, int volume, int64 blobId);
int setLimit (int which, int value);
int getLimit (int which);
void checkSitePassword (const char *sitePassword);
@@ -189,10 +189,10 @@
Sequence* getSequence (const char *schemaName, const char *sequenceName);
Sequence* findSequence (const char *name);
- QUAD getSequenceValue(const WCString *schemaName, const WCString *sequenceName);
- QUAD getSequenceValue (const char *sequenceName);
- QUAD getSequenceValue (const WCString *sequenceName);
- QUAD getSequenceValue (const char *schemaName, const char *sequenceName);
+ int64 getSequenceValue(const WCString *schemaName, const WCString *sequenceName);
+ int64 getSequenceValue (const char *sequenceName);
+ int64 getSequenceValue (const WCString *sequenceName);
+ int64 getSequenceValue (const char *schemaName, const char *sequenceName);
Database* createDatabase (const char *dbName, const char *dbFileName, const char *account, const char *password, Threads *threads);
Database* getDatabase(const char* dbName, const char* filename, Threads* threads);
--- 1.3/storage/falcon/DataOutputStream.cpp 2007-06-01 11:58:38 -04:00
+++ 1.4/storage/falcon/DataOutputStream.cpp 2007-06-01 11:58:38 -04:00
@@ -37,7 +37,7 @@
}
-void DataOutputStream::writeLong(QUAD value)
+void DataOutputStream::writeLong(int64 value)
{
char buf [8];
buf [0] = (UCHAR) (value >> 56);
--- 1.63/storage/falcon/Database.cpp 2007-06-01 11:58:38 -04:00
+++ 1.64/storage/falcon/Database.cpp 2007-06-01 11:58:38 -04:00
@@ -1742,7 +1742,7 @@
}
}
-int Database::createSequence(QUAD initialValue)
+int Database::createSequence(int64 initialValue)
{
Transaction *transaction = systemConnection->getTransaction();
@@ -2042,7 +2042,7 @@
repositoryManager->deleteRepository (repository);
}
-void Database::deleteRepositoryBlob(const char *schema, const char *repositoryName, int volume, QUAD blobId, Transaction *transaction)
+void Database::deleteRepositoryBlob(const char *schema, const char *repositoryName, int volume, int64 blobId, Transaction *transaction)
{
Repository *repository = getRepository (getSymbol (schema), getSymbol (repositoryName));
repository->deleteBlob (volume, blobId, transaction);
--- 1.29/storage/falcon/Database.h 2007-06-01 11:58:38 -04:00
+++ 1.30/storage/falcon/Database.h 2007-06-01 11:58:38 -04:00
@@ -106,7 +106,7 @@
void updateBlob(int32 section, int32 recordNumber, Stream *stream, Transaction *transaction);
void commit (Transaction *transaction);
void start();
- void deleteRepositoryBlob(const char *schema, const char *repositoryName, int volume, QUAD blobId, Transaction *transaction);
+ void deleteRepositoryBlob(const char *schema, const char *repositoryName, int volume, int64 blobId, Transaction *transaction);
void deleteRepository (Repository *repository);
Schema* getSchema (const char *schemaName);
Repository* createRepository(const char *name, const char *schema, Sequence *sequence, const char *fileName, int volume, const char *rolloverString);
@@ -133,7 +133,7 @@
void removeFromInversion (InversionFilter *filter, Transaction *transaction);
Transaction* getSystemTransaction();
int64 updateSequence (int sequenceId, int64 delta, Transaction *transaction);
- int createSequence(QUAD initialValue);
+ int createSequence(int64 initialValue);
void ticker();
static void ticker (void *database);
bool deleteIndexEntry (int32 indexId, int indexVersion, IndexKey *key, int32 recordNumber, Transaction *transaction);
--- 1.65/storage/falcon/Dbb.cpp 2007-06-01 11:58:38 -04:00
+++ 1.66/storage/falcon/Dbb.cpp 2007-06-01 11:58:38 -04:00
@@ -172,7 +172,7 @@
pagesPerPip = (pipSlots) * PIP_BITS;
pagesPerSection = (short) ((pageSize - OFFSET (SectionPage*, pages)) / sizeof (int32));
linesPerPage = (short) ((pageSize - OFFSET (RecordLocatorPage*, elements)) / sizeof (struct RecordIndex));
- sequencesPerPage = (short) ((pageSize - OFFSET (SequencePage*, sequences)) / sizeof (QUAD));
+ sequencesPerPage = (short) ((pageSize - OFFSET (SequencePage*, sequences)) / sizeof (int64));
sequencesPerSection = (int) (pagesPerSection * sequencesPerPage);
sections = new Section* [SECTION_HASH_SIZE];
memset (sections, 0, sizeof (Section*) * SECTION_HASH_SIZE);
@@ -672,7 +672,7 @@
return result;
}
-int Dbb::createSequence(QUAD initialValue, TransId transId)
+int Dbb::createSequence(int64 initialValue, TransId transId)
{
int id = (int) updateSequence (0, 1, transId);
int64 value = updateSequence (id, initialValue, transId);
@@ -1194,7 +1194,7 @@
SectionAnalysis numbers;
memset (&numbers, 0, sizeof (numbers));
section->analyze (&numbers, section->root);
- QUAD space = pageSize * numbers.dataPages;
+ int64 space = pageSize * numbers.dataPages;
if (space == 0)
return;
--- 1.6/storage/falcon/EditString.cpp 2007-06-01 11:58:38 -04:00
+++ 1.7/storage/falcon/EditString.cpp 2007-06-01 11:58:38 -04:00
@@ -230,7 +230,7 @@
char* EditString::formatNumber(Value * value, char *string)
{
- QUAD org = value->getQuad (fractions);
+ int64 org = value->getQuad (fractions);
number = (org >= 0) ? org : -org;
char c;
--- 1.12/storage/falcon/Engine.h 2007-06-01 11:58:38 -04:00
+++ 1.13/storage/falcon/Engine.h 2007-06-01 11:58:38 -04:00
@@ -83,6 +83,12 @@
#define I64FORMAT "%I64d"
#endif
+#ifdef _WIN64
+typedef __int64 IPTR;
+typedef unsigned __int64 UIPTR;
+#define HAVE_IPTR
+#endif
+
#else
#define __int64 long long
@@ -91,10 +97,13 @@
#define I64FORMAT "%lld"
#endif
-typedef unsigned char UCHAR;
-typedef unsigned long ULONG;
+#ifndef HAVE_IPTR
typedef long IPTR;
typedef unsigned long UIPTR;
+#endif
+
+typedef unsigned char UCHAR;
+typedef unsigned long ULONG;
typedef unsigned short USHORT;
typedef short int16;
--- 1.12/storage/falcon/Field.cpp 2007-06-01 11:58:38 -04:00
+++ 1.13/storage/falcon/Field.cpp 2007-06-01 11:58:38 -04:00
@@ -40,11 +40,11 @@
2, //Varchar, // variable length, counted string
sizeof (short), //Smallint,
sizeof (int32), //Integer,
- sizeof (QUAD), //Quad
+ sizeof (int64), //Quad
sizeof (float), //Float,
sizeof (double), //Double,
- sizeof (QUAD), //Date,
- sizeof (QUAD), //Timestamp,
+ sizeof (int64), //Date,
+ sizeof (int64), //Timestamp,
sizeof (int32), //Time,
sizeof (int32), //AsciiBlob,
sizeof (int32), //BinaryBlob,
--- 1.11/storage/falcon/IO.cpp 2007-06-01 11:58:38 -04:00
+++ 1.12/storage/falcon/IO.cpp 2007-06-01 11:58:38 -04:00
@@ -29,7 +29,7 @@
#include <io.h>
#include <direct.h>
#define LSEEK _lseeki64
-#define SEEK_OFFSET QUAD
+#define SEEK_OFFSET int64
#define MKDIR(dir) mkdir (dir)
#else
--- 1.23/storage/falcon/IndexKey.cpp 2007-06-01 11:58:38 -04:00
+++ 1.24/storage/falcon/IndexKey.cpp 2007-06-01 11:58:38 -04:00
@@ -99,7 +99,7 @@
{
union {
double dbl;
- QUAD quad;
+ int64 quad;
unsigned char chars [8];
} stuff;
--- 1.3/storage/falcon/License.cpp 2007-06-01 11:58:38 -04:00
+++ 1.4/storage/falcon/License.cpp 2007-06-01 11:58:38 -04:00
@@ -232,7 +232,7 @@
if (!value.IsEmpty())
{
- QUAD address = MACAddress::getAddress (value);
+ int64 address = MACAddress::getAddress (value);
if (!MACAddress::isAddress (address))
return invalidLicense ("wrong MAC address");
}
--- 1.4/storage/falcon/MACAddress.cpp 2007-06-01 11:58:38 -04:00
+++ 1.5/storage/falcon/MACAddress.cpp 2007-06-01 11:58:38 -04:00
@@ -48,7 +48,7 @@
#endif
static int count = MACAddress::getAddresses();
-static QUAD macAddresses [MAX_ADDRESSES];
+static int64 macAddresses [MAX_ADDRESSES];
static const char *hexDigits = "0123456789ABCDEF";
//////////////////////////////////////////////////////////////////////
@@ -104,9 +104,9 @@
return count;
}
-QUAD MACAddress::getAddress(int length, UCHAR *bytes)
+int64 MACAddress::getAddress(int length, UCHAR *bytes)
{
- QUAD address = 0;
+ int64 address = 0;
for (int n = 0; n < length; ++n)
address = address << 8 | bytes [n];
@@ -119,14 +119,14 @@
return count;
}
-QUAD MACAddress::getAddress(int index)
+int64 MACAddress::getAddress(int index)
{
return (index < 0 || index >= count) ? 0 : macAddresses [index];
}
-QUAD MACAddress::getAddress(const char *string)
+int64 MACAddress::getAddress(const char *string)
{
- QUAD address = 0;
+ int64 address = 0;
for (const char *p = string; *p;)
{
@@ -157,7 +157,7 @@
return -1;
}
-bool MACAddress::isAddress(QUAD address)
+bool MACAddress::isAddress(int64 address)
{
for (int n = 0; n < count; ++n)
if (address == macAddresses [n])
@@ -166,7 +166,7 @@
return false;
}
-JString MACAddress::getAddressString(QUAD address)
+JString MACAddress::getAddressString(int64 address)
{
char string [32];
char *p = string;
--- 1.4/storage/falcon/NSequence.cpp 2007-06-01 11:58:38 -04:00
+++ 1.5/storage/falcon/NSequence.cpp 2007-06-01 11:58:38 -04:00
@@ -75,7 +75,7 @@
type.type = Quad;
type.precision = 19;
type.scale = 0;
- type.length = sizeof (QUAD);
+ type.length = sizeof (int64);
return type;
}
--- 1.6/storage/falcon/PreparedStatement.cpp 2007-06-01 11:58:38 -04:00
+++ 1.7/storage/falcon/PreparedStatement.cpp 2007-06-01 11:58:38 -04:00
@@ -185,7 +185,7 @@
getParameter (index - 1)->setValue (*value);
}
-void PreparedStatement::setLong(int index, QUAD value)
+void PreparedStatement::setLong(int index, int64 value)
{
getParameter (index - 1)->setValue (value);
}
@@ -269,7 +269,7 @@
case terQuad:
{
- QUAD value;
+ int64 value;
memcpy (&value, p, sizeof (value));
setLong (n, value);
p += sizeof (value);
@@ -279,7 +279,7 @@
case terScaledQuad:
{
char scale = *p++;
- QUAD value;
+ int64 value;
memcpy (&value, p, sizeof (value));
p += sizeof (value);
Value val;
@@ -310,7 +310,7 @@
case terTime:
{
- QUAD milliseconds;
+ int64 milliseconds;
memcpy (&milliseconds, p, sizeof (milliseconds));
Time value;
value.setMilliseconds (milliseconds);
@@ -321,7 +321,7 @@
case terBigDate:
{
- QUAD milliseconds;
+ int64 milliseconds;
memcpy (&milliseconds, p, sizeof (milliseconds));
DateTime value;
value.setMilliseconds (milliseconds);
@@ -348,7 +348,7 @@
case terBigTimestamp:
{
TimeStamp value;
- QUAD milliseconds;
+ int64 milliseconds;
memcpy (&milliseconds, p, sizeof (milliseconds));
value.setMilliseconds (milliseconds);
p += sizeof (milliseconds);
--- 1.3/storage/falcon/PreparedStatement.h 2007-06-01 11:58:38 -04:00
+++ 1.4/storage/falcon/PreparedStatement.h 2007-06-01 11:58:38 -04:00
@@ -27,7 +27,7 @@
#include "Statement.h"
#ifndef __ENGINE_H
-typedef __int64 QUAD;
+typedef __int64 int64;
#endif
class Database;
@@ -47,7 +47,7 @@
void setSqlString (const WCString *sqlString);
virtual void setShort (int index, short value);
int32 getTerLong (const char** p);
- virtual void setLong (int index, QUAD value);
+ virtual void setLong (int index, int64 value);
virtual void setDate (int index, DateTime *value);
virtual void setBoolean (int index, int value);
virtual void setByte (int index, char value);
--- 1.42/storage/falcon/Record.cpp 2007-06-01 11:58:38 -04:00
+++ 1.43/storage/falcon/Record.cpp 2007-06-01 11:58:38 -04:00
@@ -204,7 +204,7 @@
break;
case Quad:
- *(QUAD*) ptr = value->getQuad(ff->scale);
+ *(int64*) ptr = value->getQuad(ff->scale);
break;
case Double:
@@ -223,7 +223,7 @@
if (ff->length == 4)
*(int32*) ptr = (int32) date.getSeconds();
else
- *(QUAD*) ptr = date.getMilliseconds();
+ *(int64*) ptr = date.getMilliseconds();
}
break;
@@ -234,7 +234,7 @@
if (ff->length == 4)
*(int32*) ptr = (int32) date.getSeconds();
else
- *(QUAD*) ptr = date.getMilliseconds();
+ *(int64*) ptr = date.getMilliseconds();
}
break;
@@ -251,8 +251,8 @@
}
else if (ff->length == 12)
{
- *(QUAD*) ptr = timestamp.getMilliseconds();
- *(int32*) (ptr + sizeof (QUAD)) = timestamp.getNanos();
+ *(int64*) ptr = timestamp.getMilliseconds();
+ *(int32*) (ptr + sizeof (int64)) = timestamp.getNanos();
}
else
ASSERT (false);
@@ -382,7 +382,7 @@
break;
case Quad:
- value->setValue(*(QUAD*) ptr, ff->scale);
+ value->setValue(*(int64*) ptr, ff->scale);
break;
case Timestamp:
@@ -401,8 +401,8 @@
}
else
{
- timestamp.setMilliseconds (*(QUAD*) ptr);
- timestamp.setNanos (*(int32*) (ptr + sizeof (QUAD)));
+ timestamp.setMilliseconds (*(int64*) ptr);
+ timestamp.setNanos (*(int32*) (ptr + sizeof (int64)));
}
value->setValue (timestamp);
@@ -416,7 +416,7 @@
if (ff->length == sizeof (int32))
date.setSeconds (*(int32*) ptr);
else
- date.setMilliseconds (*(QUAD*) ptr);
+ date.setMilliseconds (*(int64*) ptr);
value->setValue (date);
}
@@ -429,7 +429,7 @@
if (ff->length == sizeof (int32))
date.setSeconds (*(int32*) ptr);
else
- date.setMilliseconds (*(QUAD*) ptr);
+ date.setMilliseconds (*(int64*) ptr);
value->setValue (date);
}
--- 1.4/storage/falcon/Repository.cpp 2007-06-01 11:58:38 -04:00
+++ 1.5/storage/falcon/Repository.cpp 2007-06-01 11:58:38 -04:00
@@ -114,7 +114,7 @@
NOT_YET_IMPLEMENTED;
}
- QUAD id = sequence->update (1, NULL);
+ int64 id = sequence->update (1, NULL);
clob->setBlobReference (name, currentVolume, id);
alt->setValue (clob);
clob->release();
@@ -156,7 +156,7 @@
default:
NOT_YET_IMPLEMENTED;
}
- QUAD id = sequence->update (1, NULL);
+ int64 id = sequence->update (1, NULL);
blob->setBlobReference (name, currentVolume, id);
alt->setValue (blob);
blob->release();
@@ -364,10 +364,10 @@
return true;
}
-QUAD Repository::getFileSize(const char *token)
+int64 Repository::getFileSize(const char *token)
{
const char *p = token;
- QUAD size = 0;
+ int64 size = 0;
while (ISDIGIT (*p))
size = size * 10 + *p++ - '0';
@@ -429,7 +429,7 @@
database->commitSystemTransaction();
}
-void Repository::deleteBlob(int volumeNumber, QUAD blobId, Transaction *transaction)
+void Repository::deleteBlob(int volumeNumber, int64 blobId, Transaction *transaction)
{
RepositoryVolume *volume = getVolume (volumeNumber);
volume->deleteBlob (blobId, transaction);
--- 1.3/storage/falcon/Repository.h 2007-06-01 11:58:38 -04:00
+++ 1.4/storage/falcon/Repository.h 2007-06-01 11:58:38 -04:00
@@ -50,11 +50,11 @@
void reportStatistics();
void synchronize (const char *fileName, Transaction *transaction);
void scavenge();
- void deleteBlob (int volumeNumber, QUAD blobId, Transaction *transaction);
+ void deleteBlob (int volumeNumber, int64 blobId, Transaction *transaction);
void drop();
void setRollover (const char *string);
static RolloverPeriod getRolloverPeriod (const char *token);
- static QUAD getFileSize (const char *token);
+ static int64 getFileSize (const char *token);
static bool getToken (const char **ptr, int sizeToken, char *token);
static void validateRollovers (const char *string);
void setVolume (int volume);
@@ -78,7 +78,7 @@
Database *database;
Sequence *sequence;
int currentVolume;
- QUAD maxSize;
+ int64 maxSize;
RolloverPeriod rolloverPeriod;
SyncObject syncObject;
RepositoryVolume *volumes [VOLUME_HASH_SIZE];
--- 1.12/storage/falcon/RepositoryVolume.cpp 2007-06-01 11:58:38 -04:00
+++ 1.13/storage/falcon/RepositoryVolume.cpp 2007-06-01 11:58:38 -04:00
@@ -74,7 +74,7 @@
storeBlob (blob->blobId, blob->getStream(), transaction);
}
-void RepositoryVolume::storeBlob(QUAD blobId, Stream *stream, Transaction *transaction)
+void RepositoryVolume::storeBlob(int64 blobId, Stream *stream, Transaction *transaction)
{
Sync sync (&syncObject, "RepositoryVolume::getBlob");
sync.lock (Shared);
@@ -238,11 +238,11 @@
}
}
-int RepositoryVolume::makeKey(QUAD value, IndexKey *indexKey)
+int RepositoryVolume::makeKey(int64 value, IndexKey *indexKey)
{
union {
double dbl;
- QUAD quad;
+ int64 quad;
UCHAR chars [8];
} stuff;
@@ -260,11 +260,11 @@
}
-QUAD RepositoryVolume::reverseKey(UCHAR *key)
+int64 RepositoryVolume::reverseKey(UCHAR *key)
{
union {
double dbl;
- QUAD quad;
+ int64 quad;
UCHAR chars [8];
} stuff;
@@ -296,7 +296,7 @@
fetchRecord (recordNumber - 1, blob->getStream());
}
-int RepositoryVolume::getRecordNumber(QUAD blobId)
+int RepositoryVolume::getRecordNumber(int64 blobId)
{
IndexKey indexKey;
makeKey (blobId, &indexKey);
@@ -349,12 +349,12 @@
}
}
-QUAD RepositoryVolume::getRepositorySize()
+int64 RepositoryVolume::getRepositorySize()
{
- return (QUAD) dbb->highPage * dbb->pageSize;
+ return (int64) dbb->highPage * dbb->pageSize;
}
-void RepositoryVolume::deleteBlob(QUAD blobId, Transaction *transaction)
+void RepositoryVolume::deleteBlob(int64 blobId, Transaction *transaction)
{
Sync sync (&syncObject, "RepositoryVolume::getBlob");
sync.lock (Shared);
@@ -453,7 +453,7 @@
{
memcpy (indexKey.key + node.offset, node.key, node.length);
int32 recordNumber = node.getNumber();
- QUAD id = reverseKey (indexKey.key);
+ int64 id = reverseKey (indexKey.key);
if (recordNumber > 0)
{
@@ -482,7 +482,7 @@
}
}
-void RepositoryVolume::synchronize(QUAD id, Stream *stream, Transaction *transaction)
+void RepositoryVolume::synchronize(int64 id, Stream *stream, Transaction *transaction)
{
if (!isOpen)
open();
--- 1.4/storage/falcon/RepositoryVolume.h 2007-06-01 11:58:38 -04:00
+++ 1.5/storage/falcon/RepositoryVolume.h 2007-06-01 11:58:38 -04:00
@@ -38,10 +38,10 @@
public:
void setName (const char *name);
JString getName();
- void deleteBlob (QUAD blobId, Transaction *transaction);
+ void deleteBlob (int64 blobId, Transaction *transaction);
void getBlob (BlobReference *reference);
void create();
- QUAD getRepositorySize();
+ int64 getRepositorySize();
void storeBlob (BlobReference *blob, Transaction *transaction);
RepositoryVolume(Repository *repo, int volume, JString file);
virtual ~RepositoryVolume();
@@ -51,16 +51,16 @@
int compare (Stream *stream1, Stream *stream2);
void fetchRecord (int recordNumber, Stream *stream);
int getRecordNumber (IndexKey *indexKey);
- int getRecordNumber (QUAD blobId);
+ int getRecordNumber (int64 blobId);
void makeWritable();
void open();
- int makeKey (QUAD value, IndexKey *indexKey);
+ int makeKey (int64 value, IndexKey *indexKey);
public:
void reportStatistics();
- void storeBlob (QUAD blobId, Stream *stream, Transaction *transaction);
- void synchronize (QUAD id, Stream *stream, Transaction *transaction);
- QUAD reverseKey (UCHAR *key);
+ void storeBlob (int64 blobId, Stream *stream, Transaction *transaction);
+ void synchronize (int64 id, Stream *stream, Transaction *transaction);
+ int64 reverseKey (UCHAR *key);
void synchronize(Transaction *transaction);
void scavenge();
int volumeNumber;
--- 1.6/storage/falcon/ResultSet.cpp 2007-06-01 11:58:38 -04:00
+++ 1.7/storage/falcon/ResultSet.cpp 2007-06-01 11:58:38 -04:00
@@ -184,12 +184,12 @@
return getValue(id + 1)->getShort();
}
-QUAD ResultSet::getLong(int id)
+int64 ResultSet::getLong(int id)
{
return getValue(id)->getQuad ();
}
-QUAD ResultSet::getLong(const char *name)
+int64 ResultSet::getLong(const char *name)
{
int id = getColumnIndex (name);
@@ -653,7 +653,7 @@
}
else
blob->putCharacter (terQuad);
- //blob->putSegment (sizeof (QUAD), (const char*) &value->data.quad, true);
+ //blob->putSegment (sizeof (int64), (const char*) &value->data.quad, true);
int64 quad = value->getQuad(scale);
putTerQuad (quad, blob);
}
@@ -670,7 +670,7 @@
case Date:
{
blob->putCharacter (terBigDate);
- QUAD milliseconds = value->getMilliseconds();
+ int64 milliseconds = value->getMilliseconds();
blob->putSegment (sizeof (milliseconds), (const char*) &milliseconds, true);
}
break;
@@ -678,7 +678,7 @@
case TimeType:
{
blob->putCharacter (terTime);
- QUAD milliseconds = value->getMilliseconds();
+ int64 milliseconds = value->getMilliseconds();
blob->putSegment (sizeof (milliseconds), (const char*) &milliseconds, true);
}
break;
@@ -686,7 +686,7 @@
case Timestamp:
{
blob->putCharacter (terBigTimestamp);
- QUAD milliseconds = value->getMilliseconds();
+ int64 milliseconds = value->getMilliseconds();
blob->putSegment (sizeof (milliseconds), (const char*) &milliseconds, true);
putTerLong (value->getNanos(), blob);
}
@@ -753,10 +753,10 @@
}
-void ResultSet::putTerQuad(QUAD value, BinaryBlob *blob)
+void ResultSet::putTerQuad(int64 value, BinaryBlob *blob)
{
ASSERT (sizeof (value) == 8);
- blob->putSegment (sizeof (QUAD), (const char*) &value, true);
+ blob->putSegment (sizeof (int64), (const char*) &value, true);
}
const char* ResultSet::getSymbol(int index)
--- 1.3/storage/falcon/ResultSet.h 2007-06-01 11:58:38 -04:00
+++ 1.4/storage/falcon/ResultSet.h 2007-06-01 11:58:38 -04:00
@@ -55,7 +55,7 @@
virtual ~ResultSet();
public:
- void putTerQuad (QUAD value, BinaryBlob *blob);
+ void putTerQuad (int64 value, BinaryBlob *blob);
Clob* getClob(const char *name);
Clob* getClob (int index);
void print (Stream *stream);
@@ -85,8 +85,8 @@
virtual int findColumnIndex (const char *name);
virtual Blob* getRecord();
virtual int getInt (const char *name);
- virtual QUAD getLong (const char * name);
- virtual QUAD getLong (int id);
+ virtual int64 getLong (const char * name);
+ virtual int64 getLong (int id);
virtual void releaseJavaRef();
virtual void addJavaRef();
virtual double getDouble (const char * name);
--- 1.3/storage/falcon/SequenceResultSet.cpp 2007-06-01 11:58:38 -04:00
+++ 1.4/storage/falcon/SequenceResultSet.cpp 2007-06-01 11:58:38 -04:00
@@ -50,7 +50,7 @@
const char *sequenceName = resultSet->getSymbol (3);
Sequence *sequence = sequenceManager->getSequence (schema, sequenceName);
Transaction *transaction = resultSet->statement->transaction;
- QUAD val = sequence->updatePhysical (0, transaction);
+ int64 val = sequence->updatePhysical (0, transaction);
Value value;
value.setValue (val);
resultSet->setValue (3, &value);
--- 1.9/storage/falcon/Server.cpp 2007-06-01 11:58:38 -04:00
+++ 1.10/storage/falcon/Server.cpp 2007-06-01 11:58:38 -04:00
@@ -1210,7 +1210,7 @@
void Server::getSequenceValue()
{
string1 = protocol->getString();
- QUAD result = connection->getSequenceValue (string1);
+ int64 result = connection->getSequenceValue (string1);
protocol->sendSuccess();
protocol->putQuad (result);
}
@@ -1454,7 +1454,7 @@
{
string1 = protocol->getString();
string2 = protocol->getString();
- QUAD result = connection->getSequenceValue (string1, string2);
+ int64 result = connection->getSequenceValue (string1, string2);
protocol->sendSuccess();
protocol->putQuad (result);
}
--- 1.3/storage/falcon/Socket.h 2007-06-01 11:58:38 -04:00
+++ 1.4/storage/falcon/Socket.h 2007-06-01 11:58:38 -04:00
@@ -35,15 +35,15 @@
#include <netinet/in.h>
#endif
-#ifndef QUAD
+#ifndef int64
#ifdef _WIN32
-typedef __int64 QUAD;
+typedef __int64 int64;
#else
-typedef long long QUAD;
+typedef long long int64;
#endif
typedef int int32;
typedef unsigned int uint32;
-typedef QUAD int64;
+typedef int64 int64;
#endif
#ifndef MSG_NOSIGNAL
@@ -86,8 +86,8 @@
Socket* acceptSocket();
#endif
- QUAD getQuad();
- void putQuad (QUAD quad);
+ int64 getQuad();
+ void putQuad (int64 quad);
double getDouble();
void putDouble (double value);
short getShort();
--- 1.22/storage/falcon/Statement.cpp 2007-06-01 11:58:38 -04:00
+++ 1.23/storage/falcon/Statement.cpp 2007-06-01 11:58:38 -04:00
@@ -1438,7 +1438,7 @@
case nod_bigint:
type = Quad;
- length = sizeof (QUAD);
+ length = sizeof (int64);
break;
case nod_text:
@@ -1464,13 +1464,13 @@
case nod_date:
type = Date;
//length = sizeof (DateTime);
- length = sizeof (QUAD);
+ length = sizeof (int64);
break;
case nod_timestamp:
type = Timestamp;
//length = sizeof (TimeStamp);
- length = sizeof (QUAD) + sizeof (int32);
+ length = sizeof (int64) + sizeof (int32);
break;
case nod_time:
@@ -1495,7 +1495,7 @@
else if (precision < 20)
{
type = Quad;
- length = sizeof (QUAD);
+ length = sizeof (int64);
}
else
//throw SQLError (DDL_ERROR, "decimal precision great than 19 digits not yet supported");
@@ -2104,7 +2104,7 @@
const char *name = getName (node);
const char *schema = getSchemaName (node);
Syntax *clauses = syntax->getChild (1);
- QUAD base = 0;
+ int64 base = 0;
FOR_SYNTAX (clause, clauses)
switch (clause->type)
@@ -2125,7 +2125,7 @@
if (!upgrade)
throw SQLEXCEPTION (DDL_ERROR, "sequence %s.%s already exists", schema, name);
- QUAD n = sequence->updatePhysical (0, transaction);
+ int64 n = sequence->updatePhysical (0, transaction);
if (base > n)
sequence->updatePhysical (base - n, transaction);
--- 1.6/storage/falcon/Synchronize.cpp 2007-06-01 11:58:38 -04:00
+++ 1.7/storage/falcon/Synchronize.cpp 2007-06-01 11:58:38 -04:00
@@ -124,8 +124,8 @@
#ifdef _PTHREADS
struct timeval microTime;
int ret = gettimeofday (µTime, NULL);
- QUAD nanos = (QUAD) microTime.tv_sec * NANO + microTime.tv_usec * 1000 +
- (QUAD) milliseconds * 1000000;
+ int64 nanos = (int64) microTime.tv_sec * NANO + microTime.tv_usec * 1000 +
+ (int64) milliseconds * 1000000;
struct timespec nanoTime;
nanoTime.tv_sec = nanos / NANO;
nanoTime.tv_nsec = nanos % NANO;
@@ -140,8 +140,8 @@
/***
struct timeval endTime;
gettimeofday (&endTime, NULL);
- waitTime = ((QUAD) endTime.tv_sec * MICRO + endTime.tv_usec) -
- ((QUAD) microTime.tv_sec * MICRO + microTime.tv_usec);
+ waitTime = ((int64) endTime.tv_sec * MICRO + endTime.tv_usec) -
+ ((int64) microTime.tv_sec * MICRO + microTime.tv_usec);
***/
break;
}
--- 1.3/storage/falcon/Synchronize.h 2007-06-01 11:58:38 -04:00
+++ 1.4/storage/falcon/Synchronize.h 2007-06-01 11:58:38 -04:00
@@ -49,7 +49,7 @@
bool shutdownInProgress;
bool sleeping;
volatile bool wakeup;
- QUAD waitTime;
+ int64 waitTime;
#ifdef _WIN32
void *event;
--- 1.4/storage/falcon/Syntax.cpp 2007-06-01 11:58:38 -04:00
+++ 1.5/storage/falcon/Syntax.cpp 2007-06-01 11:58:38 -04:00
@@ -267,7 +267,7 @@
return n;
}
-QUAD Syntax::getQuad ()
+int64 Syntax::getQuad ()
{
/**************************************
*
@@ -279,7 +279,7 @@
* Return value as number.
*
**************************************/
- QUAD n = 0;
+ int64 n = 0;
char c;
for (const char *p = value; (c = *p++);)
--- 1.5/storage/falcon/TriggerRecord.cpp 2007-06-01 11:58:39 -04:00
+++ 1.6/storage/falcon/TriggerRecord.cpp 2007-06-01 11:58:39 -04:00
@@ -103,7 +103,7 @@
record->setValue (transaction, field->id, value, false, true);
}
-QUAD TriggerRecord::getLong(const WCString *fieldName)
+int64 TriggerRecord::getLong(const WCString *fieldName)
{
getValue (fieldName);
@@ -203,7 +203,7 @@
return value.getInt();
}
-QUAD TriggerRecord::getLong(int id)
+int64 TriggerRecord::getLong(int id)
{
getValue (id);
@@ -337,7 +337,7 @@
setValue (id, &val);
}
-void TriggerRecord::setValue(int id, QUAD value)
+void TriggerRecord::setValue(int id, int64 value)
{
Value val;
val.setValue (value);
@@ -365,7 +365,7 @@
setValue (fieldName, &val);
}
-void TriggerRecord::setValue(const WCString *fieldName, QUAD value)
+void TriggerRecord::setValue(const WCString *fieldName, int64 value)
{
Value val;
val.setValue (value);
--- 1.3/storage/falcon/TriggerRecord.h 2007-06-01 11:58:39 -04:00
+++ 1.4/storage/falcon/TriggerRecord.h 2007-06-01 11:58:39 -04:00
@@ -58,7 +58,7 @@
void setValue (const WCString *fieldName, TimeStamp value);
void setValue (const WCString *fieldName, double value);
void setValue (const WCString *fieldName, float value);
- void setValue (const WCString *fieldName, QUAD value);
+ void setValue (const WCString *fieldName, int64 value);
void setValue (const WCString *fieldName, int value);
void setValue (const WCString *fieldName, short value);
void setValue (const WCString *fieldName, char value);
@@ -68,7 +68,7 @@
void setValue (int id, DateTime date);
void setValue (int id, double value);
void setValue (int id, float value);
- void setValue (int id, QUAD value);
+ void setValue (int id, int64 value);
void setValue (int id, int value);
void setValue (int id, short value);
void setValue (int id, char value);
@@ -89,7 +89,7 @@
double getDouble (int id);
float getFloat (const WCString *fieldName);
float getFloat (int id);
- QUAD getLong (int id);
+ int64 getLong (int id);
int getInt (const WCString *fieldName);
int getInt (int id);
short getShort (const WCString *fieldName);
@@ -108,7 +108,7 @@
void setValue (const WCString *fieldName, const char *value);
void setValue (const WCString *fieldName, long int32);
***/
- QUAD getLong (const WCString *fieldName);
+ int64 getLong (const WCString *fieldName);
void getValue (const WCString *fieldName);
const char* getString (const WCString *fieldName, char **temp);
TriggerRecord(Trigger *trg, Transaction *trans, Record *rec, int operation, bool updatable);
--- 1.7/storage/falcon/Types.h 2007-06-01 11:58:39 -04:00
+++ 1.8/storage/falcon/Types.h 2007-06-01 11:58:39 -04:00
@@ -54,7 +54,7 @@
TINYINT = -7, // byte / C char
SMALLINT = 5, // short
INTEGER = 4,
- BIGINT = -5, // QUAD (64 bit)
+ BIGINT = -5, // int64 (64 bit)
jdbcFLOAT = 6,
jdbcDOUBLE = 8,
| Thread |
|---|
| • bk commit into 6.0-falcon tree (jas:1.2524) | U-ROWVWADEjas | 1 Jun |
