[Checkins] [zopefoundation/ZODB] 9d1362: DemoStorage: add support for conflict resolution

GitHub noreply at github.com
Tue Jun 7 16:29:22 CEST 2016


  Branch: refs/heads/no-more-load
  Home:   https://github.com/zopefoundation/ZODB
  Commit: 9d13627c1e773ce0caf2d19cf23aa0f826ba2faa
      https://github.com/zopefoundation/ZODB/commit/9d13627c1e773ce0caf2d19cf23aa0f826ba2faa
  Author: Julien Muchembled <jm at nexedi.com>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    M src/ZODB/ConflictResolution.py
    M src/ZODB/DemoStorage.py
    M src/ZODB/tests/testDemoStorage.py

  Log Message:
  -----------
  DemoStorage: add support for conflict resolution


  Commit: f726e40ac8a85622f8b03d6a672a6ad52ec0b6eb
      https://github.com/zopefoundation/ZODB/commit/f726e40ac8a85622f8b03d6a672a6ad52ec0b6eb
  Author: Julien Muchembled <jm at nexedi.com>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    M src/ZODB/DemoStorage.py
    M src/ZODB/MappingStorage.py
    M src/ZODB/tests/HistoryStorage.py
    M src/ZODB/tests/testDemoStorage.py

  Log Message:
  -----------
  DemoStorage: fix history()

- It failed with oids that already exist in the base storage.
- MappingStorage returned timestamps in wrong format.


  Commit: 82b3c0f62c32dc51ed113a6aac98ace81903ea7e
      https://github.com/zopefoundation/ZODB/commit/82b3c0f62c32dc51ed113a6aac98ace81903ea7e
  Author: Julien Muchembled <jm at jmuchemb.eu>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    M CHANGES.rst

  Log Message:
  -----------
  Changelog for PR #58


  Commit: 96183018d9b9014f594f04e215c679b942176038
      https://github.com/zopefoundation/ZODB/commit/96183018d9b9014f594f04e215c679b942176038
  Author: Julien Muchembled <jm at jmuchemb.eu>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M src/ZODB/FileStorage/FileStorage.py

  Log Message:
  -----------
  Remove useless statement in FileStorage

This answers #13


  Commit: 869af8b86066ce3d956fae6fea1dbf1b22e70c2b
      https://github.com/zopefoundation/ZODB/commit/869af8b86066ce3d956fae6fea1dbf1b22e70c2b
  Author: Tres Seaver <tseaver at palladion.com>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Stop enforcing minimium required Python versions.

Closes #59.


  Commit: bf877dd2c441f37fd9275ea58286546183c2ecdd
      https://github.com/zopefoundation/ZODB/commit/bf877dd2c441f37fd9275ea58286546183c2ecdd
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M src/ZODB/tests/TransactionalUndoStorage.py

  Log Message:
  -----------
  Fixed a test that depended on some off behavior of tpc_finish in some storages.


  Commit: 6fe36b987ffb5a4d3d82fb745a715f679193cdbe
      https://github.com/zopefoundation/ZODB/commit/6fe36b987ffb5a4d3d82fb745a715f679193cdbe
  Author: Jim Fulton <jim at jimfulton.info>
  Date:   2016-05-31 (Tue, 31 May 2016)

  Changed paths:
    M src/ZODB/tests/TransactionalUndoStorage.py

  Log Message:
  -----------
  Merge pull request #62 from zopefoundation/dont-depend-on-implementation-detail-in-tpc_finish-test-assertions

Fixed a test that depended on some off behavior of tpc_finish in some…


  Commit: 5b18a710db75c4be1631c373e672cf9cfa254edb
      https://github.com/zopefoundation/ZODB/commit/5b18a710db75c4be1631c373e672cf9cfa254edb
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-06-05 (Sun, 05 Jun 2016)

  Changed paths:
    M CHANGES.rst
    M src/ZODB/FileStorage/FileStorage.py
    M src/ZODB/tests/TransactionalUndoStorage.py

  Log Message:
  -----------
  Fixed: FileStorage loadBefore didn't handle deleted/undone data correctly.


  Commit: b1ea6733a412ae6472d0b62dc212d6380645f87e
      https://github.com/zopefoundation/ZODB/commit/b1ea6733a412ae6472d0b62dc212d6380645f87e
  Author: Jim Fulton <jim at jimfulton.info>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Merge pull request #61 from zopefoundation/59-enforce-py27-py33-minimum

Enforce minimum required Python versions: 2.7, 3.3.

+1


  Commit: b7ea4e6f708dcded329332b24a9d70211a6b6368
      https://github.com/zopefoundation/ZODB/commit/b7ea4e6f708dcded329332b24a9d70211a6b6368
  Author: Jim Fulton <jim at jimfulton.info>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M CHANGES.rst
    M src/ZODB/FileStorage/FileStorage.py
    M src/ZODB/tests/TransactionalUndoStorage.py

  Log Message:
  -----------
  Merge pull request #64 from zopefoundation/fix-loadBefore-deleted-data

Fixed: FileStorage loadBefore didn't handle deleted/undone data correctly


  Commit: 6c0b5609369e9e57d2b5a4809360ad8c65b8b8c0
      https://github.com/zopefoundation/ZODB/commit/6c0b5609369e9e57d2b5a4809360ad8c65b8b8c0
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M CHANGES.rst
    M setup.py
    M src/ZODB/ConflictResolution.py
    M src/ZODB/DemoStorage.py
    M src/ZODB/FileStorage/FileStorage.py
    M src/ZODB/MappingStorage.py
    M src/ZODB/tests/HistoryStorage.py
    M src/ZODB/tests/TransactionalUndoStorage.py
    M src/ZODB/tests/testDemoStorage.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into no-more-load


  Commit: 7a75ba7aa86ebda0e4ff8cb0fb07a6b2a7705d09
      https://github.com/zopefoundation/ZODB/commit/7a75ba7aa86ebda0e4ff8cb0fb07a6b2a7705d09
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M src/ZODB/tests/util.py

  Log Message:
  -----------
  Clear transaction syncs earlier

To mitigate errors during tearDown.

Lots of tests are sloppy about closing connection (because they could
be), but storages tend to get closed and transactions aborted. This
has the effedt of calling afterCompletion on connections which tries
to call storage lastTransaction, which causes errors.


  Commit: 5bb8a81034dd3ac1d10998a15fa8aea80afc6ba3
      https://github.com/zopefoundation/ZODB/commit/5bb8a81034dd3ac1d10998a15fa8aea80afc6ba3
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M src/ZODB/interfaces.py

  Log Message:
  -----------
  typo


  Commit: baee84a6d2949cb58fdd338c882a7a5cc2ff8f27
      https://github.com/zopefoundation/ZODB/commit/baee84a6d2949cb58fdd338c882a7a5cc2ff8f27
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M src/ZODB/utils.py

  Log Message:
  -----------
  Fixed maxtid, copying value from ZEO.

Changed it to the value corresponding to the maximim *signed*
big-endian 64-bit integer, because of LxBTrees.

Note that this value isn't used anywhere in ZODB yet.

Maybe it should be.


Compare: https://github.com/zopefoundation/ZODB/compare/c1d79d72ee4c...baee84a6d294


More information about the checkins mailing list