zodb / relstorage

92%

master: 92%

LAST BUILD ON BRANCH issue381

branch: issue381

CHANGE BRANCH

x

Reset

• issue381
• update-zodb
• master
• jim-test
• jim-zodb5
• commit-lock-ex
• ci-for-pr-20
• ZODB5-before-instance-optimization
• coveralls-ignore-oracle
• issuo61
• rst-files
• legacy-zodb-removal
• conflict-res-from-cache
• argparse
• reduce-cache-locking
• finer-lru
• new-protocol
• umysqldb
• 2.0.0b4
• refactor-dbs
• mamico-1.6-travis
• 1.6
• more-tests-16
• cache-read-opts
• 2.0.0b5
• 1.6.1
• 1.6-no-zeo
• 1.6.2
• find_packages
• 2.0.0b6
• old-pypy
• w-tinylru
• w-tinylru-cffi
• llbtree-delta
• refactor-save
• file-time-tid
• fix-135-master
• fix-135-16
• 1.6.3
• 2.0.0b7
• 2.0.0b8
• native-updated-pypy
• transaction2.0
• unreleased-updates
• none_bucket_on_load
• 2.0.0b9
• cache-file-temp-better
• lint
• appveyor
• py36
• 2.0.0rc1
• generic-txncontrol
• poller_no_if
• issue9
• 2.0.0
• 3.6
• prep-statements
• mysql-connector
• default-postgres-version
• mysql-myisasm
• monkey-zodb-139
• 2.1a1
• afterCompletion
• issue166
• oracle-fixes
• issue173
• issue169
• issue178
• zodb522-blobs
• issue175
• 2.1a2
• issue181
• update-mysqlconnector
• 2.1.0
• pers-cache
• issue206
• 2.1.1
• travis37
• issue211
• issue210
• issue216
• issue222
• issue218
• issue224
• issue228
• issue213
• issue232
• issue227
• issue201
• issue212-mysql
• persistent-cache-efficiency
• simplify-tracing
• better-cache-validation
• issue246
• issue249
• 3.0a2
• issue241
• issue242
• issue247
• pg-row-batcher-arrays
• poll-old-cache
• cleanup-blob-tests
• pcache-correct-tids
• issue239
• 3.0a3
• issue220
• issue125
• issue264
• issue188
• issue266
• 3.0a4
• blobhelper-never-none
• issue270
• mysql-set-min-oid
• 3.0a5
• storage-is-not-threadsafe
• refactor-simple-service
• issue159
• issue280
• issue281
• issue281-pg
• issue291
• 3.0a6
• issue293
• issue283
• loadBefore-optimization
• issue296
• issue302
• issue304
• faster-conflict-loading
• 3.0a7
• issue310
• mysql-tid-rounding
• more-logging
• issue311
• issue311-take2
• prep30a9
• 3.0a9
• pcache-missed-update
• 3.0a10
• issue342
• issue317
• issue325
• faster-pack
• issue344
• zodbconvert-improvements
• issue329
• faster-vacuum
• 3.0a11
• issue212
• simplify-max-stored
• issue339
• issue186
• 3.0a12
• issue78
• issue340
• 3.0a13
• more-merging
• 3.0b1
• configure-sqlite
• faster-pg-gevent
• sqlite-stats
• sqlite-gevent
• 3.0b2
• unify-oids
• 3.0b3
• smaller-include
• sqlite-optimize
• issue376
• 3.0rc1
• appveyor38
• 3.0.0
• 3.0.1

Build # 1450

Build Type

Pull #386

travis-ci

Committed by web-flow

Commit Message

Fix #385 by eliminating the multiple result sets for lock_objects_and_detect_conflicts

It turns out the root of the problem was that there's no way to
reliably know whether we need to, or even can, go around the event
loop to get the second and subsequent result sets. And previously, it
could either be the first result set or the second result set that
blocked taking locks.

Now there's only one result set, so our normal way of waiting for IO
to arrive works.

Also throws in some minor optimizations targeted to avoiding extra
trips around the event loop.

Pull Request Pull Request #386: Fix #385 by eliminating the multiple result sets for lock_objects_and

Run Details

61 of 68 new or added lines in 11 files covered. (89.71%)

3 existing lines in 2 files now uncovered.

109850 of 119066 relevant lines covered (92.26%)

4.56 hits per line