Commit 272c9a6b authored by Yoni Fogel's avatar Yoni Fogel

Addresses #1079

makes DB_TXN->parent public

git-svn-id: file:///svn/tokudb@5616 c7de825b-a66e-492c-adef-691d508d4ae1
parent 2a2e316f
...@@ -219,8 +219,9 @@ struct __toku_db_txn_active { ...@@ -219,8 +219,9 @@ struct __toku_db_txn_active {
}; };
struct __toku_db_txn { struct __toku_db_txn {
DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */ DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */
DB_TXN *parent; /* 32-bit offset=4 size=4, 64=bit offset=8 size=8 */
struct __toku_db_txn_internal *i; struct __toku_db_txn_internal *i;
void* __toku_dummy0[9]; void* __toku_dummy0[8];
char __toku_dummy1[24]; char __toku_dummy1[24];
void *api_internal; /* 32-bit offset=68 size=4, 64=bit offset=112 size=8 */ void *api_internal; /* 32-bit offset=68 size=4, 64=bit offset=112 size=8 */
void* __toku_dummy2[1]; void* __toku_dummy2[1];
......
...@@ -235,8 +235,9 @@ struct __toku_db_txn_active { ...@@ -235,8 +235,9 @@ struct __toku_db_txn_active {
}; };
struct __toku_db_txn { struct __toku_db_txn {
DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */ DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */
DB_TXN *parent; /* 32-bit offset=4 size=4, 64=bit offset=8 size=8 */
struct __toku_db_txn_internal *i; struct __toku_db_txn_internal *i;
void* __toku_dummy0[14]; void* __toku_dummy0[13];
char __toku_dummy1[24]; char __toku_dummy1[24];
void *api_internal; /* 32-bit offset=88 size=4, 64=bit offset=152 size=8 */ void *api_internal; /* 32-bit offset=88 size=4, 64=bit offset=152 size=8 */
void* __toku_dummy2[2]; void* __toku_dummy2[2];
......
...@@ -240,8 +240,9 @@ struct __toku_db_txn_active { ...@@ -240,8 +240,9 @@ struct __toku_db_txn_active {
}; };
struct __toku_db_txn { struct __toku_db_txn {
DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */ DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */
DB_TXN *parent; /* 32-bit offset=4 size=4, 64=bit offset=8 size=8 */
struct __toku_db_txn_internal *i; struct __toku_db_txn_internal *i;
void* __toku_dummy0[17]; void* __toku_dummy0[16];
char __toku_dummy1[8]; char __toku_dummy1[8];
void *api_internal; /* 32-bit offset=84 size=4, 64=bit offset=160 size=8 */ void *api_internal; /* 32-bit offset=84 size=4, 64=bit offset=160 size=8 */
void* __toku_dummy2[2]; void* __toku_dummy2[2];
......
...@@ -239,8 +239,9 @@ struct __toku_db_txn_active { ...@@ -239,8 +239,9 @@ struct __toku_db_txn_active {
}; };
struct __toku_db_txn { struct __toku_db_txn {
DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */ DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */
DB_TXN *parent; /* 32-bit offset=4 size=4, 64=bit offset=8 size=8 */
struct __toku_db_txn_internal *i; struct __toku_db_txn_internal *i;
void* __toku_dummy0[17]; void* __toku_dummy0[16];
char __toku_dummy1[8]; char __toku_dummy1[8];
void *api_internal; /* 32-bit offset=84 size=4, 64=bit offset=160 size=8 */ void *api_internal; /* 32-bit offset=84 size=4, 64=bit offset=160 size=8 */
void* __toku_dummy2[2]; void* __toku_dummy2[2];
......
...@@ -243,8 +243,9 @@ struct __toku_db_txn_active { ...@@ -243,8 +243,9 @@ struct __toku_db_txn_active {
}; };
struct __toku_db_txn { struct __toku_db_txn {
DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */ DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */
DB_TXN *parent; /* 32-bit offset=4 size=4, 64=bit offset=8 size=8 */
struct __toku_db_txn_internal *i; struct __toku_db_txn_internal *i;
void* __toku_dummy0[18]; void* __toku_dummy0[17];
char __toku_dummy1[8]; char __toku_dummy1[8];
void *api_internal; /* 32-bit offset=88 size=4, 64=bit offset=168 size=8 */ void *api_internal; /* 32-bit offset=88 size=4, 64=bit offset=168 size=8 */
void* __toku_dummy2[2]; void* __toku_dummy2[2];
......
...@@ -76,6 +76,7 @@ struct fieldinfo db_txn_active_fields64[] = { ...@@ -76,6 +76,7 @@ struct fieldinfo db_txn_active_fields64[] = {
}; };
struct fieldinfo db_txn_fields64[] = { struct fieldinfo db_txn_fields64[] = {
{"DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/", 0, 8}, {"DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/", 0, 8},
{"DB_TXN *parent", 8, 8},
{"void *api_internal", 112, 8}, {"void *api_internal", 112, 8},
{"int (*abort) (DB_TXN *)", 128, 8}, {"int (*abort) (DB_TXN *)", 128, 8},
{"int (*commit) (DB_TXN*, u_int32_t)", 136, 8}, {"int (*commit) (DB_TXN*, u_int32_t)", 136, 8},
......
...@@ -82,6 +82,7 @@ struct fieldinfo db_txn_active_fields64[] = { ...@@ -82,6 +82,7 @@ struct fieldinfo db_txn_active_fields64[] = {
}; };
struct fieldinfo db_txn_fields64[] = { struct fieldinfo db_txn_fields64[] = {
{"DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/", 0, 8}, {"DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/", 0, 8},
{"DB_TXN *parent", 8, 8},
{"void *api_internal", 152, 8}, {"void *api_internal", 152, 8},
{"int (*abort) (DB_TXN *)", 176, 8}, {"int (*abort) (DB_TXN *)", 176, 8},
{"int (*commit) (DB_TXN*, u_int32_t)", 184, 8}, {"int (*commit) (DB_TXN*, u_int32_t)", 184, 8},
......
...@@ -82,6 +82,7 @@ struct fieldinfo db_txn_active_fields64[] = { ...@@ -82,6 +82,7 @@ struct fieldinfo db_txn_active_fields64[] = {
}; };
struct fieldinfo db_txn_fields64[] = { struct fieldinfo db_txn_fields64[] = {
{"DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/", 0, 8}, {"DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/", 0, 8},
{"DB_TXN *parent", 8, 8},
{"void *api_internal", 160, 8}, {"void *api_internal", 160, 8},
{"int (*abort) (DB_TXN *)", 184, 8}, {"int (*abort) (DB_TXN *)", 184, 8},
{"int (*commit) (DB_TXN*, u_int32_t)", 192, 8}, {"int (*commit) (DB_TXN*, u_int32_t)", 192, 8},
......
...@@ -81,6 +81,7 @@ struct fieldinfo db_txn_active_fields64[] = { ...@@ -81,6 +81,7 @@ struct fieldinfo db_txn_active_fields64[] = {
}; };
struct fieldinfo db_txn_fields64[] = { struct fieldinfo db_txn_fields64[] = {
{"DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/", 0, 8}, {"DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/", 0, 8},
{"DB_TXN *parent", 8, 8},
{"void *api_internal", 160, 8}, {"void *api_internal", 160, 8},
{"int (*abort) (DB_TXN *)", 184, 8}, {"int (*abort) (DB_TXN *)", 184, 8},
{"int (*commit) (DB_TXN*, u_int32_t)", 192, 8}, {"int (*commit) (DB_TXN*, u_int32_t)", 192, 8},
......
...@@ -81,6 +81,7 @@ struct fieldinfo db_txn_active_fields64[] = { ...@@ -81,6 +81,7 @@ struct fieldinfo db_txn_active_fields64[] = {
}; };
struct fieldinfo db_txn_fields64[] = { struct fieldinfo db_txn_fields64[] = {
{"DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/", 0, 8}, {"DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/", 0, 8},
{"DB_TXN *parent", 8, 8},
{"void *api_internal", 168, 8}, {"void *api_internal", 168, 8},
{"int (*abort) (DB_TXN *)", 192, 8}, {"int (*abort) (DB_TXN *)", 192, 8},
{"int (*commit) (DB_TXN*, u_int32_t)", 200, 8}, {"int (*commit) (DB_TXN*, u_int32_t)", 200, 8},
......
...@@ -240,8 +240,9 @@ struct __toku_db_txn_active { ...@@ -240,8 +240,9 @@ struct __toku_db_txn_active {
}; };
struct __toku_db_txn { struct __toku_db_txn {
DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */ DB_ENV *mgrp /*In TokuDB, mgrp is a DB_ENV not a DB_TXNMGR*/; /* 32-bit offset=0 size=4, 64=bit offset=0 size=8 */
DB_TXN *parent; /* 32-bit offset=4 size=4, 64=bit offset=8 size=8 */
struct __toku_db_txn_internal *i; struct __toku_db_txn_internal *i;
void* __toku_dummy0[17]; void* __toku_dummy0[16];
char __toku_dummy1[8]; char __toku_dummy1[8];
void *api_internal; /* 32-bit offset=84 size=4, 64=bit offset=160 size=8 */ void *api_internal; /* 32-bit offset=84 size=4, 64=bit offset=160 size=8 */
void* __toku_dummy2[2]; void* __toku_dummy2[2];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment