getSourceAsString() for doc inserted as SMILE fails, auto convert to JSON, closes elastic#2064.

Author: kimchy

src/main/java/org/elasticsearch/action/get/GetResponse.java

@@ -37,7 +37,6 @@
 /**
  * The response of a get action.
  *
- *
  * @see GetRequest
  * @see org.elasticsearch.client.Client#get(GetRequest)
  */
@@ -129,13 +128,27 @@ public byte[] source() {
         return getResult.source();
     }
 
+    /**
+     * The source of the document if exists.
+     */
+    public byte[] getSourceAsBytes() {
+        return source();
+    }
+
     /**
      * Returns bytes reference, also un compress the source if needed.
      */
     public BytesHolder sourceRef() {
         return getResult.sourceRef();
     }
 
+    /**
+     * Returns bytes reference, also un compress the source if needed.
+     */
+    public BytesHolder getSourceAsBytesRef() {
+        return sourceRef();
+    }
+
     /**
      * Is the source empty (not available) or not.
      */
@@ -150,6 +163,10 @@ public String sourceAsString() {
         return getResult.sourceAsString();
     }
 
+    public String getSourceAsString() {
+        return sourceAsString();
+    }
+
     /**
      * The source of the document (As a map).
      */

src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java

@@ -22,6 +22,7 @@
 import com.google.common.base.Charsets;
 import com.google.common.collect.Maps;
 import org.elasticsearch.ElasticSearchParseException;
+import org.elasticsearch.common.BytesHolder;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.compress.CompressedStreamInput;
 import org.elasticsearch.common.compress.Compressor;
@@ -75,6 +76,14 @@ public static Tuple<XContentType, Map<String, Object>> convertToMap(byte[] data,
         }
     }
 
+    public static String convertToJson(BytesHolder bytes, boolean reformatJson) throws IOException {
+        return convertToJson(bytes.bytes(), bytes.offset(), bytes.length(), reformatJson);
+    }
+
+    public static String convertToJson(BytesHolder bytes, boolean reformatJson, boolean prettyPrint) throws IOException {
+        return convertToJson(bytes.bytes(), bytes.offset(), bytes.length(), reformatJson, prettyPrint);
+    }
+
     public static String convertToJson(byte[] data, int offset, int length, boolean reformatJson) throws IOException {
         return convertToJson(data, offset, length, reformatJson, false);
     }

src/main/java/org/elasticsearch/index/get/GetResult.java

@@ -22,14 +22,14 @@
 import com.google.common.collect.ImmutableMap;
 import org.elasticsearch.ElasticSearchParseException;
 import org.elasticsearch.common.BytesHolder;
-import org.elasticsearch.common.Unicode;
 import org.elasticsearch.common.compress.CompressorFactory;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Streamable;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentBuilderString;
+import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.rest.action.support.RestXContentBuilder;
 import org.elasticsearch.search.lookup.SourceLookup;
 
@@ -197,7 +197,11 @@ public String sourceAsString() {
             return null;
         }
         BytesHolder source = sourceRef();
-        return Unicode.fromBytes(source.bytes(), source.offset(), source.length());
+        try {
+            return XContentHelper.convertToJson(source, false);
+        } catch (IOException e) {
+            throw new ElasticSearchParseException("failed to convert source to a json string");
+        }
     }
 
     /**

src/main/java/org/elasticsearch/search/SearchHit.java

@@ -90,6 +90,11 @@ public interface SearchHit extends Streamable, ToXContent, Iterable<SearchHitFie
      */
     BytesHolder sourceRef();
 
+    /**
+     * Returns bytes reference, also un compress the source if needed.
+     */
+    BytesHolder getSourceRef();
+
     /**
      * The source of the document (can be <tt>null</tt>). Note, its a copy of the source
      * into a byte array, consider using {@link #sourceRef()} so there won't be a need to copy.
@@ -111,6 +116,11 @@ public interface SearchHit extends Streamable, ToXContent, Iterable<SearchHitFie
      */
     String sourceAsString();
 
+    /**
+     * The source of the document as string (can be <tt>null</tt>).
+     */
+    String getSourceAsString();
+
     /**
      * The source of the document as a map (can be <tt>null</tt>).
      */

src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java

@@ -25,12 +25,12 @@
 import org.elasticsearch.common.BytesHolder;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.Unicode;
 import org.elasticsearch.common.compress.CompressorFactory;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentBuilderString;
+import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.rest.action.support.RestXContentBuilder;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHitField;
@@ -174,6 +174,11 @@ public BytesHolder sourceRef() {
         }
     }
 
+    @Override
+    public BytesHolder getSourceRef() {
+        return sourceRef();
+    }
+
     /**
      * Internal source representation, might be compressed....
      */
@@ -209,7 +214,16 @@ public String sourceAsString() {
             return null;
         }
         BytesHolder source = sourceRef();
-        return Unicode.fromBytes(source.bytes(), source.offset(), source.length());
+        try {
+            return XContentHelper.convertToJson(source, false);
+        } catch (IOException e) {
+            throw new ElasticSearchParseException("failed to convert source to a json string");
+        }
+    }
+
+    @Override
+    public String getSourceAsString() {
+        return sourceAsString();
     }
 
     @SuppressWarnings({"unchecked"})