unity-scopes-api

Merge lp://staging/~michihenning/unity-scopes-api/cache-results into lp://staging/unity-scopes-api

  1. cache-results
  2. Merge into trunk
Proposed by Michi Henning
Status: Superseded
Proposed branch: lp://staging/~michihenning/unity-scopes-api/cache-results
Merge into: lp://staging/unity-scopes-api
Diff against target: 5555 lines (+1999/-631)
123 files modified
CMakeLists.txt (+0/-6)
CONFIGFILES (+38/-2)
HACKING (+0/-27)
debian/libunity-scopes3.symbols (+11/-3)
doc/Doxyfile-devel.in (+1/-1)
doc/tutorial.dox (+13/-0)
include/unity/scopes/CategorisedResult.h (+2/-0)
include/unity/scopes/Category.h (+2/-0)
include/unity/scopes/SearchReply.h (+21/-0)
include/unity/scopes/internal/' (+59/-0)
include/unity/scopes/internal/ActivationQueryObject.h (+1/-2)
include/unity/scopes/internal/CategoryRegistry.h (+13/-4)
include/unity/scopes/internal/DfltConfig.h.in (+14/-6)
include/unity/scopes/internal/Logger.h (+55/-9)
include/unity/scopes/internal/ObjectImpl.h (+1/-4)
include/unity/scopes/internal/PreviewQueryObject.h (+1/-2)
include/unity/scopes/internal/PreviewReplyImpl.h (+1/-2)
include/unity/scopes/internal/QueryCtrlImpl.h (+1/-3)
include/unity/scopes/internal/QueryCtrlObjectBase.h (+2/-1)
include/unity/scopes/internal/QueryObject.h (+2/-6)
include/unity/scopes/internal/QueryObjectBase.h (+2/-1)
include/unity/scopes/internal/RegistryImpl.h (+1/-3)
include/unity/scopes/internal/ReplyImpl.h (+1/-3)
include/unity/scopes/internal/ReplyObject.h (+1/-0)
include/unity/scopes/internal/RuntimeConfig.h (+10/-0)
include/unity/scopes/internal/RuntimeImpl.h (+4/-1)
include/unity/scopes/internal/ScopeImpl.h (+2/-2)
include/unity/scopes/internal/ScopeObject.h (+1/-3)
include/unity/scopes/internal/ScopeObjectBase.h (+2/-1)
include/unity/scopes/internal/SearchReplyImpl.h (+13/-2)
include/unity/scopes/internal/smartscopes/SSQueryObject.h (+1/-3)
include/unity/scopes/internal/smartscopes/SSScopeObject.h (+0/-2)
include/unity/scopes/internal/smartscopes/SmartScopesClient.h (+5/-2)
include/unity/scopes/internal/zmq_middleware/ObjectAdapter.h (+7/-2)
include/unity/scopes/internal/zmq_middleware/ZmqException.h (+4/-1)
include/unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h (+10/-4)
include/unity/scopes/testing/MockSearchReply.h (+1/-0)
include/unity/scopes/utility/internal/BufferedSearchReplyImpl.h (+6/-3)
scoperegistry/DirWatcher.cpp (+9/-7)
scoperegistry/ScopesWatcher.cpp (+4/-4)
scoperegistry/scoperegistry.cpp (+1/-1)
src/scopes/internal/ActivationQueryObject.cpp (+9/-8)
src/scopes/internal/CategoryRegistry.cpp (+19/-6)
src/scopes/internal/JsonCppNode.cpp (+1/-1)
src/scopes/internal/Logger.cpp (+143/-49)
src/scopes/internal/ObjectImpl.cpp (+1/-3)
src/scopes/internal/PreviewQueryObject.cpp (+9/-8)
src/scopes/internal/PreviewReplyImpl.cpp (+3/-5)
src/scopes/internal/QueryCtrlImpl.cpp (+3/-4)
src/scopes/internal/QueryObject.cpp (+13/-11)
src/scopes/internal/RegistryImpl.cpp (+2/-2)
src/scopes/internal/RegistryObject.cpp (+15/-21)
src/scopes/internal/ReplyImpl.cpp (+8/-8)
src/scopes/internal/ReplyObject.cpp (+4/-4)
src/scopes/internal/ResultReplyObject.cpp (+2/-1)
src/scopes/internal/RuntimeConfig.cpp (+125/-18)
src/scopes/internal/RuntimeImpl.cpp (+47/-9)
src/scopes/internal/ScopeImpl.cpp (+10/-10)
src/scopes/internal/ScopeMetadataImpl.cpp (+1/-1)
src/scopes/internal/ScopeObject.cpp (+12/-16)
src/scopes/internal/SearchReplyImpl.cpp (+234/-17)
src/scopes/internal/SettingsDB.cpp (+10/-7)
src/scopes/internal/smartscopes/SSQueryObject.cpp (+9/-8)
src/scopes/internal/smartscopes/SSRegistryObject.cpp (+7/-9)
src/scopes/internal/smartscopes/SSScopeObject.cpp (+3/-4)
src/scopes/internal/smartscopes/SmartScope.cpp (+6/-5)
src/scopes/internal/smartscopes/SmartScopesClient.cpp (+32/-33)
src/scopes/internal/zmq_middleware/ObjectAdapter.cpp (+45/-12)
src/scopes/internal/zmq_middleware/ZmqException.cpp (+52/-3)
src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp (+14/-14)
src/scopes/internal/zmq_middleware/ZmqObject.cpp (+47/-44)
src/scopes/internal/zmq_middleware/ZmqRegistry.cpp (+1/-1)
src/scopes/internal/zmq_middleware/ZmqScope.cpp (+4/-5)
src/scopes/testing/InProcessBenchmark.cpp (+4/-0)
src/scopes/utility/internal/BufferedResultForwarderImpl.cpp (+1/-1)
src/scopes/utility/internal/BufferedSearchReplyImpl.cpp (+5/-0)
test/gtest/scopes/Activation/Activation_test.cpp (+1/-1)
test/gtest/scopes/Activation/Runtime.ini.in (+1/-0)
test/gtest/scopes/CMakeLists.txt (+1/-0)
test/gtest/scopes/Filters/Filters_test.cpp (+1/-1)
test/gtest/scopes/Filters/Runtime.ini.in (+1/-0)
test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp (+1/-1)
test/gtest/scopes/IdleShutdown/Runtime.ini.in (+1/-0)
test/gtest/scopes/Invocation/Invocation_test.cpp (+3/-3)
test/gtest/scopes/Invocation/Runtime.ini.in (+1/-0)
test/gtest/scopes/Registry/Runtime.ini.in (+1/-0)
test/gtest/scopes/ReplyReaper/ReplyReaper_test.cpp (+2/-2)
test/gtest/scopes/ReplyReaper/Runtime.ini.in (+1/-0)
test/gtest/scopes/ResultCache/CMakeLists.txt (+27/-0)
test/gtest/scopes/ResultCache/CacheScope.cpp (+146/-0)
test/gtest/scopes/ResultCache/CacheScope.h (+41/-0)
test/gtest/scopes/ResultCache/CacheScope.ini.in (+4/-0)
test/gtest/scopes/ResultCache/ResultCache_test.cpp (+343/-0)
test/gtest/scopes/ResultCache/Runtime.ini.in (+8/-0)
test/gtest/scopes/ResultCache/TestRegistry.ini.in (+7/-0)
test/gtest/scopes/ResultCache/Zmq.ini.in (+2/-0)
test/gtest/scopes/ResultCache/no_cat_cache (+1/-0)
test/gtest/scopes/ResultCache/no_dept_cache (+1/-0)
test/gtest/scopes/ResultCache/no_results_cache (+1/-0)
test/gtest/scopes/Runtime/Runtime.ini.in (+1/-0)
test/gtest/scopes/Runtime/Runtime_test.cpp (+5/-5)
test/gtest/scopes/internal/ResultReplyObject/Runtime.ini.in (+1/-0)
test/gtest/scopes/internal/RuntimeConfig/BadLogDirSize.ini (+7/-0)
test/gtest/scopes/internal/RuntimeConfig/BadLogFileSize.ini (+6/-0)
test/gtest/scopes/internal/RuntimeConfig/CacheDir.ini (+1/-0)
test/gtest/scopes/internal/RuntimeConfig/Complete.ini (+16/-0)
test/gtest/scopes/internal/RuntimeConfig/ConfigDir.ini (+1/-0)
test/gtest/scopes/internal/RuntimeConfig/LogDir.ini (+5/-0)
test/gtest/scopes/internal/RuntimeConfig/NoLogDir.ini (+4/-0)
test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp (+114/-2)
test/gtest/scopes/internal/RuntimeImpl/Runtime.ini.in (+1/-0)
test/gtest/scopes/internal/ScopeMetadataImpl/Runtime.ini.in (+1/-0)
test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp (+4/-4)
test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp (+2/-2)
test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp (+2/-5)
test/gtest/scopes/internal/smartscopes/smartscopesproxy/Runtime.ini.in (+1/-0)
test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Runtime.ini.in (+1/-0)
test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp (+3/-3)
test/gtest/scopes/internal/zmq_middleware/RegistryI/Runtime.ini.in (+1/-0)
test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/Runtime.ini.in (+1/-0)
test/gtest/scopes/stress/Runtime.ini.in (+1/-0)
tools/zmq-monitor-host.py (+0/-46)
tools/zmq-parser.py (+0/-85)
To merge this branch: bzr merge lp://staging/~michihenning/unity-scopes-api/cache-results
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+246256@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2015-01-13.

