Commit 539c2458 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel
Browse files

#4503 #4504 support concurrent queries on the mainline refs[t:4503] refs[t:4504] 

git-svn-id: file:///svn/toku/tokudb@40068 c7de825b-a66e-492c-adef-691d508d4ae1
parent aade4f7e

buildheader/db.h_4_1

+1 −2
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ struct __toku_db { 
  DESCRIPTOR descriptor /* saved row/dictionary descriptor for aiding in comparisons */;

  int (*change_descriptor) (DB*, DB_TXN*, const DBT* descriptor, u_int32_t) /* change row/dictionary descriptor for a db.  Available only while db is open */;

  int (*getf_set)(DB*, DB_TXN*, u_int32_t, DBT*, YDB_CALLBACK_FUNCTION, void*) /* same as DBC->c_getf_set without a persistent cursor) */;

  int (*flatten)(DB*, DB_TXN*) /* Flatten a dictionary, similar to (but faster than) a table scan */;

  int (*optimize)(DB*) /* Run garbage collecion and promote all transactions older than oldest. Amortized (happens during flattening) */;

  int (*hot_optimize)(DB*, int (*progress_callback)(void *progress_extra, float progress), void *progress_extra);

  int (*get_fragmentation)(DB*,TOKU_DB_FRAGMENTATION);
@@ -335,7 +334,7 @@ struct __toku_db { 
  int (*verify_with_progress)(DB *, int (*progress_callback)(void *progress_extra, float progress), void *progress_extra, int verbose, int keep_going);

  int (*update)(DB *, DB_TXN*, const DBT *key, const DBT *extra, u_int32_t flags);

  int (*update_broadcast)(DB *, DB_TXN*, const DBT *extra, u_int32_t flags);

  void* __toku_dummy0[11];

  void* __toku_dummy0[12];

  char __toku_dummy1[96];

  void *api_internal; /* 32-bit offset=236 size=4, 64=bit offset=376 size=8 */

  void* __toku_dummy2[5];

buildheader/db.h_4_3

+1 −2
Original line number Diff line number Diff line
@@ -333,7 +333,6 @@ struct __toku_db { 
  DESCRIPTOR descriptor /* saved row/dictionary descriptor for aiding in comparisons */;

  int (*change_descriptor) (DB*, DB_TXN*, const DBT* descriptor, u_int32_t) /* change row/dictionary descriptor for a db.  Available only while db is open */;

  int (*getf_set)(DB*, DB_TXN*, u_int32_t, DBT*, YDB_CALLBACK_FUNCTION, void*) /* same as DBC->c_getf_set without a persistent cursor) */;

  int (*flatten)(DB*, DB_TXN*) /* Flatten a dictionary, similar to (but faster than) a table scan */;

  int (*optimize)(DB*) /* Run garbage collecion and promote all transactions older than oldest. Amortized (happens during flattening) */;

  int (*hot_optimize)(DB*, int (*progress_callback)(void *progress_extra, float progress), void *progress_extra);

  int (*get_fragmentation)(DB*,TOKU_DB_FRAGMENTATION);
@@ -344,7 +343,7 @@ struct __toku_db { 
  int (*verify_with_progress)(DB *, int (*progress_callback)(void *progress_extra, float progress), void *progress_extra, int verbose, int keep_going);

  int (*update)(DB *, DB_TXN*, const DBT *key, const DBT *extra, u_int32_t flags);

  int (*update_broadcast)(DB *, DB_TXN*, const DBT *extra, u_int32_t flags);

  void* __toku_dummy0[14];

  void* __toku_dummy0[15];

  char __toku_dummy1[96];

  void *api_internal; /* 32-bit offset=248 size=4, 64=bit offset=400 size=8 */

  void* __toku_dummy2[5];

buildheader/db.h_4_4

+0 −475

File changed.

Preview size limit exceeded, changes collapsed.

buildheader/db.h_4_5

+0 −475

File changed.

Preview size limit exceeded, changes collapsed.

buildheader/db.h_4_6

+0 −479

File changed.

Preview size limit exceeded, changes collapsed.