CouchDB River: Custom script does not convert the modified doc proper…

…ly to be indexed, closes #1225.
elastic · Aug 10, 2011 · d06a7e9 · d06a7e9
1 parent 25c3e89
commit d06a7e9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/...earch/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsSearchHitPhase.java b/...earch/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsSearchHitPhase.java
@@ -59,6 +59,7 @@ public class ScriptFieldsSearchHitPhase implements SearchHitPhase {
             Object value;
             try {
                 value = scriptField.script().run();
+                value = scriptField.script().unwrap(value);
             } catch (RuntimeException e) {
                 if (scriptField.ignoreException()) {
                     continue;

diff --git a/...script/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptEngineTests.java b/...script/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptEngineTests.java
@@ -28,6 +28,7 @@
 import org.testng.annotations.Test;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import static org.hamcrest.MatcherAssert.*;
@@ -94,6 +95,21 @@ public class JavaScriptScriptEngineTests {
         assertThat((String) ((Map<String, Object>) ctx.get("obj2")).get("prop2"), equalTo("value2"));
     }
 
+    @Test public void testJavaScriptInnerArrayCreation() {
+        Map<String, Object> ctx = new HashMap<String, Object>();
+        Map<String, Object> doc = new HashMap<String, Object>();
+        ctx.put("doc", doc);
+
+        Object complied = se.compile("ctx.doc.field1 = ['value1', 'value2']");
+        ExecutableScript script = se.executable(complied, new HashMap<String, Object>());
+        script.setNextVar("ctx", ctx);
+        script.run();
+
+        Map<String, Object> unwrap = (Map<String, Object>) script.unwrap(ctx);
+
+        assertThat(((Map) unwrap.get("doc")).get("field1"), instanceOf(List.class));
+    }
+
     @Test public void testAccessListInScript() {
         Map<String, Object> vars = new HashMap<String, Object>();
         Map<String, Object> obj2 = MapBuilder.<String, Object>newMapBuilder().put("prop2", "value2").map();

diff --git a/plugins/river/couchdb/src/main/java/org/elasticsearch/river/couchdb/CouchdbRiver.java b/plugins/river/couchdb/src/main/java/org/elasticsearch/river/couchdb/CouchdbRiver.java
@@ -213,6 +213,8 @@ private String processLine(String s, BulkRequestBuilder bulk) {
             script.setNextVar("ctx", ctx);
             try {
                 script.run();
+                // we need to unwrap the ctx...
+                ctx = (Map<String, Object>) script.unwrap(ctx);
             } catch (Exception e) {
                 logger.warn("failed to script process {}, ignoring", e, ctx);
                 return seq;