Commit message

Added result cache that stores the results of the last successful surfacing query. The scope, if it detects connectivity problems, can call reply->push_surfacing_results_from_cache(). This answers the query from the cache, provided that the query is indeed a surfacing query. Otherwise, the method does nothing.

Description of the change

Added result cache that stores the results of the last successful surfacing query. The scope, if it detects connectivity problems, can call reply->push_surfacing_results_from_cache(). This answers the query from the cache, provided that the query is indeed a surfacing query. Otherwise, the method does nothing.

Note: I have not yet updated RELEASE_NOTES, changelog, and minor version number. Still waiting on a decision about ABI breaks. Once that is sorted out, I'll push changes accordingly. For now, I want to see what Jenkins has to say.

To post a comment you must log in.
lp://staging/~michihenning/unity-scopes-api/cache-results updated
573. By Michi Henning

Bumped micro version and updated release notes and changelog.

574. By Michi Henning

Merged dependent branch.

575. By Michi Henning

Fixed RuntimeConfig test again because it failed under bzr bd.

576. By Michi Henning

Merged trunk and resolved conflicts.

577. By Michi Henning

Merged trunk.

578. By Michi Henning

Simplified CategorisedResult instantiation when pushing from cache.

579. By Michi Henning

Added filters and filter_state to cached results and added corresponding tests.

580. By Michi Henning

Moved push_surfacing_results_from_cache to end of virtual functions to
avoid ABI break.

581. By Michi Henning

Merged trunk and resolved conflicts.

582. By Michi Henning

Update micro version, changelog, and release notes.

583. By Michi Henning

Fixed changelog. (Thanks Pawel!)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: