[teiid-commits] teiid SVN: r1996 - in trunk: connectors/connector-jdbc/src/main/rar/META-INF and 11 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Wed Mar 24 14:09:18 EDT 2010
Author: shawkins
Date: 2010-03-24 14:09:15 -0400 (Wed, 24 Mar 2010)
New Revision: 1996
Modified:
trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicManagedConnectionFactory.java
trunk/connectors/connector-jdbc/src/main/rar/META-INF/ra.xml
trunk/connectors/connector-ldap/src/main/rar/META-INF/ra.xml
trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackExecution.java
trunk/connectors/connector-loopback/src/main/rar/META-INF/ra.xml
trunk/connectors/connector-salesforce/src/main/rar/META-INF/ra.xml
trunk/connectors/connector-text/src/main/rar/META-INF/ra.xml
trunk/connectors/connector-xml-file/src/main/rar/META-INF/ra.xml
trunk/connectors/connector-xml-http/src/main/rar/META-INF/ra.xml
trunk/connectors/connector-xml-soap/src/main/rar/META-INF/ra.xml
trunk/connectors/sandbox/connector-template/src/main/rar/META-INF/ra.xml
trunk/connectors/sandbox/connector-yahoo/src/main/rar/META-INF/ra.xml
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorWorkItem.java
Log:
TEIID-1023 changing the default max rows to unlimited
Modified: trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicManagedConnectionFactory.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicManagedConnectionFactory.java 2010-03-24 17:52:06 UTC (rev 1995)
+++ trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicManagedConnectionFactory.java 2010-03-24 18:09:15 UTC (rev 1996)
@@ -62,7 +62,6 @@
private int maxResultRows = -1;
private boolean xaCapable;
- private boolean synchWorkers = true;
private String overrideCapabilitiesFile;
// derived
Modified: trunk/connectors/connector-jdbc/src/main/rar/META-INF/ra.xml
===================================================================
--- trunk/connectors/connector-jdbc/src/main/rar/META-INF/ra.xml 2010-03-24 17:52:06 UTC (rev 1995)
+++ trunk/connectors/connector-jdbc/src/main/rar/META-INF/ra.xml 2010-03-24 18:09:15 UTC (rev 1996)
@@ -79,7 +79,7 @@
<description>{$display:"Maximum Result Rows",$description:"Maximum Result Rows allowed",$advanced:"true"}</description>
<config-property-name>MaxResultRows</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>10000</config-property-value>
+ <config-property-value>-1</config-property-value>
</config-property>
<!-- JDBC Specific properties -->
Modified: trunk/connectors/connector-ldap/src/main/rar/META-INF/ra.xml
===================================================================
--- trunk/connectors/connector-ldap/src/main/rar/META-INF/ra.xml 2010-03-24 17:52:06 UTC (rev 1995)
+++ trunk/connectors/connector-ldap/src/main/rar/META-INF/ra.xml 2010-03-24 18:09:15 UTC (rev 1996)
@@ -79,7 +79,7 @@
<description>{$display:"Maximum Result Rows",$description:"Maximum Result Rows allowed",$advanced:"true"}</description>
<config-property-name>MaxResultRows</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>10000</config-property-value>
+ <config-property-value>-1</config-property-value>
</config-property>
<!-- LDAP Specific properties -->
Modified: trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackExecution.java
===================================================================
--- trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackExecution.java 2010-03-24 17:52:06 UTC (rev 1995)
+++ trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connector/loopback/LoopbackExecution.java 2010-03-24 18:09:15 UTC (rev 1996)
@@ -63,7 +63,6 @@
private List<Object> row;
private boolean waited = false;
private int rowsReturned = 0;
- private boolean asynch = false;
private int rowsNeeded = 1;
public LoopbackExecution(Command command, LoopbackManagedConnectionFactory config, RuntimeMetadata metadata) {
@@ -78,20 +77,17 @@
// Wait a random amount of time up to waitTime milliseconds
int randomTimeToWait = randomNumber.nextInt(this.config.getWaitTime());
- if(asynch) {
- // If we're asynch and the wait time was longer than the poll interval,
- // then just say we don't have results instead
- if(randomTimeToWait > this.config.getPollIntervalInMilli()) {
- waited = true;
- throw new DataNotAvailableException(randomTimeToWait);
- }
- } else {
- try {
- Thread.sleep(randomTimeToWait);
- } catch(InterruptedException e) {
- }
- waited = true;
+ // If we're asynch and the wait time was longer than the poll interval,
+ // then just say we don't have results instead
+ if(randomTimeToWait > this.config.getPollIntervalInMilli()) {
+ waited = true;
+ throw new DataNotAvailableException(randomTimeToWait);
+ }
+ try {
+ Thread.sleep(randomTimeToWait);
+ } catch(InterruptedException e) {
}
+ waited = true;
}
if(rowsReturned < this.rowsNeeded && row.size() > 0) {
Modified: trunk/connectors/connector-loopback/src/main/rar/META-INF/ra.xml
===================================================================
--- trunk/connectors/connector-loopback/src/main/rar/META-INF/ra.xml 2010-03-24 17:52:06 UTC (rev 1995)
+++ trunk/connectors/connector-loopback/src/main/rar/META-INF/ra.xml 2010-03-24 18:09:15 UTC (rev 1996)
@@ -79,7 +79,7 @@
<description>{$display:"Maximum Result Rows",$description:"Maximum Result Rows allowed",$advanced:"true"}</description>
<config-property-name>MaxResultRows</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>10000</config-property-value>
+ <config-property-value>-1</config-property-value>
</config-property>
<!-- Loopback Specific properties -->
Modified: trunk/connectors/connector-salesforce/src/main/rar/META-INF/ra.xml
===================================================================
--- trunk/connectors/connector-salesforce/src/main/rar/META-INF/ra.xml 2010-03-24 17:52:06 UTC (rev 1995)
+++ trunk/connectors/connector-salesforce/src/main/rar/META-INF/ra.xml 2010-03-24 18:09:15 UTC (rev 1996)
@@ -79,7 +79,7 @@
<description>{$display:"Maximum Result Rows",$description:"Maximum Result Rows allowed",$advanced:"true"}</description>
<config-property-name>MaxResultRows</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>10000</config-property-value>
+ <config-property-value>-1</config-property-value>
</config-property>
<!-- Salesforce Specific properties -->
Modified: trunk/connectors/connector-text/src/main/rar/META-INF/ra.xml
===================================================================
--- trunk/connectors/connector-text/src/main/rar/META-INF/ra.xml 2010-03-24 17:52:06 UTC (rev 1995)
+++ trunk/connectors/connector-text/src/main/rar/META-INF/ra.xml 2010-03-24 18:09:15 UTC (rev 1996)
@@ -79,7 +79,7 @@
<description>{$display:"Maximum Result Rows",$description:"Maximum Result Rows allowed",$advanced:"true"}</description>
<config-property-name>MaxResultRows</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>10000</config-property-value>
+ <config-property-value>-1</config-property-value>
</config-property>
<!-- Text Connector Specific properties -->
Modified: trunk/connectors/connector-xml-file/src/main/rar/META-INF/ra.xml
===================================================================
--- trunk/connectors/connector-xml-file/src/main/rar/META-INF/ra.xml 2010-03-24 17:52:06 UTC (rev 1995)
+++ trunk/connectors/connector-xml-file/src/main/rar/META-INF/ra.xml 2010-03-24 18:09:15 UTC (rev 1996)
@@ -79,7 +79,7 @@
<description>{$display:"Maximum Result Rows",$description:"Maximum Result Rows allowed",$advanced:"true"}</description>
<config-property-name>MaxResultRows</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>10000</config-property-value>
+ <config-property-value>-1</config-property-value>
</config-property>
<!-- XML File Connector Specific properties -->
Modified: trunk/connectors/connector-xml-http/src/main/rar/META-INF/ra.xml
===================================================================
--- trunk/connectors/connector-xml-http/src/main/rar/META-INF/ra.xml 2010-03-24 17:52:06 UTC (rev 1995)
+++ trunk/connectors/connector-xml-http/src/main/rar/META-INF/ra.xml 2010-03-24 18:09:15 UTC (rev 1996)
@@ -79,7 +79,7 @@
<description>{$display:"Maximum Result Rows",$description:"Maximum Result Rows allowed",$advanced:"true"}</description>
<config-property-name>MaxResultRows</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>10000</config-property-value>
+ <config-property-value>-1</config-property-value>
</config-property>
<!-- XML-Relational HTTP Connector Specific properties -->
@@ -101,7 +101,7 @@
<description>{$display:"Request Timeout (in Milliseconds)",$required:"true"}</description>
<config-property-name>RequestTimeout</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>10000</config-property-value>
+ <config-property-value>-1</config-property-value>
</config-property>
<config-property>
Modified: trunk/connectors/connector-xml-soap/src/main/rar/META-INF/ra.xml
===================================================================
--- trunk/connectors/connector-xml-soap/src/main/rar/META-INF/ra.xml 2010-03-24 17:52:06 UTC (rev 1995)
+++ trunk/connectors/connector-xml-soap/src/main/rar/META-INF/ra.xml 2010-03-24 18:09:15 UTC (rev 1996)
@@ -79,7 +79,7 @@
<description>{$display:"Maximum Result Rows",$description:"Maximum Result Rows allowed",$advanced:"true"}</description>
<config-property-name>MaxResultRows</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>10000</config-property-value>
+ <config-property-value>-1</config-property-value>
</config-property>
<!-- XML Source SOAP Connector Specific properties -->
Modified: trunk/connectors/sandbox/connector-template/src/main/rar/META-INF/ra.xml
===================================================================
--- trunk/connectors/sandbox/connector-template/src/main/rar/META-INF/ra.xml 2010-03-24 17:52:06 UTC (rev 1995)
+++ trunk/connectors/sandbox/connector-template/src/main/rar/META-INF/ra.xml 2010-03-24 18:09:15 UTC (rev 1996)
@@ -63,7 +63,7 @@
<description>{$display:"Maximum Result Rows",$description:"Maximum Result Rows allowed",$advanced:"true"}</description>
<config-property-name>MaxResultRows</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>10000</config-property-value>
+ <config-property-value>-1</config-property-value>
</config-property>
<!-- ${connector-name} Specific properties START -->
Modified: trunk/connectors/sandbox/connector-yahoo/src/main/rar/META-INF/ra.xml
===================================================================
--- trunk/connectors/sandbox/connector-yahoo/src/main/rar/META-INF/ra.xml 2010-03-24 17:52:06 UTC (rev 1995)
+++ trunk/connectors/sandbox/connector-yahoo/src/main/rar/META-INF/ra.xml 2010-03-24 18:09:15 UTC (rev 1996)
@@ -79,7 +79,7 @@
<description>{$display:"Maximum Result Rows",$description:"Maximum Result Rows allowed",$advanced:"true"}</description>
<config-property-name>MaxResultRows</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>10000</config-property-value>
+ <config-property-value>-1</config-property-value>
</config-property>
<!-- Yahoo Specific properties -->
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorWorkItem.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorWorkItem.java 2010-03-24 17:52:06 UTC (rev 1995)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorWorkItem.java 2010-03-24 18:09:15 UTC (rev 1996)
@@ -304,7 +304,7 @@
correctTypes(row);
rows.add(row);
// Check for max result rows exceeded
- if(this.connectorEnv.getMaxResultRows() != 0 && this.rowCount >= this.connectorEnv.getMaxResultRows()){
+ if(this.connectorEnv.getMaxResultRows() > -1 && this.rowCount >= this.connectorEnv.getMaxResultRows()){
if (this.rowCount == this.connectorEnv.getMaxResultRows() && !this.connectorEnv.isExceptionOnMaxRows()) {
LogManager.logDetail(LogConstants.CTX_CONNECTOR, new Object[] {this.id, "Exceeded max, returning", this.connectorEnv.getMaxResultRows()}); //$NON-NLS-1$
this.lastBatch = true;
More information about the teiid-commits
mailing list