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
Avaliação
- Dificuldade
- 4/5
- Tempo estimado
- 3-5 dias
- Facilidade para iniciantes
- 48/100
Direção de pesquisa
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.
Escrita pelo modelo de indexação a partir do texto da issue.
Descrição
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.
- Linguagem predominante
- Python
- Estrelas
- 55
- Forks
- 25
- Métricas de merge de PRs
- Nenhum PR com merge em 30d
Preparar o ambiente
- Inclui um Dockerfile ou arquivo Docker Compose
- Sem modelo de pull request
- Ler o guia de contribuição
Primeiros passos
- Leia a issue inteira e depois o guia de contribuição do projeto.
- Comente na issue dizendo que vai assumir — evita que duas pessoas façam o mesmo trabalho.
- Faça um fork do repositório e trabalhe em uma branch.
- Abra um pull request que referencie o número da issue.
Mais de MerginMaps/db-sync
-
Dificuldade 2/5 1-3 horas Facilidade para iniciantes 68/100
MerginMaps/db-sync#184 ·
-
SIGTERM kills db-sync mid-pull; proposal: finish the current connection and exit between cyclesTalvez já em andamento @NicklasBlidmo assumiu há 23 dias. Aberta
Dificuldade 3/5 1-2 dias Facilidade para iniciantes 52/100
MerginMaps/db-sync#193 ·
-
Dificuldade 3/5 1-2 dias Facilidade para iniciantes 38/100
MerginMaps/db-sync#185 · 1 comentário ·
-
db-sync enters an infinite drop/recreate loop when geodiff init fails on invalid source geometriesAberta
Dificuldade 4/5 3-5 dias Facilidade para iniciantes 42/100
MerginMaps/db-sync#182 ·
-
Dificuldade 3/5 1-2 dias Facilidade para iniciantes 52/100
MerginMaps/db-sync#181 · 2 comentários ·
Todas as issues de MerginMaps/db-sync
Issues semelhantes
-
bug(mcp): handle malformed and partial reranker responses safelyTalvez já em andamento @KamilEjaz890 assumiu hoje. Aberta
Dificuldade 2/5 1-3 horas Facilidade para iniciantes 85/100
kubeflow/docs-agent#301 ·
Mantenedores costumam responder em até 4 dias
-
Update the demo docsAberta
Dificuldade 1/5 Menos de uma hora Facilidade para iniciantes 72/100
pulp/pulp_workflow#78 ·
-
Invalid syntax in sshtunnelAbertaBug
Dificuldade 2/5 1-3 horas Facilidade para iniciantes 62/100
pgadmin-org/pgadmin4#10797 ·
Mantenedores costumam responder em até 2 dias
-
Dificuldade 2/5 1-3 horas Facilidade para iniciantes 66/100
gcivil-nyu-org/team5-mon-fall26#132 ·
Mantenedores costumam responder em até 1 dia
-
Dificuldade 1/5 Menos de uma hora Facilidade para iniciantes 76/100
gcivil-nyu-org/team4-mon-fall26#291 ·
Mantenedores costumam responder em até 1 dia