- Adjust code to handle c8Key is string instead of long

tasso94 · tasso94 · commit dc50673dbd58 · 2026-02-04T13:53:43.000+01:00
- Change `C8_KEY` column from `BIGINT` to `VARCHAR(255)`.
diff --git a/data-migrator/core/src/main/java/io/camunda/migration/data/RuntimeMigrator.java b/data-migrator/core/src/main/java/io/camunda/migration/data/RuntimeMigrator.java
@@ -84,7 +84,7 @@ protected void migrate() {
       if (skipReason == null && shouldStartProcessInstance(c7ProcessInstanceId)) {
         startProcessInstance(c7ProcessInstanceId, createTime);
       } else if (isUnknown(c7ProcessInstanceId)) {
-        dbClient.insert(c7ProcessInstanceId, null, createTime, TYPE.RUNTIME_PROCESS_INSTANCE, skipReason);
+        dbClient.insert(c7ProcessInstanceId, (Long) null, createTime, TYPE.RUNTIME_PROCESS_INSTANCE, skipReason);
       } else {
         dbClient.updateSkipReason(c7ProcessInstanceId, TYPE.RUNTIME_PROCESS_INSTANCE, skipReason);
       }
@@ -131,7 +131,7 @@ protected void handleVariableInterceptorException(VariableInterceptorException e
     RuntimeMigratorLogs.stacktrace(e);
 
     if (MIGRATE.equals(mode)) {
-      dbClient.insert(c7ProcessInstanceId, null, createTime, TYPE.RUNTIME_PROCESS_INSTANCE, e.getMessage());
+      dbClient.insert(c7ProcessInstanceId, (Long) null, createTime, TYPE.RUNTIME_PROCESS_INSTANCE, e.getMessage());
     } else if (RETRY_SKIPPED.equals(mode)) {
       dbClient.updateSkipReason(c7ProcessInstanceId, TYPE.RUNTIME_PROCESS_INSTANCE, e.getMessage());
     }
diff --git a/data-migrator/core/src/main/java/io/camunda/migration/data/impl/clients/DbClient.java b/data-migrator/core/src/main/java/io/camunda/migration/data/impl/clients/DbClient.java
@@ -99,6 +99,13 @@ public List<String> findAllC7Ids() {
    * Updates a record by setting the key for an existing ID and type.
    */
   public void updateC8KeyByC7IdAndType(String c7Id, Long c8Key, TYPE type) {
+    updateC8KeyByC7IdAndType(c7Id, (c8Key == null) ? null : c8Key.toString(), type);
+  }
+
+  /**
+   * Updates a record by setting the key for an existing ID and type.
+   */
+  public void updateC8KeyByC7IdAndType(String c7Id, String c8Key, TYPE type) {
     DbClientLogs.updatingC8KeyForC7Id(c7Id, c8Key);
     var model = createIdKeyDbModel(c7Id, null, c8Key, type);
     callApi(() -> idKeyMapper.updateC8KeyByC7IdAndType(model), FAILED_TO_UPDATE_KEY + c8Key);
@@ -132,6 +139,13 @@ public void insert(String c7Id, Long c8Key, TYPE type) {
    * Inserts a new process instance record into the mapping table.
    */
   public void insert(String c7Id, Long c8Key, Date createTime, TYPE type, String skipReason) {
+    insert(c7Id, (c8Key == null) ? null : c8Key.toString(), createTime, type, skipReason);
+  }
+
+  /**
+   * Inserts a new process instance record into the mapping table.
+   */
+  public void insert(String c7Id, String c8Key, Date createTime, TYPE type, String skipReason) {
     String finalSkipReason = properties.getSaveSkipReason() ? skipReason : null;
     DbClientLogs.insertingRecord(c7Id, createTime, null, finalSkipReason);
     var model = createIdKeyDbModel(c7Id, createTime, c8Key, type, finalSkipReason);
@@ -201,7 +215,7 @@ protected void deleteByC7Id(String c7Id) {
   /**
    * Creates a new IdKeyDbModel instance with the provided parameters including skip reason.
    */
-  protected IdKeyDbModel createIdKeyDbModel(String c7Id, Date createTime, Long c8Key, TYPE type, String skipReason) {
+  protected IdKeyDbModel createIdKeyDbModel(String c7Id, Date createTime, String c8Key, TYPE type, String skipReason) {
     var keyIdDbModel = new IdKeyDbModel();
     keyIdDbModel.setC7Id(c7Id);
     keyIdDbModel.setCreateTime(createTime);
@@ -214,7 +228,7 @@ protected IdKeyDbModel createIdKeyDbModel(String c7Id, Date createTime, Long c8K
   /**
    * Creates a new IdKeyDbModel instance with the provided parameters.
    */
-  protected IdKeyDbModel createIdKeyDbModel(String c7Id, Date createTime, Long c8Key, TYPE type) {
+  protected IdKeyDbModel createIdKeyDbModel(String c7Id, Date createTime, String c8Key, TYPE type) {
     return createIdKeyDbModel(c7Id, createTime, c8Key, type, null);
   }
 }
diff --git a/data-migrator/core/src/main/java/io/camunda/migration/data/impl/history/AuditLogMigrator.java b/data-migrator/core/src/main/java/io/camunda/migration/data/impl/history/AuditLogMigrator.java
@@ -9,13 +9,15 @@
 
 import static io.camunda.migration.data.MigratorMode.RETRY_SKIPPED;
 import static io.camunda.migration.data.impl.logging.HistoryMigratorLogs.SKIP_REASON_BELONGS_TO_SKIPPED_TASK;
+import static io.camunda.migration.data.constants.MigratorConstants.C7_HISTORY_PARTITION_ID;
 import static io.camunda.migration.data.impl.logging.HistoryMigratorLogs.SKIP_REASON_MISSING_PROCESS_DEFINITION;
 import static io.camunda.migration.data.impl.logging.HistoryMigratorLogs.SKIP_REASON_MISSING_PROCESS_INSTANCE;
 import static io.camunda.migration.data.impl.logging.HistoryMigratorLogs.SKIP_REASON_MISSING_ROOT_PROCESS_INSTANCE;
 import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_AUDIT_LOG;
 import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_PROCESS_DEFINITION;
 import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_PROCESS_INSTANCE;
 import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_USER_TASK;
+import static io.camunda.migration.data.impl.util.ConverterUtil.getNextKey;
 
 import io.camunda.db.rdbms.write.domain.AuditLogDbModel;
 import io.camunda.migration.data.exception.EntityInterceptorException;
@@ -96,8 +98,8 @@ public void migrateOne(UserOperationLogEntry c7AuditLog) {
   protected AuditLogDbModel.Builder configureAuditLogBuilder(UserOperationLogEntry c7AuditLog) {
     AuditLogDbModel.Builder builder = new AuditLogDbModel.Builder();
 
-    String auditLogKey = c7AuditLog.getId();
-    builder.auditLogKey(auditLogKey);
+    String key = String.format("%s-%s", C7_HISTORY_PARTITION_ID, getNextKey());
+    builder.auditLogKey(key);
 
     resolveProcessInstanceAndDefinitionKeys(builder, c7AuditLog);
 
@@ -183,9 +185,7 @@ protected void validateDependenciesAndInsert(
    */
   protected void insertAuditLog(UserOperationLogEntry c7AuditLog, AuditLogDbModel dbModel, String c7AuditLogId) {
     c8Client.insertAuditLog(dbModel);
-    // Use hash code of the audit log key as the Long value for tracking
-    Long trackingKey = (long) dbModel.auditLogKey().hashCode(); // TODO
-    markMigrated(c7AuditLogId, trackingKey, c7AuditLog.getTimestamp(), HISTORY_AUDIT_LOG);
+    markMigrated(c7AuditLogId, dbModel.auditLogKey(), c7AuditLog.getTimestamp(), HISTORY_AUDIT_LOG);
     HistoryMigratorLogs.migratingHistoricAuditLogCompleted(c7AuditLogId);
   }
 
diff --git a/data-migrator/core/src/main/java/io/camunda/migration/data/impl/history/BaseMigrator.java b/data-migrator/core/src/main/java/io/camunda/migration/data/impl/history/BaseMigrator.java
@@ -14,6 +14,7 @@
 import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_FLOW_NODE;
 import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_PROCESS_INSTANCE;
 import static io.camunda.migration.data.impl.util.ConverterUtil.convertDate;
+import static io.camunda.search.entities.DecisionInstanceEntity.DecisionDefinitionType;
 
 import io.camunda.db.rdbms.read.domain.DecisionDefinitionDbQuery;
 import io.camunda.db.rdbms.read.domain.DecisionInstanceDbQuery;
@@ -43,7 +44,6 @@
 import java.util.List;
 import java.util.Optional;
 import org.camunda.bpm.engine.ProcessEngine;
-import org.camunda.bpm.engine.impl.util.ClockUtil;
 import org.camunda.bpm.model.dmn.DmnModelInstance;
 import org.camunda.bpm.model.dmn.instance.Decision;
 import org.camunda.bpm.model.dmn.instance.LiteralExpression;
@@ -202,6 +202,14 @@ protected boolean shouldMigrate(String id, TYPE type) {
     return !dbClient.checkExistsByC7IdAndType(id, type);
   }
 
+  protected void markMigrated(String c7Id, String c8Key, Date createTime, TYPE type) {
+    if (RETRY_SKIPPED.equals(mode)) {
+      dbClient.updateC8KeyByC7IdAndType(c7Id, c8Key, type);
+    } else if (MIGRATE.equals(mode)) {
+      dbClient.insert(c7Id, c8Key, createTime, type, null);
+    }
+  }
+
   protected void markMigrated(String c7Id, Long c8Key, Date createTime, TYPE type) {
     saveRecord(c7Id, c8Key, type, createTime, null);
   }
@@ -241,9 +249,9 @@ protected DecisionInstanceEntity.DecisionDefinitionType determineDecisionType(Dm
     }
 
     if (decision.getExpression() instanceof LiteralExpression) {
-      return DecisionInstanceEntity.DecisionDefinitionType.LITERAL_EXPRESSION;
+      return DecisionDefinitionType.LITERAL_EXPRESSION;
     } else {
-      return DecisionInstanceEntity.DecisionDefinitionType.DECISION_TABLE;
+      return DecisionDefinitionType.DECISION_TABLE;
     }
   }
 
diff --git a/data-migrator/core/src/main/java/io/camunda/migration/data/impl/logging/DbClientLogs.java b/data-migrator/core/src/main/java/io/camunda/migration/data/impl/logging/DbClientLogs.java
@@ -42,7 +42,7 @@ public class DbClientLogs {
   public static final String FAILED_TO_DELETE = "Failed to delete mapping for C7 ID: ";
   public static final String FAILED_TO_DROP_MIGRATION_TABLE = "Failed to drop migration mapping table";
 
-  public static void updatingC8KeyForC7Id(String c7Id, Long c8Key) {
+  public static void updatingC8KeyForC7Id(String c7Id, String c8Key) {
     LOGGER.debug(UPDATING_KEY_FOR_C7_ID, c7Id, c8Key);
   }
 
diff --git a/data-migrator/core/src/main/java/io/camunda/migration/data/impl/persistence/IdKeyDbModel.java b/data-migrator/core/src/main/java/io/camunda/migration/data/impl/persistence/IdKeyDbModel.java
@@ -14,7 +14,7 @@
 public class IdKeyDbModel {
 
   protected String c7Id;
-  protected Long c8Key;
+  protected String c8Key;
   protected TYPE type;
   protected Date createTime;
   protected String skipReason;
@@ -27,7 +27,7 @@ public IdKeyDbModel(String c7Id, Date createTime) {
     this.createTime = createTime;
   }
 
-  public Long getC8Key() {
+  public String getC8Key() {
     return c8Key;
   }
 
@@ -47,7 +47,7 @@ public String getSkipReason() {
     return skipReason;
   }
 
-  public void setC8Key(Long c8Key) {
+  public void setC8Key(String c8Key) {
     this.c8Key = c8Key;
   }
 
diff --git a/data-migrator/core/src/main/resources/db/changelog/migrator/db.0.3.0.xml b/data-migrator/core/src/main/resources/db/changelog/migrator/db.0.3.0.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH under
+  ~ one or more contributor license agreements. See the NOTICE file distributed
+  ~ with this work for additional information regarding copyright ownership.
+  ~ Licensed under the Camunda License 1.0. You may not use this file
+  ~ except in compliance with the Camunda License 1.0.
+  -->
+<databaseChangeLog
+  xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+        http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+
+  <changeSet id="tag_before_modify_c8_key_column" author="Camunda">
+    <tagDatabase tag="tag_before_modify_c8_key_column"/>
+  </changeSet>
+
+  <changeSet id="modify_c8_key_column_to_varchar" author="Camunda">
+    <modifyDataType tableName="${prefix}MIGRATION_MAPPING"
+                    columnName="C8_KEY"
+                    newDataType="VARCHAR(255)"/>
+  </changeSet>
+
+</databaseChangeLog>
diff --git a/data-migrator/core/src/main/resources/db/changelog/migrator/db.changelog-master.yaml b/data-migrator/core/src/main/resources/db/changelog/migrator/db.changelog-master.yaml
@@ -1,3 +1,5 @@
 databaseChangeLog:
   - include:
       file: db/changelog/migrator/db.0.1.0.xml
+  - include:
+      file: db/changelog/migrator/db.0.3.0.xml
diff --git a/data-migrator/core/src/main/resources/mapper/IdKey.xml b/data-migrator/core/src/main/resources/mapper/IdKey.xml
@@ -11,7 +11,7 @@
 
   <resultMap id="idKeyResultMap" type="io.camunda.migration.data.impl.persistence.IdKeyDbModel">
     <id property="c7Id" column="C7_ID" jdbcType="VARCHAR"/>
-    <result property="c8Key" column="C8_KEY" jdbcType="BIGINT"/>
+    <result property="c8Key" column="C8_KEY" jdbcType="VARCHAR"/>
     <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
     <result property="type" column="TYPE" jdbcType="VARCHAR"/>
     <result property="skipReason" column="SKIP_REASON" jdbcType="VARCHAR"/>
@@ -58,7 +58,7 @@
 
   <update id="updateC8KeyByC7IdAndType" parameterType="io.camunda.migration.data.impl.persistence.IdKeyDbModel">
     UPDATE ${prefix}MIGRATION_MAPPING
-    SET C8_KEY = #{c8Key, jdbcType=BIGINT}
+    SET C8_KEY = #{c8Key, jdbcType=VARCHAR}
     WHERE C7_ID = #{c7Id, jdbcType=VARCHAR} AND TYPE = #{type, jdbcType=VARCHAR}
   </update>
 
@@ -100,7 +100,7 @@
     parameterType="io.camunda.migration.data.impl.persistence.IdKeyDbModel"
     flushCache="true">
     INSERT INTO ${prefix}MIGRATION_MAPPING (C7_ID, C8_KEY, CREATE_TIME, TYPE, SKIP_REASON)
-    VALUES (#{c7Id, jdbcType=VARCHAR}, #{c8Key, jdbcType=BIGINT}, #{createTime, jdbcType=TIMESTAMP}, #{type, jdbcType=VARCHAR}, #{skipReason, jdbcType=VARCHAR})
+    VALUES (#{c7Id, jdbcType=VARCHAR}, #{c8Key, jdbcType=VARCHAR}, #{createTime, jdbcType=TIMESTAMP}, #{type, jdbcType=VARCHAR}, #{skipReason, jdbcType=VARCHAR})
   </insert>
 
   <delete id="deleteByC7Id">
diff --git a/data-migrator/plugins/cockpit/src/test/java/io/camunda/migration/data/plugin/cockpit/resources/MigratorResourceTest.java b/data-migrator/plugins/cockpit/src/test/java/io/camunda/migration/data/plugin/cockpit/resources/MigratorResourceTest.java
@@ -160,7 +160,7 @@ protected void assertIdKeyDbModelListsEqual(List<IdKeyDbModel> expected, List<Id
   protected IdKeyDbModel createExpectedMigratedModel(String c7Id) {
     IdKeyDbModel model = new IdKeyDbModel();
     model.setC7Id(c7Id);
-    model.setC8Key(getNextKey());
+    model.setC8Key(String.valueOf(getNextKey()));
     model.setType(IdKeyMapper.TYPE.RUNTIME_PROCESS_INSTANCE);
     return model;
   }
@@ -184,7 +184,7 @@ protected static void insertTestData(IdKeyDbModel idKeyDbModel) {
         if (idKeyDbModel.getC8Key() == null) {
           stmt.setNull(2, java.sql.Types.BIGINT);
         } else {
-          stmt.setLong(2, idKeyDbModel.getC8Key());
+          stmt.setString(2, idKeyDbModel.getC8Key());
         }
         stmt.executeUpdate();
       }
diff --git a/data-migrator/qa/integration-tests/src/test/java/io/camunda/migration/data/qa/history/IdKeyCreateTimeMappingTest.java b/data-migrator/qa/integration-tests/src/test/java/io/camunda/migration/data/qa/history/IdKeyCreateTimeMappingTest.java
@@ -44,6 +44,6 @@ public void shouldCorrectlyMapCreateTimeDuringActualMigration() {
 
     assertThat(migratedInstance.getC7Id()).isEqualTo(processInstanceId);
     assertThat(migratedInstance.getCreateTime()).isNotNull().isBeforeOrEqualTo(beforeMigration); // Should be before we started the test
-    assertThat(migratedInstance.getC8Key()).isNotNull().isPositive();
+    assertThat(Long.valueOf(migratedInstance.getC8Key())).isNotNull().isPositive();
   }
 }
diff --git a/data-migrator/qa/integration-tests/src/test/java/io/camunda/migration/data/qa/history/TransactionRollbackTest.java b/data-migrator/qa/integration-tests/src/test/java/io/camunda/migration/data/qa/history/TransactionRollbackTest.java
@@ -363,7 +363,7 @@ protected void configureSpyToFailOnFirstInsert(IdKeyMapper.TYPE entityType) {
       return invocation.callRealMethod();
     }).when(dbClient).insert(
         anyString(),
-        anyLong(),
+        anyString(),
         any(Date.class),
         any(IdKeyMapper.TYPE.class),
         any());
diff --git a/data-migrator/qa/integration-tests/src/test/java/io/camunda/migration/data/qa/history/entity/HistoryProcessInstanceTest.java b/data-migrator/qa/integration-tests/src/test/java/io/camunda/migration/data/qa/history/entity/HistoryProcessInstanceTest.java
@@ -238,7 +238,7 @@ public void shouldSkipEntitiesWhenRootProcessInstanceNotMigrated() {
     historyMigrator.setMode(MigratorMode.MIGRATE);
 
     // Mark parent as skipped
-    dbClient.insert(parentInstance.getId(), null, new Date(), IdKeyMapper.TYPE.HISTORY_PROCESS_INSTANCE, "test skip");
+    dbClient.insert(parentInstance.getId(), (Long) null, new Date(), IdKeyMapper.TYPE.HISTORY_PROCESS_INSTANCE, "test skip");
 
     // when - attempt to migrate (sub should be skipped because parent is skipped)
     historyMigrator.migrate();

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public class DbClientLogs {`
`42`	`42`	`public static final String FAILED_TO_DELETE = "Failed to delete mapping for C7 ID: ";`
`43`	`43`	`public static final String FAILED_TO_DROP_MIGRATION_TABLE = "Failed to drop migration mapping table";`
`44`	`44`
`45`		`- public static void updatingC8KeyForC7Id(String c7Id, Long c8Key) {`
	`45`	`+ public static void updatingC8KeyForC7Id(String c7Id, String c8Key) {`
`46`	`46`	`LOGGER.debug(UPDATING_KEY_FOR_C7_ID, c7Id, c8Key);`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`public class IdKeyDbModel {`
`15`	`15`
`16`	`16`	`protected String c7Id;`
`17`		`- protected Long c8Key;`
	`17`	`+ protected String c8Key;`
`18`	`18`	`protected TYPE type;`
`19`	`19`	`protected Date createTime;`
`20`	`20`	`protected String skipReason;`
`@@ -27,7 +27,7 @@ public IdKeyDbModel(String c7Id, Date createTime) {`
`27`	`27`	`this.createTime = createTime;`
`28`	`28`	`}`
`29`	`29`
`30`		`- public Long getC8Key() {`
	`30`	`+ public String getC8Key() {`
`31`	`31`	`return c8Key;`
`32`	`32`	`}`
`33`	`33`
`@@ -47,7 +47,7 @@ public String getSkipReason() {`
`47`	`47`	`return skipReason;`
`48`	`48`	`}`
`49`	`49`
`50`		`- public void setC8Key(Long c8Key) {`
	`50`	`+ public void setC8Key(String c8Key) {`
`51`	`51`	`this.c8Key = c8Key;`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ protected void assertIdKeyDbModelListsEqual(List<IdKeyDbModel> expected, List<Id`
`160`	`160`	`protected IdKeyDbModel createExpectedMigratedModel(String c7Id) {`
`161`	`161`	`IdKeyDbModel model = new IdKeyDbModel();`
`162`	`162`	`model.setC7Id(c7Id);`
`163`		`- model.setC8Key(getNextKey());`
	`163`	`+ model.setC8Key(String.valueOf(getNextKey()));`
`164`	`164`	`model.setType(IdKeyMapper.TYPE.RUNTIME_PROCESS_INSTANCE);`
`165`	`165`	`return model;`
`166`	`166`	`}`
`@@ -184,7 +184,7 @@ protected static void insertTestData(IdKeyDbModel idKeyDbModel) {`
`184`	`184`	`if (idKeyDbModel.getC8Key() == null) {`
`185`	`185`	`stmt.setNull(2, java.sql.Types.BIGINT);`
`186`	`186`	`} else {`
`187`		`- stmt.setLong(2, idKeyDbModel.getC8Key());`
	`187`	`+ stmt.setString(2, idKeyDbModel.getC8Key());`
`188`	`188`	`}`
`189`	`189`	`stmt.executeUpdate();`
`190`	`190`	`}`