squash. add stop code for genquery2 msi next_row

korydraughn · Mar 28, 2024 · 846c383 · 846c383
1 parent 43a6739
commit 846c383
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/core/include/irods/rodsErrorTable.h b/lib/core/include/irods/rodsErrorTable.h
@@ -318,6 +318,8 @@ NEW_ERROR(USER_INCOMPATIBLE_OPEN_FLAGS,                -404000)
 NEW_ERROR(INTERMEDIATE_REPLICA_ACCESS,                 -405000)
 NEW_ERROR(LOCKED_DATA_OBJECT_ACCESS,                   -406000)
 NEW_ERROR(CHECK_VERIFICATION_RESULTS,                  -407000)
+NEW_ERROR(GENQUERY2_END_OF_RESULTSET,                  -408000)
+
 /** @} */
 
 /* 500,000 to 800,000 - file driver error */

diff --git a/server/re/src/msi_genquery2.cpp b/server/re/src/msi_genquery2.cpp
@@ -110,7 +110,7 @@ auto msi_genquery2_next_row(MsParam* _handle, RuleExecInfo* _rei) -> int
         // We must return ERROR(stop_code, "") to trigger correct usage of msi_genquery2_next_row().
         // Otherwise, the NREP can loop forever. Ultimately, this means we aren't allowed to return
         // CODE(stop_code) to signal there is no new row available.
-        return 1;
+        return GENQUERY2_END_OF_RESULTSET;
     }
     catch (const irods::exception& e) {
         log_msi::error("{}: {}", __func__, e.client_display_what());