Minimum row

internal/topdata/expansion_native.go

@@ -108,7 +108,7 @@ func mergeExpansionData(collected []nativeCollectedDataset) ([]nativeCollectedDa
 					usedKeys[key] = struct{}{}
 				}
 			}
-			nextID := nextAvailableID(usedIDs)
+			nextID := nextAvailableIDAtLeast(usedIDs, targetDS.Dataset.RowGenerationMinRow)
 
 			for _, targetRow := range targetRows {
 				var rowID int
@@ -155,7 +155,7 @@ func mergeExpansionData(collected []nativeCollectedDataset) ([]nativeCollectedDa
 				if !hasID {
 					rowID = nextID
 					usedIDs[rowID] = struct{}{}
-					nextID = nextAvailableID(usedIDs)
+					nextID = nextAvailableIDAtLeast(usedIDs, targetDS.Dataset.RowGenerationMinRow)
 				} else {
 					if _, exists := usedIDs[rowID]; exists && key == "" {
 						return nil, fmt.Errorf("expansion into %s: row id %d already exists", targetDatasetName, rowID)