WAVE-311 Adds profiling to Solr search/update methods.
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/3f4a57d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/3f4a57d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/3f4a57d3 Branch: refs/heads/master Commit: 3f4a57d3faf36cd44a348941d84be109cf5e7ce7 Parents: 1f15189 Author: Yuri Zelikov <[email protected]> Authored: Tue Aug 26 00:08:49 2014 +0300 Committer: Yuri Zelikov <[email protected]> Committed: Wed Aug 27 20:50:29 2014 +0300 ---------------------------------------------------------------------- src/org/waveprotocol/box/server/executor/ExecutorsModule.java | 2 +- src/org/waveprotocol/box/server/robots/util/OperationUtil.java | 4 ++-- .../box/server/waveserver/SolrSearchProviderImpl.java | 2 ++ .../waveprotocol/box/server/waveserver/SolrWaveIndexerImpl.java | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/3f4a57d3/src/org/waveprotocol/box/server/executor/ExecutorsModule.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/executor/ExecutorsModule.java b/src/org/waveprotocol/box/server/executor/ExecutorsModule.java index 9441b43..ca0d365 100644 --- a/src/org/waveprotocol/box/server/executor/ExecutorsModule.java +++ b/src/org/waveprotocol/box/server/executor/ExecutorsModule.java @@ -152,7 +152,7 @@ public class ExecutorsModule extends AbstractModule { @Provides @Singleton @SolrExecutor - protected Executor provideSolrxecutor(Provider<RequestScopeExecutor> executorProvider, + protected Executor provideSolrExecutor(Provider<RequestScopeExecutor> executorProvider, @Named(CoreSettings.SOLR_THREAD_COUNT) int threadCount) { return provideThreadPoolExecutor(executorProvider, threadCount, SolrExecutor.class.getSimpleName()); } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/3f4a57d3/src/org/waveprotocol/box/server/robots/util/OperationUtil.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/robots/util/OperationUtil.java b/src/org/waveprotocol/box/server/robots/util/OperationUtil.java index 18f106d..a0c12df 100644 --- a/src/org/waveprotocol/box/server/robots/util/OperationUtil.java +++ b/src/org/waveprotocol/box/server/robots/util/OperationUtil.java @@ -84,7 +84,7 @@ public class OperationUtil { throws InvalidRequestException { Object parameter = operation.getParameter(property); Class<T> clazz = (Class<T>) property.clazz(); - if ((parameter == null) || !clazz.isInstance(parameter)) { + if (parameter == null || !clazz.isInstance(parameter)) { throw new InvalidRequestException("property " + property + " not found", operation); } return clazz.cast(parameter); @@ -119,7 +119,7 @@ public class OperationUtil { OperationRequest operation, ParamsProperty property, T defaultValue) { Object parameter = operation.getParameter(property); Class<T> clazz = (Class<T>) property.clazz(); - if ((parameter != null) && clazz.isInstance(parameter)) { + if (parameter != null && clazz.isInstance(parameter)) { return clazz.cast(parameter); } return defaultValue; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/3f4a57d3/src/org/waveprotocol/box/server/waveserver/SolrSearchProviderImpl.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/waveserver/SolrSearchProviderImpl.java b/src/org/waveprotocol/box/server/waveserver/SolrSearchProviderImpl.java index 6be6e31..a46dc93 100644 --- a/src/org/waveprotocol/box/server/waveserver/SolrSearchProviderImpl.java +++ b/src/org/waveprotocol/box/server/waveserver/SolrSearchProviderImpl.java @@ -37,6 +37,7 @@ import org.apache.commons.httpclient.URIException; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.http.HttpStatus; import org.waveprotocol.box.server.CoreSettings; +import org.waveprotocol.box.stat.Timed; import org.waveprotocol.wave.model.id.WaveId; import org.waveprotocol.wave.model.id.WaveletId; import org.waveprotocol.wave.model.id.WaveletName; @@ -112,6 +113,7 @@ public class SolrSearchProviderImpl extends AbstractSearchProviderImpl { solrBaseUrl = solrUrl; } + @Timed @Override public SearchResult search(final ParticipantId user, String query, int startAt, int numResults) { http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/3f4a57d3/src/org/waveprotocol/box/server/waveserver/SolrWaveIndexerImpl.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/waveserver/SolrWaveIndexerImpl.java b/src/org/waveprotocol/box/server/waveserver/SolrWaveIndexerImpl.java index ddb2b16..5403b5f 100644 --- a/src/org/waveprotocol/box/server/waveserver/SolrWaveIndexerImpl.java +++ b/src/org/waveprotocol/box/server/waveserver/SolrWaveIndexerImpl.java @@ -43,6 +43,7 @@ import org.waveprotocol.box.common.Snippets; import org.waveprotocol.box.server.CoreSettings; import org.waveprotocol.box.server.executor.ExecutorAnnotations.SolrExecutor; import org.waveprotocol.box.server.robots.util.ConversationUtil; +import org.waveprotocol.box.stat.Timed; import org.waveprotocol.wave.model.document.operation.DocInitialization; import org.waveprotocol.wave.model.id.IdUtil; import org.waveprotocol.wave.model.id.WaveletName; @@ -141,6 +142,7 @@ public class SolrWaveIndexerImpl extends AbstractWaveIndexer implements WaveBus. } } + @Timed private void updateIndex(ReadableWaveletData wavelet) throws IndexException { Preconditions.checkNotNull(wavelet); if (IdUtil.isConversationalId(wavelet.getWaveletId())) {
