Commit 258a0b1c authored by John Esmet's avatar John Esmet Committed by Yoni Fogel
Browse files

[t:4436] reverting make_db_h.c back to pre 39075, keeping fix for 4436,... 

[t:4436] reverting make_db_h.c back to pre 39075, keeping fix for 4436, updating headers as a result


git-svn-id: file:///svn/toku/tokudb@39233 c7de825b-a66e-492c-adef-691d508d4ae1
parent 4a7ab601

buildheader/db.h_4_1

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ struct __toku_db { 
  int (*pre_acquire_fileops_shared_lock)(DB*, DB_TXN*);

  const DBT* (*dbt_pos_infty)(void) /* Return the special DBT that refers to positive infinity in the lock table.*/;

  const DBT* (*dbt_neg_infty)(void)/* Return the special DBT that refers to negative infinity in the lock table.*/;

  void (*get_max_row_size)(DB*, u_int32_t *max_key_size, u_int32_t *max_row_size) /* Test whether a row size is supported. */;

  void (*get_max_row_size) (DB*, u_int32_t *max_key_size, u_int32_t *max_row_size);

  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) */;

buildheader/db.h_4_3

+1 −1
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ struct __toku_db { 
  int (*pre_acquire_fileops_shared_lock)(DB*, DB_TXN*);

  const DBT* (*dbt_pos_infty)(void) /* Return the special DBT that refers to positive infinity in the lock table.*/;

  const DBT* (*dbt_neg_infty)(void)/* Return the special DBT that refers to negative infinity in the lock table.*/;

  void (*get_max_row_size)(DB*, u_int32_t *max_key_size, u_int32_t *max_row_size) /* Test whether a row size is supported. */;

  void (*get_max_row_size) (DB*, u_int32_t *max_key_size, u_int32_t *max_row_size);

  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) */;

buildheader/db.h_4_4

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ struct __toku_db { 
  int (*pre_acquire_fileops_shared_lock)(DB*, DB_TXN*);

  const DBT* (*dbt_pos_infty)(void) /* Return the special DBT that refers to positive infinity in the lock table.*/;

  const DBT* (*dbt_neg_infty)(void)/* Return the special DBT that refers to negative infinity in the lock table.*/;

  void (*get_max_row_size)(DB*, u_int32_t *max_key_size, u_int32_t *max_row_size) /* Test whether a row size is supported. */;

  void (*get_max_row_size) (DB*, u_int32_t *max_key_size, u_int32_t *max_row_size);

  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) */;

buildheader/db.h_4_5

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ struct __toku_db { 
  int (*pre_acquire_fileops_shared_lock)(DB*, DB_TXN*);

  const DBT* (*dbt_pos_infty)(void) /* Return the special DBT that refers to positive infinity in the lock table.*/;

  const DBT* (*dbt_neg_infty)(void)/* Return the special DBT that refers to negative infinity in the lock table.*/;

  void (*get_max_row_size)(DB*, u_int32_t *max_key_size, u_int32_t *max_row_size) /* Test whether a row size is supported. */;

  void (*get_max_row_size) (DB*, u_int32_t *max_key_size, u_int32_t *max_row_size);

  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) */;

buildheader/db.h_4_6

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ struct __toku_db { 
  int (*pre_acquire_fileops_shared_lock)(DB*, DB_TXN*);

  const DBT* (*dbt_pos_infty)(void) /* Return the special DBT that refers to positive infinity in the lock table.*/;

  const DBT* (*dbt_neg_infty)(void)/* Return the special DBT that refers to negative infinity in the lock table.*/;

  void (*get_max_row_size)(DB*, u_int32_t *max_key_size, u_int32_t *max_row_size) /* Test whether a row size is supported. */;

  void (*get_max_row_size) (DB*, u_int32_t *max_key_size, u_int32_t *max_row_size);

  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) */;