TEIID-5462 adding a new translator property for netezza

teiid · Sep 6, 2018 · d049b63 · d049b63
1 parent f344f7d
commit d049b63
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 2 deletions.
diff --git a/api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java b/api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java
@@ -1591,4 +1591,17 @@ public void setSupportsWindowFunctionNthValue(boolean supportsNthValue) {
         this.supportsNthValue = supportsNthValue;
     }
 
+    Boolean supportsMultipleOpenStatements;
+    @Override
+    public boolean supportsMultipleOpenExecutions() {
+        if (supportsMultipleOpenStatements != null) {
+            return supportsMultipleOpenStatements;
+        }
+        return delegate.supportsMultipleOpenExecutions();
+    }
+
+    public void setSupportsMultipleOpenStatements(
+            boolean supportsMultipleOpenStatements) {
+        this.supportsMultipleOpenStatements = supportsMultipleOpenStatements;
+    }
 }
diff --git a/api/src/main/java/org/teiid/translator/ExecutionFactory.java b/api/src/main/java/org/teiid/translator/ExecutionFactory.java
@@ -1465,4 +1465,13 @@ public boolean supportsWindowFunctionCumeDist() {
     public boolean supportsWindowFunctionNthValue() {
         return supportsElementaryOlapOperations();
     }
+
+    /**
+     * 
+     * @since 11.2
+     * @return true if multiple executions may be open against a single connection at a time
+     */
+    public boolean supportsMultipleOpenExecutions() {
+        return true;
+    }
 }
diff --git a/api/src/test/java/org/teiid/translator/TestBaseDelegatingExecutionFactory.java b/api/src/test/java/org/teiid/translator/TestBaseDelegatingExecutionFactory.java
@@ -34,7 +34,7 @@ public class TestBaseDelegatingExecutionFactory {
 		Method[] methods = ExecutionFactory.class.getDeclaredMethods();
 		Method[] proxyMethods = BaseDelegatingExecutionFactory.class.getDeclaredMethods();
 		//excluding the setter methods the counts should be equal
-		assertEquals(methods.length+96, proxyMethods.length);
+		assertEquals(methods.length+97, proxyMethods.length);
 	}
 
 	@Test public void testExecution() throws TranslatorException {

diff --git a/...nslator-jdbc/src/main/java/org/teiid/translator/jdbc/netezza/NetezzaExecutionFactory.java b/...nslator-jdbc/src/main/java/org/teiid/translator/jdbc/netezza/NetezzaExecutionFactory.java
@@ -465,4 +465,10 @@ public boolean supportsSelectWithoutFrom() {
 	    return true;
 	}
 
+	@Override
+	public boolean supportsMultipleOpenExecutions() {
+	    //See TEIID-5462
+	    return false;
+	}
+
 }
diff --git a/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java b/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
@@ -588,7 +588,7 @@ public boolean isForkable() {
 
 	@Override
 	public boolean isThreadBound() {
-		return this.connector.isThreadBound();
+		return this.connector.isThreadBound() || (this.requestMsg.isTransactional() && !this.connector.supportsMultipleOpenExecutions());
 	}
 
 	private List<?> correctTypes(List row) throws TeiidException {

diff --git a/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorWorkItem.java b/engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorWorkItem.java
@@ -59,6 +59,7 @@
 import org.teiid.dqp.message.RequestID;
 import org.teiid.dqp.service.AutoGenDataService;
 import org.teiid.dqp.service.TransactionContext;
+import org.teiid.dqp.service.TransactionContext.Scope;
 import org.teiid.language.Call;
 import org.teiid.language.QueryExpression;
 import org.teiid.metadata.RuntimeMetadata;
@@ -546,5 +547,33 @@ public Object getConnectionFactory(){
 		ConnectorManager cm = TestConnectorManager.getConnectorManager();
 		cm.registerRequest(arm);
 	}
+
+	@Test public void testIsThreadBound() throws Exception {
+        Command command = helpGetCommand("SELECT intkey FROM bqt1.smalla", EXAMPLE_BQT); //$NON-NLS-1$
+        AtomicRequestMessage arm = createNewAtomicRequestMessage(1, 1);
+        TransactionContext tc = new TransactionContext();
+        tc.setTransactionType(Scope.LOCAL);
+        arm.setTransactionContext(tc);
+        arm.setCommand(command);
+        final FakeConnector c = new FakeConnector() {
+            public boolean supportsMultipleOpenExecutions() {
+                return false;
+            }
+        };
+        ConnectorManager cm = new ConnectorManager("FakeConnector","FakeConnector") { //$NON-NLS-1$ //$NON-NLS-2$
+            public ExecutionFactory getExecutionFactory() {
+                return c;
+            }
+            public Object getConnectionFactory(){
+                return c;
+            }
+        };
+        cm.start();
+        ConnectorWorkItem cwi = new ConnectorWorkItem(arm, cm);
+        assertTrue(cwi.isThreadBound());
+
+        cwi = new ConnectorWorkItem(arm, TestConnectorManager.getConnectorManager());
+        assertFalse(cwi.isThreadBound());
+    }
 
 }