squash w/ delay rule claim API updates. Fixed keywords for APIs.

korydraughn · Nov 10, 2024 · e5c9c97 · e5c9c97
1 parent 49df515
commit e5c9c97
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lib/core/include/irods/rodsKeyWdDef.h b/lib/core/include/irods/rodsKeyWdDef.h
@@ -240,9 +240,9 @@
 #define RULE_EXECUTION_CONTEXT_KW                   "rule_execution_context"
 
 // Keywords used by the delay rule APIs to identify delay server claim columns.
-#define RULE_DELAY_SERVER_HOST_KW                   "rule_delay_server_host"
-#define RULE_DELAY_SERVER_PID_KW                    "rule_delay_server_pid"
-#define RULE_DELAY_SERVER_CLAIMED_TIME_KW           "rule_delay_server_claimed_time"
+#define RULE_CLAIM_HOST_KW                          "rule_claim_host"
+#define RULE_CLAIM_HOST_PID_KW                      "rule_claim_host_pid"
+#define RULE_CLAIM_TIME_KW                          "rule_claim_time"
 
 #define EXCLUDE_FILE_KW                             "excludeFile"
 #define AGE_KW                                      "age"  /* age of the file for itrim */

diff --git a/plugins/database/src/db_plugin.cpp b/plugins/database/src/db_plugin.cpp
@@ -3617,9 +3617,9 @@ irods::error db_mod_rule_exec_op(
         RULE_LAST_EXE_TIME_KW,
         RULE_EXE_STATUS_KW,
         RULE_EXECUTION_CONTEXT_KW,
-        RULE_DELAY_SERVER_HOST_KW,
-        RULE_DELAY_SERVER_PID_KW,
-        RULE_DELAY_SERVER_CLAIMED_TIME_KW,
+        RULE_CLAIM_HOST_KW,
+        RULE_CLAIM_HOST_PID_KW,
+        RULE_CLAIM_TIME_KW,
         "END"
     };
 
@@ -3636,9 +3636,9 @@ irods::error db_mod_rule_exec_op(
         "last_exe_time",
         "exe_status",
         "exe_context",
-        "delay_server_host",
-        "delay_server_pid",
-        "delay_server_claimed_ts",
+        "claim_host",
+        "claim_host_pid",
+        "claim_ts",
 
         // The following columns are handled automatically.
         // ** New columns MUST be added before these lines! **