[teiid-commits] teiid SVN: r2090 - in trunk/engine/src: test/java/com/metamatrix/query/processor and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2010-05-02 21:14:25 -0400 (Sun, 02 May 2010)
New Revision: 2090

Added:
   trunk/engine/src/test/java/com/metamatrix/query/processor/TestBatchIterator.java
Modified:
   trunk/engine/src/main/java/com/metamatrix/query/processor/BatchIterator.java
Log:
TEIID-1084 fix for index exception

Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/BatchIterator.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/query/processor/BatchIterator.java	2010-04-30 15:34:00 UTC (rev 2089)
+++ trunk/engine/src/main/java/com/metamatrix/query/processor/BatchIterator.java	2010-05-03 01:14:25 UTC (rev 2090)
@@ -83,7 +83,7 @@
                 }
             }
 
-            if (currentBatch.getEndRow() >= currentRow) {
+            if (currentBatch.containsRow(currentRow)) {
                 this.currentTuple = currentBatch.getTuple(currentRow++);
             } else {
                 done = currentBatch.getTerminationFlag();
@@ -135,7 +135,10 @@
     	if (this.bufferedTs != null) {
     		mark = false;
     		this.bufferedTs.reset();
-    		this.currentRow = this.bufferedTs.getCurrentIndex();
+    		if (this.currentRow != this.bufferedTs.getCurrentIndex()) {
+    			this.currentRow = this.bufferedTs.getCurrentIndex();
+    			this.currentTuple = null;
+    		}
     		return;
     	}
         throw new UnsupportedOperationException();

Added: trunk/engine/src/test/java/com/metamatrix/query/processor/TestBatchIterator.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/query/processor/TestBatchIterator.java	                        (rev 0)
+++ trunk/engine/src/test/java/com/metamatrix/query/processor/TestBatchIterator.java	2010-05-03 01:14:25 UTC (rev 2090)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership.  Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package com.metamatrix.query.processor;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.metamatrix.common.buffer.BufferManager;
+import com.metamatrix.common.buffer.BufferManagerFactory;
+import com.metamatrix.common.buffer.BufferManager.TupleSourceType;
+import com.metamatrix.query.processor.relational.FakeRelationalNode;
+import com.metamatrix.query.sql.symbol.ElementSymbol;
+
+ at SuppressWarnings("nls")
+public class TestBatchIterator {
+
+	@Test public void testReset() throws Exception {
+		BatchIterator bi = new BatchIterator(new FakeRelationalNode(1, new List[] {
+			Arrays.asList(1),
+			Arrays.asList(1),
+			Arrays.asList(1)
+		}, 1));
+		BufferManager bm = BufferManagerFactory.getStandaloneBufferManager();
+		bi.setBuffer(bm.createTupleBuffer(Arrays.asList(new ElementSymbol("x")), "test", TupleSourceType.PROCESSOR), true);  //$NON-NLS-1$
+		bi.mark();
+		bi.nextTuple();
+		bi.nextTuple();
+		bi.reset();
+		bi.nextTuple();
+	}
+	
+}


Property changes on: trunk/engine/src/test/java/com/metamatrix/query/processor/TestBatchIterator.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain