Updated HAF submodule and cleanup jobs.

.gitlab-ci.yaml

@@ -33,8 +33,11 @@ variables:
 include:
   - template: Workflows/Branch-Pipelines.gitlab-ci.yml
   - project: hive/haf
-    ref: 7bb7aab44a7083994c36f040e84d501c11afc159 # develop
+    ref: e9d964849997e0cb18903f0910c4bdb293997195 # develop
     file: /scripts/ci-helpers/prepare_data_image_job.yml # implicitly pulls base.gitlab-ci.yml from common-ci-configuration
+  - project: hive/common-ci-configuration
+    ref: 91d072682e22869aea3acd7affa20db0f6a7a2c8
+    file: /templates/cache_cleanup.gitlab-ci.yml  
 
 
 #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>| ANCHORS |>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -293,22 +296,20 @@ prepare_hivemind_image:
   tags: *shared_tags
 
 cleanup_hivemind_haf_cache_manual:
-  extends: .cleanup_cache_manual
+  extends: .cleanup_cache_manual_template
   stage: cleanup
   variables:
     CLEANUP_PATH_PATTERN: "/cache/replay_data_hivemind_*"
-  resource_group: ${CI_COMMIT_SHA}
   tags:
     - data-cache-storage
 
 # This job cleans up both Hivemind-specific cache and cache shared between projects, so it should be used in emergencies only.
 # For example, if prepare_haf_data job fails in the same way in Hivemind and HAfAH.
 cleanup_haf_cache_manual:
-  extends: .cleanup_cache_manual
+  extends: .cleanup_cache_manual_template
   stage: cleanup
   variables:
     CLEANUP_PATH_PATTERN: "/cache/replay_data_hivemind_* /cache/replay_data_haf_*"
-  resource_group: ${CI_COMMIT_SHA}
   tags:
     - data-cache-storage
 

haf @ e9d96484

-Subproject commit 7bb7aab44a7083994c36f040e84d501c11afc159
+Subproject commit e9d964849997e0cb18903f0910c4bdb293997195

hive/db/sql_scripts/hafapp_api.sql

@@ -2,7 +2,7 @@ DROP TYPE IF EXISTS hivemind_app.hive_api_operation CASCADE;
 CREATE TYPE hivemind_app.hive_api_operation AS (
     id BIGINT,
     block_num INT,
-    operation_type_id SMALLINT,
+    operation_type_id INTEGER,
     is_virtual BOOLEAN,
     body VARCHAR
 );

hive/indexer/mocking/mock_block.py

@@ -59,6 +59,7 @@ VALUES
 
 class OperationBase:
     operation_id: Optional[int] = None
+    pos_in_block: Optional[int] = 1
 
     def __init__(self, block_number: int, body: dict):
         self._block_number = block_number
@@ -85,11 +86,17 @@ class OperationBase:
     def push(self) -> None:
         sql = """
 INSERT INTO 
-    hive.operations (id, block_num, trx_in_block, op_pos, op_type_id, timestamp, body_binary)
+    hive.operations (id, trx_in_block, op_pos, timestamp, body_binary)
 VALUES
-    (:id, :block_num, -2, -2, :op_type_id, now(), :body :: jsonb :: hive.operation);
+    (:id, -2, -2, now(), :body :: jsonb :: hive.operation);
 """
-        OperationBase.operation_id += 1
+        OperationBase.pos_in_block += 1
+
+        OperationBase.operation_id = Db.instance().query_one(sql='SELECT operation_id FROM hive.operation_id(:block_num, :op_type_id, :pos_in_block);',
+        block_num=self.block_number,
+        op_type_id=self.type.value,
+        pos_in_block=OperationBase.pos_in_block,
+        )
 
         log.info(
             f'Attempting to push mocked {self.__class__.__name__} - type: {self.type} id: {OperationBase.operation_id}'
@@ -98,8 +105,6 @@ VALUES
         Db.instance().query(
             sql=sql,
             id=OperationBase.operation_id,
-            block_num=self.block_number,
-            op_type_id=self.type.value,
             body=json.dumps(self.body),
         )