Skip to content

fix: Partially fix long running import #3300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gabrielshanahan wants to merge 6 commits into
base: main
Choose a base branch
from
+59 −22
Open

fix: Partially fix long running import #3300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1cb7261
fix: Fix incorrect call to importService.saveLanguages - all language…
gabrielshanahan Nov 6, 2025
03370ba
fix: Remove call to importDataManager.populateStoredTranslations - we…
gabrielshanahan Nov 6, 2025
a3276b4
refactor: remove unnecessary loop qualifier
gabrielshanahan Nov 6, 2025
9e5e03a
refactor: Make CoreImportFilesProcessor.processTranslations less tangled
gabrielshanahan Nov 6, 2025
877b299
perf: Make import quicker by caching imported translations, and using…
gabrielshanahan Nov 6, 2025
f7e962d
to be removed: test on big enough json
gabrielshanahan Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .../kotlin/io/tolgee/api/v2/controllers/v2ImportController/V2ImportControllerAddFilesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ class V2ImportControllerAddFilesTest : ProjectAuthControllerTest("/v2/projects/"
@Value("classpath:import/zipOfJsons.zip")
lateinit var zipOfJsons: Resource

@Value("classpath:import/bigZipOfJsons.zip")
lateinit var bigZipOfJsons: Resource

@Value("classpath:import/zipOfUnknown.zip")
lateinit var zipOfUnknown: Resource

Expand Down Expand Up @@ -192,11 +195,11 @@ class V2ImportControllerAddFilesTest : ProjectAuthControllerTest("/v2/projects/"
val base = dbPopulator.createBase()
commitTransaction()

performImport(projectId = base.project.id, listOf(Pair("zipOfJsons.zip", zipOfJsons)))
.andAssertThatJson {
node("result._embedded.languages").isArray.hasSize(3)
}
validateSavedJsonImportData(base.project, base.userAccount)
performImport(projectId = base.project.id, listOf(Pair("bigZipOfJsons.zip", bigZipOfJsons)))
// .andAssertThatJson {
// node("result._embedded.languages").isArray.hasSize(3)
// }
// validateSavedJsonImportData(base.project, base.userAccount)
Comment on lines +198 to +202
Copy link
Contributor

@coderabbitai coderabbitai bot Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

Commented assertions hide test failures and provide false confidence.

All validation logic is commented out, so the test exercises the import but verifies nothing. This typically signals that the test is failing and assertions were disabled rather than fixed. Given the collision-detection bug in CoreImportFilesProcessor.kt (see my comments there), this test likely fails because translations are incorrectly rejected during import.

Restore the assertions and fix the underlying import bug:

-    performImport(projectId = base.project.id, listOf(Pair("bigZipOfJsons.zip", bigZipOfJsons)))
-//      .andAssertThatJson {
-//        node("result._embedded.languages").isArray.hasSize(3)
-//      }
-//    validateSavedJsonImportData(base.project, base.userAccount)
+    performImport(projectId = base.project.id, listOf(Pair("bigZipOfJsons.zip", bigZipOfJsons)))
+      .andAssertThatJson {
+        node("result._embedded.languages").isArray.hasSize(3)
+      }
+    validateSavedJsonImportData(base.project, base.userAccount)

}

@Test
Expand Down
Binary file added backend/app/src/test/resources/import/bigZipOfJsons.zip
View file
Open in desktop
Binary file not shown.
53 changes: 36 additions & 17 deletions backend/data/src/main/kotlin/io/tolgee/service/dataImport/CoreImportFilesProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,12 @@ class CoreImportFilesProcessor(
val errors = mutableListOf<ErrorResponseBody>()
val warnings = mutableListOf<ErrorResponseBody>()

private val importedTranslations =
mutableMapOf<ImportLanguage, MutableMap<ImportKey, MutableList<ImportTranslation>>>()

fun processFiles(files: Collection<ImportFileDto>?) {
errors.addAll(processFilesRecursive(files))
importDataManager.populateStoredTranslationsFrom(importedTranslations)
renderPossibleNamespacesWarning()
}

Expand Down Expand Up @@ -231,18 +235,22 @@ class CoreImportFilesProcessor(
private fun FileProcessorContext.processLanguages() {
this.languages.forEach { entry ->
val languageEntity = entry.value
importDataManager.storedLanguages.add(languageEntity)

if (!shouldBeImported(languageEntity)) {
languageEntity.ignored = true
return@forEach
}
}

preselectExistingLanguage(languageEntity)
if (saveData) {
importService.saveLanguages(this.languages.values)
if (saveData) {
importService.saveLanguages(this.languages.values.filterNot { it.ignored })
}

this.languages.forEach { entry ->
val languageEntity = entry.value
importDataManager.storedLanguages.add(languageEntity)

if (!languageEntity.ignored) {
preselectExistingLanguage(languageEntity)
}
importDataManager.populateStoredTranslations(entry.value)
}
}

Expand Down Expand Up @@ -319,13 +327,27 @@ class CoreImportFilesProcessor(
}

private fun FileProcessorContext.processTranslations() {
this.translations.forEach { entry ->
val keyEntity = getOrCreateKey(entry.key)
entry.value.forEach translationForeach@{ newTranslation ->
processTranslation(newTranslation, keyEntity)
val translationsByKeys = translations.mapKeys { (keyName, _) ->
getOrCreateKey(keyName).apply {
shouldBeImported = shouldImportKey(name)
}
}

translationsByKeys.forEach { (key, translations) ->
translations.forEach { translation ->
importedTranslations.putIfAbsent(translation.language, mutableMapOf())
importedTranslations.getValue(translation.language).putIfAbsent(key, mutableListOf())
importedTranslations.getValue(translation.language).getValue(key).add(translation)
}
keyEntity.shouldBeImported = shouldImportKey(keyEntity.name)
}

translationsByKeys.forEach { (key, translations) ->
translations.forEach { translation ->
translation.key = key
processTranslation(translation)
}
Comment on lines +336 to +348
Copy link
Contributor

@coderabbitai coderabbitai bot Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

Collision detection regressed: every first translation is now rejected

By adding each ImportTranslation into importedTranslations before processTranslation runs, checkForInFileCollisions now sees the current translation in storedTranslations. Because the list is non-empty, isCollision stays true, we return early at Line 367, and the very first occurrence of every key/language pair never reaches addToStoredTranslations. Imports will therefore drop all translations on the first encounter. Please exclude the current object from the collision set (or defer adding it until after collision checks) so that only previously processed entries are considered. One possible fix:

-    val storedTranslations = importedTranslations[newTranslation.language]
-      ?.get(newTranslation.key)
-      ?: emptyList()
+    val storedTranslations = importedTranslations[newTranslation.language]
+      ?.get(newTranslation.key)
+      ?.filter { it !== newTranslation }
+      ?: emptyList()

and reuse storedTranslations when computing isCollision.

Also applies to: 385-388

🤖 Prompt for AI Agents 
In
backend/data/src/main/kotlin/io/tolgee/service/dataImport/CoreImportFilesProcessor.kt
around lines 335-347 (and similarly 385-388), the code adds each
ImportTranslation into importedTranslations before calling processTranslation,
which causes checkForInFileCollisions to see the current translation as already
stored and incorrectly treat it as a collision; change the flow so the current
translation is not present in the set checked for collisions — either remove the
putInto-importedTranslations step before processTranslation and instead add the
translation into importedTranslations/storedTranslations after
processTranslation succeeds, or adjust the collision-check to exclude the exact
current object (e.g., compute isCollision using storedTranslations that do not
include the current translation) so only previously processed entries are
considered.

}

if (saveData) {
importDataManager.saveAllStoredTranslations()
}
Expand All @@ -340,9 +362,7 @@ class CoreImportFilesProcessor(

private fun FileProcessorContext.processTranslation(
newTranslation: ImportTranslation,
keyEntity: ImportKey,
) {
newTranslation.key = keyEntity
val (isCollision, fileCollisions) = checkForInFileCollisions(newTranslation)
if (isCollision) {
fileEntity.addIssues(fileCollisions)
Expand All @@ -363,9 +383,8 @@ class CoreImportFilesProcessor(
var isCollision = false
val issues =
mutableListOf<Pair<FileIssueType, Map<FileIssueParamType, String>>>()
val storedTranslations =
importDataManager
.getStoredTranslations(newTranslation.key, newTranslation.language)
val storedTranslations = importedTranslations[newTranslation.language]?.get(newTranslation.key) ?: emptyList()

if (storedTranslations.isNotEmpty()) {
isCollision = true
storedTranslations.forEach { collision ->
Expand Down
15 changes: 15 additions & 0 deletions backend/data/src/main/kotlin/io/tolgee/service/dataImport/ImportDataManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,21 @@ class ImportDataManager(
return languageData
}

fun populateStoredTranslationsFrom(
importedTranslations: MutableMap<ImportLanguage, MutableMap<ImportKey, MutableList<ImportTranslation>>>
) {
importedTranslations.forEach { (importLanguage, translationsByKey) ->
storedTranslations.putIfAbsent(importLanguage, mutableMapOf())
translationsByKey.forEach { (key, translations) ->
storedTranslations.getValue(importLanguage).putIfAbsent(key, mutableListOf())
storedTranslations.getValue(importLanguage)[key] = buildSet {
addAll(storedTranslations.getValue(importLanguage).getValue(key))
addAll(translations)
}.toMutableList()
}
}
}

private fun populateStoredTranslationsToConvertPlaceholders() {
val translations = importService.findTranslationsForPlaceholderConversion(import.id)
translations.forEach {
Expand Down
Loading