You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2017/01/21 23:53:37 UTC
[1/3] lucene-solr:jira/solr-5944: SOLR-10011: Fix exception log
message
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-5944 c2c181931 -> 5fc87843d
SOLR-10011: Fix exception log message
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0f7990b2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0f7990b2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0f7990b2
Branch: refs/heads/jira/solr-5944
Commit: 0f7990b2c8590d169add59354cc2678260f94e03
Parents: 285a101
Author: Ishan Chattopadhyaya <is...@apache.org>
Authored: Sun Jan 22 04:52:01 2017 +0530
Committer: Ishan Chattopadhyaya <is...@apache.org>
Committed: Sun Jan 22 04:52:01 2017 +0530
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/schema/NumericFieldType.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0f7990b2/solr/core/src/java/org/apache/solr/schema/NumericFieldType.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/NumericFieldType.java b/solr/core/src/java/org/apache/solr/schema/NumericFieldType.java
index 404693d..2d5412f 100644
--- a/solr/core/src/java/org/apache/solr/schema/NumericFieldType.java
+++ b/solr/core/src/java/org/apache/solr/schema/NumericFieldType.java
@@ -79,7 +79,7 @@ public abstract class NumericFieldType extends PrimitiveFieldType {
max == null ? null : DateMathParser.parseMath(null, max).getTime(),
minInclusive, maxInclusive);
default:
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Unknown type for point field");
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Unknown type for numeric field");
}
}
[2/3] lucene-solr:jira/solr-5944: Merge branch 'master' into
jira/solr-5944
Posted by is...@apache.org.
Merge branch 'master' into jira/solr-5944
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1aaa03d1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1aaa03d1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1aaa03d1
Branch: refs/heads/jira/solr-5944
Commit: 1aaa03d1d8af908360debf3641379fdd16ad820d
Parents: c2c1819 0f7990b
Author: Ishan Chattopadhyaya <is...@apache.org>
Authored: Sun Jan 22 05:21:31 2017 +0530
Committer: Ishan Chattopadhyaya <is...@apache.org>
Committed: Sun Jan 22 05:21:31 2017 +0530
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/schema/NumericFieldType.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] lucene-solr:jira/solr-5944: SOLR-5944: Removing nocommit
requesting additional review. We've already synchronized the entire method,
which should be safer than before
Posted by is...@apache.org.
SOLR-5944: Removing nocommit requesting additional review. We've already synchronized the entire method, which should be safer than before
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5fc87843
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5fc87843
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5fc87843
Branch: refs/heads/jira/solr-5944
Commit: 5fc87843dc8e8bc8f954f40c6eafb7ce0aa73b80
Parents: 1aaa03d
Author: Ishan Chattopadhyaya <is...@apache.org>
Authored: Sun Jan 22 05:23:20 2017 +0530
Committer: Ishan Chattopadhyaya <is...@apache.org>
Committed: Sun Jan 22 05:23:20 2017 +0530
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/update/UpdateLog.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5fc87843/solr/core/src/java/org/apache/solr/update/UpdateLog.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
index 23a7670..aaa6b6a 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
@@ -843,8 +843,6 @@ public static final int VERSION_IDX = 1;
synchronized public long applyPartialUpdates(BytesRef id, long prevPointer, long prevVersion,
Set<String> onlyTheseFields, SolrDocumentBase latestPartialDoc) {
- // nocommit: need additional eyeballs (besides ishan & hoss) on the synchronization in this method/class
-
SolrInputDocument partialUpdateDoc = null;
List<TransactionLog> lookupLogs = Arrays.asList(tlog, prevMapLog, prevMapLog2);