{178575361} Fill descending autoinc value for ireq keys that are not expressions on master

Signed-off-by: Salil Chandra <[email protected]>

Author: chands10

db/tag.c

@@ -6522,17 +6522,33 @@ int create_key_from_ireq(struct ireq *iq, int ixnum, int isDelete, char **tail,
     // autoinc value is not set on replicant, set it now
     struct schema *idx_schema = get_schema(db, ixnum);
     struct schema *schema = get_schema(db, -1);
+    int rec_srt_off = gbl_sort_nulls_correctly ? 0 : 1;
+    char temp[9];
+    char *check_for_resolve_master;
     for (int nfield = 0; nfield < idx_schema->nmembers; nfield++) {
         const struct field *idx_field = &idx_schema->member[nfield];
         // TODO: expression idx
         if (idx_field->isExpr)
             continue;
-        if (!(idx_field->in_default_type == SERVER_SEQUENCE && stype_is_resolve_master(outbuf + idx_field->offset)))
+        if (idx_field->in_default_type != SERVER_SEQUENCE)
+            continue;
+
+        if (idx_field->flags & INDEX_DESCEND) { // need to undo to check for resolve master bit
+            assert(idx_field->len <= sizeof(temp));
+            memcpy(temp, outbuf + idx_field->offset, idx_field->len);
+            xorbuf(temp + rec_srt_off, idx_field->len - rec_srt_off);
+            check_for_resolve_master = temp;
+        } else
+            check_for_resolve_master = outbuf + idx_field->offset;
+
+        if (!stype_is_resolve_master(check_for_resolve_master))
             continue;
         // grab actual autoinc value from the record
         const struct field *field = &schema->member[idx_field->idx];
         assert(idx_field->len == field->len);
         memcpy(outbuf + idx_field->offset, inbuf + field->offset, idx_field->len);
+        if (idx_field->flags & INDEX_DESCEND)
+            xorbuf((outbuf + idx_field->offset) + rec_srt_off, idx_field->len - rec_srt_off);
     }
 
     if (db->ix_datacopy[ixnum]) {

tests/nextsequence.test/runit

@@ -466,23 +466,23 @@ function insert_with_idx_and_dummy_expr
 {
     disable_strict_mode
     $CDB2SQL_EXE $CDB2_OPTIONS $DBNAME default - <<EOF
-create table seqwithidxanddummyexpr {$(cat seqwithidxanddummyexpr.csc2)}\$\$
+create table $1 {$(cat $1.csc2)}\$\$
 EOF
 
-    $CDB2SQL_EXE $CDB2_OPTIONS $DBNAME default "insert into seqwithidxanddummyexpr(a) values(1)"
-    [[ $? != 0 ]] && failexit "seqwithidxanddummyexpr table should have been allowed to insert"
-    $CDB2SQL_EXE $CDB2_OPTIONS $DBNAME default "insert into seqwithidxanddummyexpr values(2, 2)"
-    [[ $? != 0 ]] && failexit "seqwithidxanddummyexpr table should have been allowed to insert"
-    $CDB2SQL_EXE $CDB2_OPTIONS $DBNAME default "insert into seqwithidxanddummyexpr values(NULL, NULL)"
-    [[ $? != 0 ]] && failexit "seqwithidxanddummyexpr table should have been allowed to insert"
+    $CDB2SQL_EXE $CDB2_OPTIONS $DBNAME default "insert into $1(a) values(1)"
+    [[ $? != 0 ]] && failexit "$1 table should have been allowed to insert"
+    $CDB2SQL_EXE $CDB2_OPTIONS $DBNAME default "insert into $1 values(2, 2)"
+    [[ $? != 0 ]] && failexit "$1 table should have been allowed to insert"
+    $CDB2SQL_EXE $CDB2_OPTIONS $DBNAME default "insert into $1 values(NULL, NULL)"
+    [[ $? != 0 ]] && failexit "$1 table should have been allowed to insert"
 
-    out=$($CDB2SQL_EXE $CDB2_OPTIONS $DBNAME default "select b from seqwithidxanddummyexpr order by b")
-    [[ $? != 0 ]] && failexit "seqwithidxanddummyexpr table should have been allowed to select"
+    out=$($CDB2SQL_EXE $CDB2_OPTIONS $DBNAME default "select b from $1 order by b")
+    [[ $? != 0 ]] && failexit "$1 table should have been allowed to select"
     exp=$'(b=NULL)\n(b=1)\n(b=2)'
     [[ $out != $exp ]] && failexit "Got $out, Expected $exp"
 
-    $CDB2SQL_EXE -tabs $CDB2_OPTIONS $DBNAME default "exec procedure sys.cmd.verify('seqwithidxanddummyexpr')"
-    [[ $? != 0 ]] && failexit "seqwithidxanddummyexpr should have passed verify"
+    $CDB2SQL_EXE -tabs $CDB2_OPTIONS $DBNAME default "exec procedure sys.cmd.verify('$1')"
+    [[ $? != 0 ]] && failexit "$1 should have passed verify"
 }
 
 function run_test
@@ -515,7 +515,8 @@ function run_test
         lrl_sequence
     fi
 
-    insert_with_idx_and_dummy_expr
+    insert_with_idx_and_dummy_expr seqwithidxanddummyexpr
+    insert_with_idx_and_dummy_expr seqwithdescidxanddummyexpr
 }
 
 run_test

tests/nextsequence.test/seqwithdescidxanddummyexpr.csc2

@@ -0,0 +1,10 @@
+schema
+{
+   int a null=yes
+   int b dbstore=nextsequence null=yes
+}
+keys
+{
+   "b" = <DESCEND>b
+   dup "expr" = (int)"1 + 1"
+}