Skip to content

[#601] Merge GTM V6.3-010 into YottaDB master

Brad Westhafer requested to merge bradwesthafer/YDB:v63010 into master

Below is the sequence of commit message of all commits in this MR (in reverse chronological order).

commit 78a2a359f00613c542b7254bf0e016a05277dc7a (HEAD -> v63010, origin/v63010)
Author: Narayanan Iyer <nars@yottadb.com>
Date:   Thu Mar 11 18:21:31 2021 -0500

    Fix incorrectly resolved merge conflicts in sr_port/f_select.c
    
    * This involved adding back `OC_JMP` and `OC_BOOLEXPRFINISH` opcodes that were previously there in YottaDB code
      and removing `OC_JMP` opcodes that were added in GT.M V6.3-010 which are now a duplicate due to `OC_JMP`
      being already added in YottaDB code as part of `OC_BOOLEXPRFINISH`. The duplicate `OC_JMP` affects the
      jump target and causes the `OC_BOOLEXPRFINISH` to not be executed so it is necessary (and not just desirable)
      to remove the duplicate.
commit 0b5376f0e26305a112ff363a17a681f8c0329e9a
Author: Brad Westhafer <brad@yottadb.com>
Date:   Tue Mar 9 16:11:38 2021 -0500

    [V63010] Regenerate GTMDefinedTypesInit*.m for sr_x86_64/sr_aarch64/sr_armv7l
commit 386e787225631dfc5f3f153d266b7a694267550d
Author: Brad Westhafer <brad@yottadb.com>
Date:   Tue Mar 9 15:57:22 2021 -0500

    [V63010] Fix relink test failures caused by V6.3-010 changes to zlink
    
    The V6.3-010 changes conflicted with previous YottaDB changes from issue #432, effectively undoing these changes in part by changing the structure of `op_zlink.c`. This caused the relink subtests basic, barrage, recursive and truncate to fail 100% of the time. These changes restored NOTMNAME error messages for zlink commands ending with `.m` or `.o`. This commit ensures that the `.m` or `.o` is still automatically removed by YottaDB. This also ensures that commands like `ydb -o=y.o.m x.m` work correctly (by ensuring that the check for `.o` and `.m` endings does not execute twice within `zl_cmd_qlf.c`) and fixes a bug in the original #432 changes. This bug involved filenames ending with an `m` or an `o` where no extension was specified and where the second to last character was not a `.`. Such filenames were incorrectly truncated which led to a failure in the `v60001/gtm7461` test due to `datinfo` being truncated to `datinf`.
commit 92cf0cbb91dbc157b3ec8194702a0b9089e662f8
Author: Brad Westhafer <brad@yottadb.com>
Date:   Tue Mar 9 15:56:41 2021 -0500

    [V63010] Fix clang-tidy pipeline failure by addressing new clang-tidy warnings
    
    This commit addresses new clang-tidy warnings introduced by the V6.3-010 merge by either fixing them or adding them to the expected warnings list as appropriate to ensure that the pipeline passes.
commit 34a00ba7f9693e69138e90688f4389f545f81ae3
Author: Brad Westhafer <brad@yottadb.com>
Date:   Wed Feb 24 15:24:25 2021 -0500

    [V63010] Revert sr_unix/lke_cmd.c to V6.3-010 version
    
    This commit reverts changes to sr_unix/lke_cmd.c due to the previous removal of the V6.3-009 lock changes. As there were no other YottaDB changes to this file, the V6.3-010 version of the file is restored without any changes.
commit 38793e6a2ad4b1515d9fb16d932392f7aa2f72b7
Author: Brad Westhafer <brad@yottadb.com>
Date:   Thu Feb 4 11:39:34 2021 -0500

    [V63010] Resolve conflicts during merge of GT.M V6.3-010 into YottaDB mainline
    
    * sr_port/gtm_env_init : $gtm_socket_keepalive_idle was renamed to $ydb_socket_keepalive_idle in this and all other files where it was introduced. $gtm_socket_keepalive_idle is equivalent to $ydb_socket_keepalive_idle.
    * sr_port/msg.m : The conflict involved 2 comments inserted at the same spot. I placed the YottaDB comment first followed by the V6.3-010 comment.
    * sr_port/objlabel.h : This does not need to be raised for r1.32 as it was already raised during the V6.3-009 merge
    * sr_port/op_xnew.c : Due to previous YottaDB changes that added the SimpleThreadAPI, the ESTABLISH() macro requires threadgbls to be initialized. This was added.
    * sr_unix/gtmrecv_fetchresync.c : The SEND_REPL_FETCH_RESYNC_MSG() macro and gtmrecv_fetchresync_connect() function were retained and previous YottaDB changes to those code paths were ported over.
    * sr_x86_64/obj_filesp.c : Equivalent changes were made to sr_armv7l/obj_filesp.c and sr_aarch64/obj_filesp.c.
    * sr_unix/mu_getkey.* : Due to a build error on machines with newer gcc versions, V6.3-013 changes that moved the GBLDEFs to the .c file and placed GBLREFs in the .h file were ported forward.
commit 5d90180adc1e60d6cf864fa94a3f70415c9d2519
Author: Brad Westhafer <brad@yottadb.com>
Date:   Wed Jan 27 11:54:01 2021 -0500

    [V63010] Address merge conflicts involving deleted files
    
        * Changes to sr_unix/gtm_logicals.h in GT.M V6.3-010 have been incorporated into
          sr_port/ydb_logicals_tab.h in YottaDB.
        * The change to sr_unix/gtminstall.sh in GT.M V6.3-010 that added the --filename
          option has been incorporated into sr_unix/ydbinstall.sh in YottaDB. Changes
          related to temporary working directories and permissions have been discarded
          and existing YottaDB behavior in those areas retained.
commit 68c54e3ac7665f09b2ac4a35e7b8b95592f60d99
Author: Narayanan Iyer <nars@yottadb.com>
Date:   Tue Nov 12 15:06:59 2019 -0500

    [V63010] Merge GT.M V6.3-010 into YottaDB mainline (with conflicts)
Edited by Brad Westhafer

Merge request reports