Author: tommaso
Date: Tue Apr 14 11:51:06 2015
New Revision: 1673413
URL: http://svn.apache.org/r1673413
Log:
OAK-2765 - fixed high prio issues as reported by FB
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/EmbeddedSolrServerConfiguration.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationDefaults.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.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/server/DefaultSolrServerProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java?rev=1673413&r1=1673412&r2=1673413&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java
Tue Apr 14 11:51:06 2015
@@ -30,7 +30,7 @@ import org.apache.jackrabbit.oak.spi.que
*/
public class DefaultSolrConfiguration implements OakSolrConfiguration {
- private static final Collection<String> ignoredProperties =
Arrays.asList(SolrServerConfigurationDefaults.IGNORED_PROPERTIES);
+ private static final Collection<String> ignoredProperties =
SolrServerConfigurationDefaults.IGNORED_PROPERTIES;
private static final Collection<String> usedProperties =
Collections.emptyList();
@Override
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/EmbeddedSolrServerConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/EmbeddedSolrServerConfiguration.java?rev=1673413&r1=1673412&r2=1673413&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/EmbeddedSolrServerConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/EmbeddedSolrServerConfiguration.java
Tue Apr 14 11:51:06 2015
@@ -67,7 +67,7 @@ public class EmbeddedSolrServerConfigura
return httpConfiguration;
}
- public class HttpConfiguration {
+ public static class HttpConfiguration {
private final String context;
private final Integer httpPort;
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationDefaults.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationDefaults.java?rev=1673413&r1=1673412&r2=1673413&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationDefaults.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationDefaults.java
Tue Apr 14 11:51:06 2015
@@ -16,6 +16,10 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.configuration;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+
/**
* Defaults for Solr configurations.
*/
@@ -46,7 +50,8 @@ public class SolrServerConfigurationDefa
public static final boolean PROPERTY_RESTRICTIONS = false;
public static final boolean PATH_RESTRICTIONS = false;
public static final boolean PRIMARY_TYPES = false;
- public static final String[] IGNORED_PROPERTIES = {"rep:members",
"rep:authorizableId", "jcr:uuid", "rep:principalName", "rep:password"};
+ public static final Collection<String> IGNORED_PROPERTIES =
Collections.unmodifiableCollection(
+ Arrays.asList("rep:members", "rep:authorizableId", "jcr:uuid",
"rep:principalName", "rep:password"));
public static final String TYPE_MAPPINGS = "";
public static final String PROPERTY_MAPPINGS = "";
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java?rev=1673413&r1=1673412&r2=1673413&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
Tue Apr 14 11:51:06 2015
@@ -159,7 +159,7 @@ public class OakSolrNodeStateConfigurati
ignoredProperties.add(ignoredProperty);
}
} else {
- ignoredProperties =
Arrays.asList(SolrServerConfigurationDefaults.IGNORED_PROPERTIES);
+ ignoredProperties =
SolrServerConfigurationDefaults.IGNORED_PROPERTIES;
}
return ignoredProperties;
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java?rev=1673413&r1=1673412&r2=1673413&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java
Tue Apr 14 11:51:06 2015
@@ -59,8 +59,8 @@ public class RemoteSolrServerConfigurati
private String solrHttpUrl;
private String solrZkHost;
private String solrCollection;
- private int solrShardsNo;
- private int solrReplicationFactor;
+ private Integer solrShardsNo;
+ private Integer solrReplicationFactor;
private String solrConfDir;
private RemoteSolrServerConfiguration remoteSolrServerConfiguration;
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=1673413&r1=1673412&r2=1673413&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 Apr 14 11:51:06 2015
@@ -235,27 +235,25 @@ public class SolrQueryIndex implements F
private SolrResultRow convertToRow(SolrDocument doc) {
String path =
String.valueOf(doc.getFieldValue(configuration.getPathField()));
- if (path != null) {
- if ("".equals(path)) {
- path = "/";
- }
- if (!parent.isEmpty()) {
- path = getAncestorPath(path, parentDepth);
- // avoid duplicate entries
- if (seenPaths.contains(path)) {
- return null;
- }
- seenPaths.add(path);
+ if ("".equals(path)) {
+ path = "/";
+ }
+ if (!parent.isEmpty()) {
+ path = getAncestorPath(path, parentDepth);
+ // avoid duplicate entries
+ if (seenPaths.contains(path)) {
+ return null;
}
+ seenPaths.add(path);
+ }
- float score = 0f;
- Object scoreObj = doc.get("score");
- if (scoreObj != null) {
- score = (Float) scoreObj;
- }
- return new SolrResultRow(path, score, doc);
+ float score = 0f;
+ Object scoreObj = doc.get("score");
+ if (scoreObj != null) {
+ score = (Float) scoreObj;
}
- return null;
+ return new SolrResultRow(path, score, doc);
+
}
/**
@@ -465,10 +463,6 @@ public class SolrQueryIndex implements F
final double score;
final SolrDocument doc;
- SolrResultRow(String path, double score) {
- this(path, score, null);
- }
-
SolrResultRow(String path, double score, SolrDocument doc) {
this.path = path;
this.score = score;
@@ -541,10 +535,8 @@ public class SolrQueryIndex implements F
if (QueryImpl.JCR_SCORE.equals(columnName)) {
return PropertyValues.newDouble(currentRow.score);
}
- // TODO : make inclusion of doc configurable
Collection<Object> fieldValues =
currentRow.doc.getFieldValues(columnName);
- return currentRow.doc != null ? PropertyValues.newString(
- Iterables.toString(fieldValues != null ?
fieldValues : Collections.emptyList())) : null;
+ return
PropertyValues.newString(Iterables.toString(fieldValues != null ? fieldValues :
Collections.emptyList()));
}
};
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/DefaultSolrServerProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/DefaultSolrServerProvider.java?rev=1673413&r1=1673412&r2=1673413&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/DefaultSolrServerProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/DefaultSolrServerProvider.java
Tue Apr 14 11:51:06 2015
@@ -62,11 +62,17 @@ public class DefaultSolrServerProvider i
@Override
public void close() throws IOException {
try {
- getSolrServer().shutdown();
+ SolrServer solrServer = getSolrServer();
+ if (solrServer != null) {
+ solrServer.shutdown();
+ }
} catch (Exception e) {
// do nothing
} try {
- getIndexingSolrServer().shutdown();
+ SolrServer indexingSolrServer = getIndexingSolrServer();
+ if (indexingSolrServer != null) {
+ indexingSolrServer.shutdown();
+ }
} catch (Exception e) {
// do nothing
} try {
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java?rev=1673413&r1=1673412&r2=1673413&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
Tue Apr 14 11:51:06 2015
@@ -153,7 +153,7 @@ public class EmbeddedSolrServerProvider
File coreProperties = new File(new File(solrCoreDir),
"core.properties");
assert coreProperties.createNewFile();
FileOutputStream out = new FileOutputStream(coreProperties);
- IOUtils.writeBytes(out, ("name=" + coreName).getBytes());
+ IOUtils.writeBytes(out, ("name=" + coreName).getBytes("UTF-8"));
out.flush();
out.close();
@@ -253,8 +253,10 @@ public class EmbeddedSolrServerProvider
@Override
public void close() throws IOException {
try {
- if (solrServer != null) {
- solrServer.shutdown();
+ synchronized (this) {
+ if (solrServer != null) {
+ solrServer.shutdown();
+ }
}
} catch (Exception e) {
// do nothing
