From a687a1312aa5c72b4d5514b37412ed3b46d7c2f2 Mon Sep 17 00:00:00 2001
From: Sachin Goyal <sgoyal6@L-SB8M1HEG8W-M.local>
Date: Sat, 10 Jun 2017 16:29:30 -0700
Subject: [PATCH] More informative messages

---
 ...sedVersionConstraintsProcessorFactory.java | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java
index a8b331c84299..5ad96e18da00 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java
@@ -255,7 +255,7 @@ private boolean isVersionNewEnough(BytesRef indexedDocId,
       assert null != newUserVersion;
 
       oldSolrVersion = -1;
-      // log.info("!!!!!!!!! isVersionNewEnough being called for " + indexedDocId.utf8ToString() + " newVersion=" + newUserVersion);
+      // log.info("!!!!!!!!! isVersionNewEnough being called for " + indexedDocId.utf8ToString() + " newUserVersion=" + newUserVersion);
       newUserVersion = convertFieldValueUsingType(userVersionField, newUserVersion);
       Object oldUserVersion = null;
       SolrInputDocument oldDoc = null;
@@ -289,7 +289,8 @@ private boolean isVersionNewEnough(BytesRef indexedDocId,
             oldUserVersion = fv.objectVal((int)lookup);
 
           } catch (IOException e) {
-            throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Error reading version from index", e);
+            throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
+                        "Error reading version from index for id=" + indexedDocId + ", newUserVersion="+newUserVersion, e);
           } finally {
             if (newestSearcher != null) {
               newestSearcher.decref();
@@ -326,15 +327,16 @@ private boolean isVersionNewEnough(BytesRef indexedDocId,
         // could happen if they turn this feature on after building an index
         // w/o the versionField
         throw new SolrException(SERVER_ERROR,
-            "Doc exists in index, but has null versionField: "
+            "Doc with id=" + indexedDocId + ", newUserVersion="+newUserVersion + " exists in index, but has null versionField: "
                 + versionFieldName);
       }
 
 
       if (! (oldUserVersion instanceof Comparable && newUserVersion instanceof Comparable) ) {
         throw new SolrException(BAD_REQUEST,
-            "old version and new version are not comparable: " +
-                oldUserVersion.getClass()+" vs "+newUserVersion.getClass());
+            "Either old version (" + oldUserVersion + ", type=" + oldUserVersion.getClass() + ")" +
+               " or new version (" + newUserVersion + ", type=" + newUserVersion.getClass() + ") is not comparable" +
+               " for doc with id=" + indexedDocId);
       }
 
       try {
@@ -351,14 +353,14 @@ private boolean isVersionNewEnough(BytesRef indexedDocId,
         } else {
           // log.info("VERSION will throw conflict" );
           throw new SolrException(CONFLICT,
-              "user version is not high enough: " + newUserVersion);
+              "newUserVersion: " + newUserVersion + " is not high enough as compared to the oldUserVersion: " + oldUserVersion
+               " for doc with id=" + indexedDocId);
         }
       } catch (ClassCastException e) {
         throw new SolrException(BAD_REQUEST,
-            "old version and new version are not comparable: " +
-                oldUserVersion.getClass()+" vs "+newUserVersion.getClass() +
-                ": " + e.getMessage(), e);
-
+            "Either old version (" + oldUserVersion + ", type=" + oldUserVersion.getClass() + ")" +
+               " or new version (" + newUserVersion + ", type=" + newUserVersion.getClass() + ") cannot be cast to Comparable" +
+               " for doc with id=" + indexedDocId + ": " + e.getMessage(), e);
       }
     }