Changeset 42821 for trunk/Ohana/src/dvomerge

Timestamp:

May 8, 2025, 4:29:52 PM (15 months ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20230313

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/dvomerge/src/dvomergeUpdate_catalogs.c (modified) (1 diff)
• src/dvomerge/src/merge_catalogs_old.c (modified) (1 diff)

trunk/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -2 +2 @@
 # define DEBUG 1
 # define MACHINE_GROUPS 1
+# define MEMCHECK_VERBOSE 0
 
 // in parallel mode, the target database may be distributed, while the input database is

trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -497 +497 @@
       int outputIndex;
       if (secfiltMap) {
+        if (secfiltMap[j] < 0) continue;  // skip secfilt entries from input that are not in the output
         outputIndex = (Nave * NsecfiltOut) + secfiltMap[j];
       } else {