Rebase: a field update of a row deleted in the database is dropped without any record; and the conflicts file is per project, not per connection
Evaluación
- Dificultad
- 4/5
- Tiempo estimado
- 3-5 días
- Aptitud para principiantes
- 48/100
Línea de trabajo
Start by tracing pull() and the rebase handling described in the issue, especially _handle_delete, then inspect how conflict and base2our/base2their filenames are built. Reproduce the delete-versus-update case and a cycle with multiple connections. Done means lost field updates are recorded and each connection's conflict and rebase files retain distinct names.
Escrito por el modelo de indexación a partir del texto del issue.
Descripción
We ran the concurrent-edit cases of a two-way setup (db-sync 2.4.0,
geodiff 2.3.0, PostgreSQL driver, one GeoPackage, edits in the database
by SQL and in the field through the QGIS plugin, the daemon paused to
create the window). Outcomes:
| database | field | result | record |
|---|---|---|---|
| update column B | update column A, same row | both values on both sides | — |
| update value D | update same column, value F | D on both sides (the database syncs last and wins) | conflicts file, old = F, new = D |
| update row | delete row | row gone on both sides, the update dropped | conflicts file (entry without old) |
| delete row | update row | row gone on both sides, the field's update lost | nothing |
Two things we would like to change:
-
The last case leaves no record.
geodiff rebase-dbkeeps our
delete over their update (consistent with "a delete wins", fine) but
writes nothing to the conflicts file for it, so the field crew's edit
disappears without a trace: not in the database, not in the file, not
in the log. The information is available inpull()before the
rebase:base2our(computed beforemc.pull_project) holds our
delete,base2their(computed after) holds their update. Matching the
two by row key and logging one WARNING per lost update is a small
change in db-sync; PR follows. Recording it in the conflicts file
instead would be a geodiff change (the rebase's_handle_delete
records only the opposite direction), which we can propose there if
you prefer. -
The conflicts file is named per project:
<tmp>/<project name>-dbsync-pull-conflicts. With several connections
(several GeoPackages of one project, which 2.4.0 supports with one
working directory per connection), a second rebase in the same cycle
overwrites the first connection's file before anyone can read it.
Naming it<project name>-<modified schema>-dbsync-pull-conflicts,
like the working directory, keeps every connection's record. We read
these files (dbsync-manager keeps them and shows them per project), so
the name matters to us; the same goes for-dbsync-pull-base2our/
-base2their.
- Lenguaje dominante
- Python
- Estrellas
- 55
- Forks
- 25
- Merge medio
- 3 d 22 h
- PR fusionados (30 d)
- 1
Preparar el entorno
- Incluye un Dockerfile o un archivo de Docker Compose
- Sin plantilla de pull request
- Leer la guía de contribución
Primeros pasos
- Lee el issue completo y luego la guía de contribución del proyecto.
- Comenta en el issue que vas a ocuparte — evita que dos personas hagan lo mismo.
- Haz un fork del repositorio y trabaja en una rama.
- Abre un pull request que haga referencia al número del issue.
Más de MerginMaps/db-sync
-
Dificultad 2/5 1-3 horas Aptitud para principiantes 68/100
MerginMaps/db-sync#184 ·
-
SIGTERM kills db-sync mid-pull; proposal: finish the current connection and exit between cyclesPosiblemente ocupada @NicklasBlidmo la tomó hace 23 días. Abierto
Dificultad 3/5 1-2 días Aptitud para principiantes 52/100
MerginMaps/db-sync#193 ·
-
Dificultad 3/5 1-2 días Aptitud para principiantes 38/100
MerginMaps/db-sync#185 · 1 comentario ·
-
db-sync enters an infinite drop/recreate loop when geodiff init fails on invalid source geometriesAbierto
Dificultad 4/5 3-5 días Aptitud para principiantes 42/100
MerginMaps/db-sync#182 ·
-
Dificultad 3/5 1-2 días Aptitud para principiantes 52/100
MerginMaps/db-sync#181 · 2 comentarios ·
Todos los issues de MerginMaps/db-sync
Issues similares
-
Invalid syntax in sshtunnelAbiertoBug
Dificultad 2/5 1-3 horas Aptitud para principiantes 62/100
pgadmin-org/pgadmin4#10797 ·
Los mantenedores suelen responder en 2 días
-
good first issue
Dificultad 1/5 Menos de una hora Aptitud para principiantes 72/100
ida-arbeitszeit/workers-control#1588 ·
Los mantenedores suelen responder en 1 día
-
Dificultad 2/5 1-3 horas Aptitud para principiantes 83/100
aws-samples/sample-per-model-bedrock#930 ·
Los mantenedores suelen responder en 1 día
-
Locus / Transcript lacks __bool__, so bool(transcript) queries the SQLite exon table via __len__Abierto
Dificultad 2/5 1-3 horas Aptitud para principiantes 76/100
Los mantenedores suelen responder en 1 día
-
Dificultad 2/5 1-3 horas Aptitud para principiantes 65/100
Deltares/numba_celltree#100 · 1 comentario ·