Partition collapse now resumes properly.

Signed-off-by: Dorin Hogea <dhogea@bloomberg.net>

Author: dorinhogea

bdb/file.c

@@ -6106,7 +6106,8 @@ static bdb_state_type *bdb_open_int(int envonly, const char name[], const char d
         if (rc != 0) {
             if (bdb_state->parent) {
                 free(bdb_state);
-                logmsg(LOGMSG_INFO, "%s failing with bdberr_misc at line %d\n", __func__, __LINE__);
+                logmsg(LOGMSG_INFO, "%s failing with bdberr_misc at line %d rc %d bdberr %d\n", __func__, __LINE__, rc,
+                       *bdberr);
                 return NULL;
             } else {
                 logmsg(LOGMSG_FATAL, "error opening parent\n");

csc2/dynschemaload.h

@@ -37,8 +37,8 @@ enum dyns_cnst {
 char *dyns_field_option_text(int option);
 void dyns_init_globals();
 void dyns_cleanup_globals();
-int dyns_load_schema_string(char *schematxt, char *dbname, char *tablename);
-int dyns_load_schema(char *filename, char *dbname, char *tblname);
+int dyns_load_schema_string(char *schematxt, char *dbname, const char *tablename);
+int dyns_load_schema(char *filename, char *dbname, const char *tblname);
 int dyns_form_key(int index, char *record, int recsz, char *key, int keysize);
 int dyns_is_idx_dup(int index);
 int dyns_is_idx_recnum(int index);

csc2/macc_so.c

@@ -2626,8 +2626,7 @@ int macc_ferror(FILE *fh)
  *  in order to initialize the global structure on which this and other dyns_
  *  functions rely.
  */
-static int dyns_load_schema_int(char *filename, char *schematxt, char *dbname,
-                                char *tablename)
+static int dyns_load_schema_int(char *filename, char *schematxt, char *dbname, const char *tablename)
 {
     int fhopen = 0;
     extern FILE *yyin; /* lexer's input file           */
@@ -2681,12 +2680,12 @@ static int dyns_load_schema_int(char *filename, char *schematxt, char *dbname,
     return 0;
 }
 
-int dyns_load_schema_string(char *schematxt, char *dbname, char *tablename)
+int dyns_load_schema_string(char *schematxt, char *dbname, const char *tablename)
 {
     return dyns_load_schema_int(NULL, schematxt, dbname, tablename);
 }
 
-int dyns_load_schema(char *filename, char *dbname, char *tablename)
+int dyns_load_schema(char *filename, char *dbname, const char *tablename)
 {
     return dyns_load_schema_int(filename, NULL, dbname, tablename);
 }

db/comdb2.h

@@ -1291,7 +1291,7 @@ struct osql_sess {
 
     int verify_retries; /* how many times we verify retried this one */
     blocksql_tran_t *tran;
-    LISTC_T(struct schema_change_type) scs; /* schema changes in session */
+    LISTC_T(struct schema_change_type) scs; /* schema changes in this transaction */
     int is_tptlock;   /* needs tpt locking */
     int is_cancelled; /* 1 if session is cancelled */
 
@@ -1439,8 +1439,8 @@ struct ireq {
     tran_type *sc_tran;
     tran_type *sc_close_tran;
     struct schema_change_type *sc_pending;
-    LISTC_T(struct schema_change_type) scs; /* all schema changes in this txn */
     uuid_t scs_uuid;                        /* on resume, there is no sorese, but we need to know uuid for scs */
+    LISTC_T(struct schema_change_status) scs_status; /* status of schema changes in this transaction */
     double cost;
     uint64_t sc_seed;
     uint32_t sc_host;
@@ -3647,6 +3647,7 @@ int cmp_index_int(struct schema *oldix, struct schema *newix, char *descr,
 int get_dbtable_idx_by_name(const char *tablename);
 int open_temp_db_resume(struct ireq *iq, struct dbtable *db, char *tablename, int resume);
 int open_temp_newdb_resume(struct ireq *iq, struct dbtable *db, int resume);
+void *open_temp_db_resume_early(struct dbtable *db, char *tablename);
 int find_constraint(struct dbtable *db, constraint_t *ct);
 
 /* END OF SCHEMACHANGE DECLARATIONS*/

db/glue.c

@@ -254,6 +254,7 @@ void init_fake_ireq(struct dbenv *dbenv, struct ireq *iq)
     iq->dbenv = dbenv;
     iq->is_fake = 1;
     iq->helper_thread = -1;
+    listc_init(&iq->scs_status, offsetof(struct schema_change_status, lnk));
 }
 
 void set_tran_verify_updateid(tran_type *tran)

db/macc_glue.c

@@ -19,7 +19,7 @@
 #include "dynschematypes.h"
 #include "dynschemaload.h"
 
-static dbtable *newdb_from_schema(struct dbenv *env, char *tblname, int dbnum);
+static dbtable *newdb_from_schema(struct dbenv *env, const char *tblname, int dbnum);
 static int init_check_constraints(dbtable *tbl);
 static int add_cmacc_stmt(dbtable *db, int alt, int allow_ull,
                           int no_side_effects, struct errstat *err);
@@ -28,10 +28,8 @@ extern int gbl_max_key_size_new;
 
 char gbl_ver_temp_table[] = ".COMDB2.TEMP.VER.";
 
-struct dbtable *create_new_dbtable(struct dbenv *dbenv, char *tablename,
-                                   char *csc2, int dbnum, int sc_alt_tablename,
-                                   int allow_ull, int no_side_effects,
-                                   struct errstat *err)
+struct dbtable *create_new_dbtable(struct dbenv *dbenv, const char *tablename, char *csc2, int dbnum,
+                                   int sc_alt_tablename, int allow_ull, int no_side_effects, struct errstat *err)
 {
     struct dbtable *newtable = NULL;
     int rc;
@@ -123,7 +121,7 @@ int populate_db_with_alt_schema(struct dbenv *dbenv, struct dbtable *db,
     return rc;
 }
 
-static dbtable *newdb_from_schema(struct dbenv *env, char *tblname, int dbnum)
+static dbtable *newdb_from_schema(struct dbenv *env, const char *tblname, int dbnum)
 {
     dbtable *tbl;
     int ii;

db/macc_glue.h

@@ -20,10 +20,8 @@
 #include "comdb2.h"
 
 /* create a dbtable with the provided schema "csc2" */
-struct dbtable *create_new_dbtable(struct dbenv *dbenv, char *tablename,
-                                   char *csc2, int dbnum, int sc_alt_tablename,
-                                   int allow_ull, int no_sideeffects,
-                                   struct errstat *err);
+struct dbtable *create_new_dbtable(struct dbenv *dbenv, const char *tablename, char *csc2, int dbnum,
+                                   int sc_alt_tablename, int allow_ull, int no_sideeffects, struct errstat *err);
 
 /* populate an existing db with .NEW tags for provided schema "csc2" */
 int populate_db_with_alt_schema(struct dbenv *dbenv, struct dbtable *db,