Fix genid bug

Signed-off-by: mdouglas47 <[email protected]>

Author: morgando

schemachange/sc_alter_table.c

@@ -591,7 +591,7 @@ int do_alter_table(struct ireq *iq, struct schema_change_type *s,
 
     /* set sc_genids, 0 them if we are starting a new schema change, or
      * restore them to their previous values if we are resuming */
-    if (init_sc_genids(db, s)) {
+    if (init_sc_genids(db, newdb, s)) {
         sc_errf(s, "failed initilizing sc_genids\n");
         delete_temp_table(iq, newdb);
         change_schemas_recover(s->tablename);
@@ -655,7 +655,7 @@ int do_alter_table(struct ireq *iq, struct schema_change_type *s,
         if (!s->live)
             gbl_readonly_sc = 1;
 
-        rc = convert_all_records(db, newdb, newdb->sc_genids, s);
+        rc = convert_all_records(db, newdb, db->sc_genids, s);
         if (rc == 1) rc = 0;
     } else
         rc = 0;
@@ -1260,7 +1260,7 @@ int do_upgrade_table_int(struct schema_change_type *s)
         sc_printf(s, "Starting FULL table upgrade.\n");
     }
 
-    if (init_sc_genids(db, s)) {
+    if (init_sc_genids(db, db, s)) {
         sc_errf(s, "failed initilizing sc_genids\n");
         return SC_LLMETA_ERR;
     }

schemachange/sc_records.c

@@ -192,7 +192,7 @@ static inline void lkcounter_check(struct convert_record_data *data, int now)
  * stripe.
  * If the schema change is not resuming it sets them all to zero
  * If success it returns 0, if failure it returns <0 */
-int init_sc_genids(struct dbtable *db, struct schema_change_type *s)
+int init_sc_genids(struct dbtable *db, struct dbtable *newdb, struct schema_change_type *s)
 {
     void *rec;
     int orglen, bdberr, stripe;
@@ -238,8 +238,8 @@ int init_sc_genids(struct dbtable *db, struct schema_change_type *s)
         /* get this stripe's newest genid and store it in sc_genids,
          * if we have been rebuilding the data files we can grab the genids
          * straight from there, otherwise we look in the llmeta table */
-        if (is_dta_being_rebuilt(db->plan)) {
-            rc = bdb_find_newest_genid(db->handle, NULL, stripe, rec, &dtalen,
+        if (is_dta_being_rebuilt(newdb->plan)) {
+            rc = bdb_find_newest_genid(newdb->handle, NULL, stripe, rec, &dtalen,
                                        dtalen, &sc_genids[stripe], &ver,
                                        &bdberr);
             if (rc == 1)

schemachange/sc_records.h

@@ -96,7 +96,7 @@ int upgrade_all_records(struct dbtable *db, unsigned long long *sc_genids,
 
 void convert_record_data_cleanup(struct convert_record_data *data);
 
-int init_sc_genids(struct dbtable *db, struct schema_change_type *s);
+int init_sc_genids(struct dbtable *db, struct dbtable *newdb, struct schema_change_type *s);
 
 void live_sc_enter_exclusive_all(bdb_state_type *, tran_type *);