Merge pull request #2196 from adamretter/hotfix/subsequence-mixed-types

Fixes an issue with mixed types in a subsequence

Author: wolfgangmm

src/org/exist/xquery/value/SubSequence.java

@@ -86,7 +86,7 @@ public void add(final Item item) throws XPathException {
 
     @Override
     public int getItemType() {
-        return Type.ITEM;
+        return sequence.getItemType();
     }
 
     @Override
@@ -361,7 +361,26 @@ public Iterator<Collection> getCollectionIterator() {
 
     @Override
     public boolean isPersistentSet() {
-        return false;
+        final SequenceIterator iterator;
+        try {
+             iterator = iterate();
+        } catch (final XPathException e) {
+            throw new RuntimeException(e); // should never happen!
+        }
+
+        // needed to guard against returning true for an empty-sequence below
+        if (!iterator.hasNext()) {
+            return false;
+        }
+
+        while (iterator.hasNext()) {
+            final NodeValue item = (NodeValue) iterator.nextItem();
+            if (item.getImplementationType() != NodeValue.PERSISTENT_NODE) {
+                return false;
+            }
+        }
+        // else, all items were persistent
+        return true;
     }
 
     @Override

test/src/org/exist/xquery/functions/fn/FunSubSequenceTest.java

@@ -22,19 +22,30 @@
 
 import com.googlecode.junittoolbox.ParallelRunner;
 import org.exist.test.ExistXmldbEmbeddedServer;
+import org.exist.test.TestConstants;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.xmldb.api.base.Collection;
+import org.xmldb.api.base.Resource;
 import org.xmldb.api.base.ResourceSet;
 import org.xmldb.api.base.XMLDBException;
+import org.xmldb.api.modules.CollectionManagementService;
+import org.xmldb.api.modules.XMLResource;
 
 import static org.junit.Assert.assertEquals;
 
 @RunWith(ParallelRunner.class)
 public class FunSubSequenceTest {
 
     @ClassRule
-    public static final ExistXmldbEmbeddedServer existEmbeddedServer = new ExistXmldbEmbeddedServer(true, true);
+    public static final ExistXmldbEmbeddedServer existEmbeddedServer = new ExistXmldbEmbeddedServer(false, true, true);
+
+    private static Collection test = null;
+    private static final String SIMPLE_XML_FILENAME = "simple.xml";
+    private static final String SIMPLE_XML = "<nums><i>1</i><i>2</i><i>3</i><i>4</i></nums>";
 
     @Test
     public void all_arity2() throws XMLDBException {
@@ -168,6 +179,26 @@ public void largeRange_arity3() throws XMLDBException {
         assertEquals("(3000000000)", asSequenceStr(result));
     }
 
+    @Test
+    public void persistentSupsequence_toInMemory() throws XMLDBException {
+        final ResourceSet result = existEmbeddedServer.executeQuery("fn:subsequence(doc('" + TestConstants.TEST_COLLECTION_URI.getCollectionPath() + "/" + SIMPLE_XML_FILENAME + "')/nums/i, 2, 2)//text()");
+        assertEquals("(2,3)", asSequenceStr(result));
+    }
+
+    @BeforeClass
+    public static void setup() throws XMLDBException {
+        test = existEmbeddedServer.createCollection(existEmbeddedServer.getRoot(), TestConstants.TEST_COLLECTION_URI.lastSegment().toString());
+        final Resource resource = test.createResource(SIMPLE_XML_FILENAME, XMLResource.RESOURCE_TYPE);
+        resource.setContent(SIMPLE_XML);
+        test.storeResource(resource);
+    }
+
+    @AfterClass
+    public static void cleanup() throws XMLDBException {
+        final CollectionManagementService collectionManagementService = (CollectionManagementService) existEmbeddedServer.getRoot().getService("CollectionManagementService", "1.0");
+        collectionManagementService.removeCollection(test.getName());
+    }
+
     private static String asSequenceStr(final ResourceSet result) throws XMLDBException {
         final StringBuilder builder = new StringBuilder();
         builder.append('(');