You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2014/02/18 19:33:26 UTC
svn commit: r1569466 - in
/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr:
index/ osgi/ query/
Author: tommaso
Date: Tue Feb 18 18:33:26 2014
New Revision: 1569466
URL: http://svn.apache.org/r1569466
Log:
OAK-1437 - Use default references options for Oak Solr Index(Editor)Providers
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrIndexEditorProviderService.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java?rev=1569466&r1=1569465&r2=1569466&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java Tue Feb 18 18:33:26 2014
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.index;
+import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback;
@@ -32,7 +33,6 @@ import org.slf4j.LoggerFactory;
* Solr based {@link IndexEditorProvider}
*
* @see SolrIndexEditor
- *
*/
public class SolrIndexEditorProvider implements IndexEditorProvider {
@@ -51,7 +51,7 @@ public class SolrIndexEditorProvider imp
@Override
public Editor getIndexEditor(
- String type, NodeBuilder definition, NodeState root, IndexUpdateCallback callback)
+ @Nonnull String type, @Nonnull NodeBuilder definition, @Nonnull NodeState root, @Nonnull IndexUpdateCallback callback)
throws CommitFailedException {
if (SolrQueryIndex.TYPE.equals(type)
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrIndexEditorProviderService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrIndexEditorProviderService.java?rev=1569466&r1=1569465&r2=1569466&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrIndexEditorProviderService.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrIndexEditorProviderService.java Tue Feb 18 18:33:26 2014
@@ -16,12 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.osgi;
-import static org.apache.felix.scr.annotations.ReferencePolicy.STATIC;
-import static org.apache.felix.scr.annotations.ReferencePolicyOption.GREEDY;
-
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
-
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
@@ -45,10 +41,10 @@ import org.apache.jackrabbit.oak.spi.sta
@Service(value = IndexEditorProvider.class)
public class SolrIndexEditorProviderService implements IndexEditorProvider {
- @Reference(policyOption = GREEDY, policy = STATIC)
+ @Reference
private SolrServerProvider solrServerProvider;
- @Reference(policyOption = GREEDY, policy = STATIC)
+ @Reference
private OakSolrConfigurationProvider oakSolrConfigurationProvider;
private SolrIndexEditorProvider solrIndexEditorProvider;
@@ -56,7 +52,7 @@ public class SolrIndexEditorProviderServ
@Override
@CheckForNull
public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder definition,
- @Nonnull NodeState root, IndexUpdateCallback callback) throws CommitFailedException {
+ @Nonnull NodeState root, @Nonnull IndexUpdateCallback callback) throws CommitFailedException {
Editor indexEditor = null;
if (solrServerProvider != null && oakSolrConfigurationProvider != null && solrIndexEditorProvider == null) {
solrIndexEditorProvider = new SolrIndexEditorProvider(solrServerProvider, oakSolrConfigurationProvider);
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java?rev=1569466&r1=1569465&r2=1569466&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java Tue Feb 18 18:33:26 2014
@@ -18,13 +18,9 @@ package org.apache.jackrabbit.oak.plugin
import java.util.ArrayList;
import java.util.List;
-
import javax.annotation.Nonnull;
-
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferencePolicy;
-import org.apache.felix.scr.annotations.ReferencePolicyOption;
import org.apache.felix.scr.annotations.Service;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.query.SolrQueryIndexProvider;
@@ -37,16 +33,16 @@ import org.apache.jackrabbit.oak.spi.sta
* Osgi Service that provides Solr based {@link org.apache.jackrabbit.oak.spi.query.QueryIndex}es
*
* @see org.apache.jackrabbit.oak.plugins.index.solr.query.SolrQueryIndexProvider
- * @see QueryIndexProviderr
+ * @see QueryIndexProvider
*/
@Component(metatype = false, immediate = true)
@Service(value = QueryIndexProvider.class)
public class SolrQueryIndexProviderService implements QueryIndexProvider {
- @Reference(policyOption = ReferencePolicyOption.GREEDY, policy = ReferencePolicy.STATIC)
+ @Reference
private SolrServerProvider solrServerProvider;
- @Reference(policyOption = ReferencePolicyOption.GREEDY, policy = ReferencePolicy.STATIC)
+ @Reference
private OakSolrConfigurationProvider oakSolrConfigurationProvider;
private SolrQueryIndexProvider solrQueryIndexProvider;
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java?rev=1569466&r1=1569465&r2=1569466&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java Tue Feb 18 18:33:26 2014
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
*/
public class SolrQueryIndex implements QueryIndex {
- private static final Logger log = LoggerFactory.getLogger(SolrQueryIndex.class);
+ private final Logger log = LoggerFactory.getLogger(SolrQueryIndex.class);
public static final String TYPE = "solr";
private final String name;
@@ -175,12 +175,7 @@ public class SolrQueryIndex implements Q
private static String createRangeQuery(String first, String last, boolean firstIncluding, boolean lastIncluding) {
// TODO : handle inclusion / exclusion of bounds
- StringBuilder rangeQueryBuilder = new StringBuilder("[");
- rangeQueryBuilder.append(first != null ? first : "*");
- rangeQueryBuilder.append(" TO ");
- rangeQueryBuilder.append(last != null ? last : "*");
- rangeQueryBuilder.append("]");
- return rangeQueryBuilder.toString();
+ return "[" + (first != null ? first : "*") + " TO " + (last != null ? last : "*") + "]";
}
private static String purgePath(Filter filter) {
@@ -209,6 +204,9 @@ public class SolrQueryIndex implements Q
Cursor cursor;
try {
SolrQuery query = getQuery(filter);
+ if (log.isDebugEnabled()) {
+ log.info("sending query {}", query);
+ }
QueryResponse queryResponse = solrServer.query(query);
cursor = new SolrCursor(queryResponse);
} catch (Exception e) {
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java?rev=1569466&r1=1569465&r2=1569466&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java Tue Feb 18 18:33:26 2014
@@ -16,14 +16,9 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.query;
-import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
-import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME;
-
import java.util.ArrayList;
import java.util.List;
-
import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationProvider;
@@ -35,6 +30,9 @@ import org.apache.jackrabbit.oak.spi.sta
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME;
+
/**
* {@link QueryIndexProvider} for {@link SolrQueryIndex}
*/