greg/stasis-aries-wal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add casts to prevent warnings on (upcoming changes to) recordRead, recordWrite

Browse source
This commit is contained in:
Sears Russell 2007-05-31 22:40:19 +00:00
parent 9feb3efdb5
commit 951a897040
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lladd/operations/decrement.c
View file

@ -51,9 +51,9 @@ terms specified in this license.
static int operate(int xid, Page * p, lsn_t lsn, recordid r, const void *d) { static int operate(int xid, Page * p, lsn_t lsn, recordid r, const void *d) {
int i; int i;
recordRead(xid, p, r, &i); recordRead(xid, p, r, (byte*)&i);
i--; i--;
recordWrite(xid, p, lsn, r, &i); recordWrite(xid, p, lsn, r, (byte*)&i);
return 0; return 0;
} }

4
src/lladd/operations/increment.c
View file

@ -51,9 +51,9 @@ terms specified in this license.
static int operate(int xid, Page * p, lsn_t lsn, recordid r, const void *d) { static int operate(int xid, Page * p, lsn_t lsn, recordid r, const void *d) {
int i; int i;
recordRead(xid, p, r, &i); recordRead(xid, p, r, (byte*)&i);
i++; i++;
recordWrite(xid, p, lsn, r, &i); recordWrite(xid, p, lsn, r, (byte*)&i);
return 0; return 0;
} }

8
test/lladd/check_bufferManager.c
View file

@ -57,7 +57,7 @@ void initializePages() {
assert(p->id != -1); assert(p->id != -1);
slottedPostRalloc(-1, p, 0, rid); slottedPostRalloc(-1, p, 0, rid);
recordWrite(1, p, 1, rid, &i); recordWrite(1, p, 1, rid, (byte*)&i);
p->LSN = 0; p->LSN = 0;
*lsn_ptr(p) = 0; *lsn_ptr(p) = 0;
@ -87,7 +87,7 @@ void * workerThread(void * p) {
p = loadPage(-1, rid.page); p = loadPage(-1, rid.page);
recordRead(1, p, rid, &j); recordRead(1, p, rid, (byte*)&j);
releasePage(p); releasePage(p);
@ -138,7 +138,7 @@ void * workerThreadWriting(void * q) {
} }
/* sched_yield(); */ /* sched_yield(); */
recordWrite(1, p, 0, rids[i], &val); recordWrite(1, p, 0, rids[i], (byte*)&val);
assert(p->id == rids[i].page); assert(p->id == rids[i].page);
/* p->LSN = 0; /* p->LSN = 0;
@ -159,7 +159,7 @@ void * workerThreadWriting(void * q) {
p = loadPage(xid, rids[i].page); p = loadPage(xid, rids[i].page);
recordRead(1, p, rids[i], &val); recordRead(1, p, rids[i], (byte*)&val);
/* p->LSN = 0; /* p->LSN = 0;
*lsn_ptr(p) = 0; */ *lsn_ptr(p) = 0; */

20
test/lladd/check_operations.c
View file

@ -90,7 +90,7 @@ START_TEST(operation_physical_do_undo) {
DEBUG("B\n"); DEBUG("B\n");
p = loadPage(xid, rid.page); p = loadPage(xid, rid.page);
recordWrite(xid, p, lsn, rid, &buf); recordWrite(xid, p, lsn, rid, (byte*)&buf);
releasePage(p); releasePage(p);
setToTwo->LSN = 10; setToTwo->LSN = 10;
@ -100,7 +100,7 @@ START_TEST(operation_physical_do_undo) {
releasePage(p); releasePage(p);
p = loadPage(xid, rid.page); p = loadPage(xid, rid.page);
recordRead(xid, p, rid, &buf); recordRead(xid, p, rid, (byte*)&buf);
releasePage(p); releasePage(p);
fail_unless(buf == 2, NULL); fail_unless(buf == 2, NULL);
@ -118,7 +118,7 @@ START_TEST(operation_physical_do_undo) {
releasePage(p); releasePage(p);
p = loadPage(xid, rid.page); p = loadPage(xid, rid.page);
recordRead(xid, p, rid, &buf); recordRead(xid, p, rid, (byte*)&buf);
releasePage(p); releasePage(p);
fail_unless(buf == 1, NULL); fail_unless(buf == 1, NULL);
@ -128,7 +128,7 @@ START_TEST(operation_physical_do_undo) {
p = loadPage(xid, rid.page); p = loadPage(xid, rid.page);
recordRead(xid, p, rid, &buf); recordRead(xid, p, rid, (byte*)&buf);
releasePage(p); releasePage(p);
fail_unless(buf == 1, NULL); fail_unless(buf == 1, NULL);
@ -147,7 +147,7 @@ START_TEST(operation_physical_do_undo) {
buf = 1; buf = 1;
p = loadPage(xid, rid.page); p = loadPage(xid, rid.page);
recordWrite(xid, p, lsn, rid, &buf); recordWrite(xid, p, lsn, rid, (byte*)&buf);
releasePage(p); releasePage(p);
/* Trace of test: /* Trace of test:
@ -175,14 +175,14 @@ START_TEST(operation_physical_do_undo) {
redoUpdate(setToTwo); redoUpdate(setToTwo);
p = loadPage(xid, rid.page); p = loadPage(xid, rid.page);
recordRead(xid, p, rid, &buf); recordRead(xid, p, rid, (byte*)&buf);
assert(buf == 2); assert(buf == 2);
fail_unless(buf == 2, NULL); fail_unless(buf == 2, NULL);
DEBUG("G undo set to 2\n"); DEBUG("G undo set to 2\n");
undoUpdate(setToTwo, p, 20); /* Succeeds -- 20 is the 'CLR' entry's lsn.*/ undoUpdate(setToTwo, p, 20); /* Succeeds -- 20 is the 'CLR' entry's lsn.*/
recordRead(xid, p, rid, &buf); recordRead(xid, p, rid, (byte*)&buf);
fail_unless(buf == 1, NULL); fail_unless(buf == 1, NULL);
releasePage(p); releasePage(p);
@ -192,18 +192,18 @@ START_TEST(operation_physical_do_undo) {
p = loadPage(xid, rid.page); p = loadPage(xid, rid.page);
recordRead(xid, p, rid, &buf); recordRead(xid, p, rid, (byte*)&buf);
fail_unless(buf == 1, NULL); fail_unless(buf == 1, NULL);
recordWrite(xid, p, 0, rid, &buf); /* reset the page's LSN. */ recordWrite(xid, p, 0, rid, (byte*)&buf); /* reset the page's LSN. */
DEBUG("I redo set to 2\n"); DEBUG("I redo set to 2\n");
releasePage(p); releasePage(p);
redoUpdate(setToTwo); /* Succeeds */ redoUpdate(setToTwo); /* Succeeds */
p = loadPage(xid, rid.page); p = loadPage(xid, rid.page);
recordRead(xid, p, rid, &buf); recordRead(xid, p, rid, (byte*)&buf);
fail_unless(buf == 2, NULL); fail_unless(buf == 2, NULL);
releasePage(p); releasePage(p);