[teiid-commits] teiid SVN: r2036 - in trunk: build/kit-jboss-container/deploy/teiid and 13 other directories.

Author: shawkins Date: 2010-04-07 22:41:01 -0400 (Wed, 07 Apr 2010) New Revision: 2036 Removed: trunk/connectors/connector-xml-soap/src/main/java/org/teiid/connector/xmlsource/ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequestWorkItem.java Modified: trunk/adminshell/src/main/java/org/teiid/MigrationUtil.java trunk/build/kit-jboss-container/deploy/teiid/teiid-jboss-beans.xml trunk/client/src/main/java/org/teiid/client/RequestMessage.java 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-xml-http/src/main/java/org/teiid/connector/xml/XMLConnectorState.java trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/base/XMLConnectorStateImpl.java trunk/connectors/connector-xml-http/src/test/java/org/teiid/connector/xml/http/FakeHttpProperties.java trunk/connectors/connector-xml-http/src/test/java/org/teiid/connector/xml/http/TestHTTPConnectorState.java trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicRequestMessage.java trunk/engine/src/main/java/com/metamatrix/query/analysis/AnalysisRecord.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/RelationalNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/RelationalNodeStatistics.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java trunk/engine/src/test/java/com/metamatrix/query/analysis/TestAnalysisRecord.java Log: TEIID-833 addressing misc. issues with jca changes. foremost the jdbc capabilities were not being picked up. Modified: trunk/adminshell/src/main/java/org/teiid/MigrationUtil.java =================================================================== --- trunk/adminshell/src/main/java/org/teiid/MigrationUtil.java 2010-04-07 19:55:09 UTC (rev 2035) +++ trunk/adminshell/src/main/java/org/teiid/MigrationUtil.java 2010-04-08 02:41:01 UTC (rev 2036) @@ -66,7 +66,9 @@ "\n create underlying DataSource connection pools." + "\n You will need to manually create one -ds.xml for each JDBC DataSource " + "\n with a JNDI name of <connector binding name>DS, " + - "\n where any spaces in the name are replace by _"); + "\n where any spaces in the name are replace by _" + + "\n\nNode: depending upon the connectors used, you may need to manually edit the " + + " -bindings.xml file."); System.exit(-1); } File file = new File(args[0]); @@ -99,7 +101,7 @@ manifest.delete(); } transformConfig(config, "/vdb.xsl", new StreamResult(new File(metainf, "vdb.xml"))); - transformConfig(config, "/connector.xsl", new StreamResult(new File(metainf, "bindings-ds.xml"))); + transformConfig(config, "/connector.xsl", new StreamResult(new File(file.getParentFile(), fileName + "-bindings-ds.xml"))); config.delete(); FileOutputStream out = new FileOutputStream(new File(file.getParent(), fileName + "_70.vdb")); ZipOutputStream zos = new ZipOutputStream(new BufferedOutputStream(out)); Modified: trunk/build/kit-jboss-container/deploy/teiid/teiid-jboss-beans.xml =================================================================== --- trunk/build/kit-jboss-container/deploy/teiid/teiid-jboss-beans.xml 2010-04-07 19:55:09 UTC (rev 2035) +++ trunk/build/kit-jboss-container/deploy/teiid/teiid-jboss-beans.xml 2010-04-08 02:41:01 UTC (rev 2036) @@ -74,8 +74,8 @@ <!-- Name of the process that uniquely identifies this process --> <property name="processName">localhost</property> - <!-- Process pool maximum thread count. (default 16) Increase this value if your load includes a large number of XQueries or if the system's available processors is larger than 8. --> - <property name="maxThreads">16</property> + <!-- Process pool maximum thread count. (default 32) Increase this value if your load includes a large number of XQueries or if the system's available processors is larger than 8. --> + <property name="maxThreads">32</property> <!-- Query processor time slice, in milliseconds. (default 2000) --> <property name="timeSliceInMilli">2000</property> <!-- Maximum allowed fetch size, set via JDBC. User requested value ignored above this value. (default 20480) --> Modified: trunk/client/src/main/java/org/teiid/client/RequestMessage.java =================================================================== --- trunk/client/src/main/java/org/teiid/client/RequestMessage.java 2010-04-07 19:55:09 UTC (rev 2035) +++ trunk/client/src/main/java/org/teiid/client/RequestMessage.java 2010-04-08 02:41:01 UTC (rev 2036) @@ -243,7 +243,6 @@ } public boolean useResultSetCache() { - //not use caching when there is a txn return useResultSetCache; } 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-04-07 19:55:09 UTC (rev 2035) +++ trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicManagedConnectionFactory.java 2010-04-08 02:41:01 UTC (rev 2036) @@ -56,7 +56,7 @@ // Properties set by ra.xml private String connectorClass; - private String capabilitiesClass = BasicConnectorCapabilities.class.getName(); + private String capabilitiesClass; private boolean immutable = false; private boolean exceptionOnMaxRows = false; private int maxResultRows = -1; Modified: trunk/connectors/connector-jdbc/src/main/rar/META-INF/ra.xml =================================================================== --- trunk/connectors/connector-jdbc/src/main/rar/META-INF/ra.xml 2010-04-07 19:55:09 UTC (rev 2035) +++ trunk/connectors/connector-jdbc/src/main/rar/META-INF/ra.xml 2010-04-08 02:41:01 UTC (rev 2036) @@ -51,7 +51,6 @@ <description>{$display:"Connector Capabilities",$description:"The class to use to provide the Connector Capabilities",$advanced:"true"}</description> <config-property-name>CapabilitiesClass</config-property-name> <config-property-type>java.lang.String</config-property-type> - <config-property-value>org.teiid.connector.basic.BasicConnectorCapabilities</config-property-value> </config-property> <config-property> @@ -95,7 +94,7 @@ <description>{$display:"fetch size used from the connector to its underlying source.",$advanced:"true"}</description> <config-property-name>FetchSize</config-property-name> <config-property-type>java.lang.Integer</config-property-type> - <config-property-value>2000</config-property-value> + <config-property-value>1024</config-property-value> </config-property> <config-property> Modified: trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/XMLConnectorState.java =================================================================== --- trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/XMLConnectorState.java 2010-04-07 19:55:09 UTC (rev 2035) +++ trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/XMLConnectorState.java 2010-04-08 02:41:01 UTC (rev 2036) @@ -23,10 +23,7 @@ package org.teiid.connector.xml; -import java.sql.SQLXML; - import org.teiid.connector.api.Connection; -import org.teiid.connector.api.ConnectorCapabilities; import org.teiid.connector.api.ConnectorException; import org.teiid.connector.api.ConnectorLogger; import org.teiid.connector.xml.http.HTTPManagedConnectionFactory; @@ -40,8 +37,6 @@ public abstract boolean isPreprocess(); - public abstract ConnectorCapabilities getConnectorCapabilities(); - public abstract boolean isLogRequestResponse(); public abstract SAXFilterProvider getSAXFilterProvider(); Modified: trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/base/XMLConnectorStateImpl.java =================================================================== --- trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/base/XMLConnectorStateImpl.java 2010-04-07 19:55:09 UTC (rev 2035) +++ trunk/connectors/connector-xml-http/src/main/java/org/teiid/connector/xml/base/XMLConnectorStateImpl.java 2010-04-08 02:41:01 UTC (rev 2036) @@ -25,7 +25,6 @@ import java.io.InputStream; -import org.teiid.connector.api.ConnectorCapabilities; import org.teiid.connector.api.ConnectorException; import org.teiid.connector.api.ConnectorLogger; import org.teiid.connector.xml.XMLConnectorState; @@ -61,8 +60,6 @@ private SAXFilterProvider provider; - private ConnectorCapabilities capabilites; - public XMLConnectorStateImpl() { setPreprocess(true); setLogRequestResponse(false); @@ -77,8 +74,6 @@ } setLogRequestResponse(env.getLogRequestResponseDocs()); - setCapabilites(loadConnectorCapabilities(env.getCapabilitiesClass())); - String provider = env.getSaxFilterProviderClass(); if (provider != null && !provider.equals(SAX_FILTER_PROVIDER_CLASS_DEFAULT)) { setSaxProviderClass(provider); @@ -97,19 +92,6 @@ } } - private ConnectorCapabilities loadConnectorCapabilities( - String connectorCapabilitiesClass) throws ConnectorException { - ConnectorCapabilities caps = null; - try { - Class clazz = Thread.currentThread().getContextClassLoader().loadClass(connectorCapabilitiesClass); - caps = (ConnectorCapabilities) clazz.newInstance(); - } catch (Exception e) { - logger.logError(e.getMessage(), e); - throw new ConnectorException(e); - } - return caps; - } - /* * (non-Javadoc) * @@ -145,20 +127,6 @@ return m_preprocess; } - /* - * (non-Javadoc) - * - * @see com.metamatrix.connector.xml.base.XMLConnectorState#getConnectorCapabilities() - */ - public ConnectorCapabilities getConnectorCapabilities() { - return capabilites; - } - - private void setCapabilites(ConnectorCapabilities capabilities) { - this.capabilites = capabilities; - } - - private void setLogRequestResponse(boolean logRequestResponse) { m_logRequestResponse = logRequestResponse; } Modified: trunk/connectors/connector-xml-http/src/test/java/org/teiid/connector/xml/http/FakeHttpProperties.java =================================================================== --- trunk/connectors/connector-xml-http/src/test/java/org/teiid/connector/xml/http/FakeHttpProperties.java 2010-04-07 19:55:09 UTC (rev 2035) +++ trunk/connectors/connector-xml-http/src/test/java/org/teiid/connector/xml/http/FakeHttpProperties.java 2010-04-08 02:41:01 UTC (rev 2036) @@ -1,47 +1,21 @@ package org.teiid.connector.xml.http; -import java.util.Properties; -import org.teiid.connector.xml.SecureConnectorState; -import org.teiid.connector.xml.XMLConnectorState; - @SuppressWarnings("nls") public class FakeHttpProperties { - public static Properties getDefaultXMLRequestProps() { - Properties defaultHTTPProps = getDefaultHttpProps(); - defaultHTTPProps.setProperty(HTTPConnectorState.PARAMETER_METHOD,HTTPConnectorState.PARAMETER_XML_REQUEST); - return defaultHTTPProps; - } - - public static Properties getDefaultHttpProps() { - Properties testHTTPProps = new Properties(); - testHTTPProps.setProperty(XMLConnectorState.STATE_CLASS_PROP, "com.metamatrix.connector.xml.http.HTTPConnectorState"); - testHTTPProps.setProperty(HTTPConnectorState.ACCESS_METHOD,HTTPConnectorState.GET); - testHTTPProps.setProperty(HTTPConnectorState.PARAMETER_METHOD,HTTPConnectorState.PARAMETER_XML_REQUEST); - testHTTPProps.setProperty(HTTPConnectorState.URI, "http://0.0.0.0:8673"); + + public static HTTPManagedConnectionFactory getDefaultXMLRequestProps() { + HTTPManagedConnectionFactory env = new HTTPManagedConnectionFactory(); + env.setConnectorStateClass("com.metamatrix.connector.xml.http.HTTPConnectorState"); + env.setAccessMethod(HTTPConnectorState.GET); + env.setParameterMethod(HTTPConnectorState.PARAMETER_XML_REQUEST); + env.setUri("http://0.0.0.0:8673"); // testHTTPProps.setProperty(HTTPConnectorState.PROXY_URI, // "http://0.0.0.0:8673"); - testHTTPProps.setProperty(HTTPConnectorState.REQUEST_TIMEOUT, "60"); - testHTTPProps.setProperty(HTTPConnectorState.XML_PARAMETER_NAME,"XMLRequest"); - testHTTPProps.setProperty(HTTPConnectorState.HTTP_BASIC_USER, ""); - testHTTPProps.setProperty(HTTPConnectorState.HTTP_BASIC_PASSWORD, ""); - testHTTPProps.setProperty(SecureConnectorState.SECURITY_DESERIALIZER_CLASS,"org.teiid.connector.xml.http.DefaultTrustDeserializer"); - return testHTTPProps; - + env.setRequestTimeout(60); + env.setXMLParmName("XMLRequest"); + env.setTrustDeserializerClass("org.teiid.connector.xml.http.DefaultTrustDeserializer"); + return env; } - - - public static Properties getDefaultHTTPProps() { - Properties testHTTPProps = new Properties(); - testHTTPProps.setProperty(HTTPConnectorState.URI, "http://localhost:8673"); //$NON-NLS-1$ - testHTTPProps.setProperty(HTTPConnectorState.REQUEST_TIMEOUT, "60"); //$NON-NLS-1$ - testHTTPProps.setProperty(XMLConnectorState.STATE_CLASS_PROP, "com.metamatrix.connector.xml.http.HTTPConnectorState"); //$NON-NLS-1$ - testHTTPProps.setProperty(HTTPConnectorState.HTTP_BASIC_USER, ""); - testHTTPProps.setProperty(HTTPConnectorState.HTTP_BASIC_PASSWORD, ""); - testHTTPProps.setProperty(SecureConnectorState.SECURITY_DESERIALIZER_CLASS, "com.metamatrix.connector.xml.http.DefaultTrustDeserializer"); - testHTTPProps.setProperty(HTTPConnectorState.PARAMETER_METHOD, HTTPConnectorState.PARAMETER_NAME_VALUE); - testHTTPProps.setProperty(HTTPConnectorState.ACCESS_METHOD, HTTPConnectorState.GET); - return testHTTPProps; - } } Modified: trunk/connectors/connector-xml-http/src/test/java/org/teiid/connector/xml/http/TestHTTPConnectorState.java =================================================================== --- trunk/connectors/connector-xml-http/src/test/java/org/teiid/connector/xml/http/TestHTTPConnectorState.java 2010-04-07 19:55:09 UTC (rev 2035) +++ trunk/connectors/connector-xml-http/src/test/java/org/teiid/connector/xml/http/TestHTTPConnectorState.java 2010-04-08 02:41:01 UTC (rev 2036) @@ -22,18 +22,16 @@ package org.teiid.connector.xml.http; -import java.util.Properties; - import junit.framework.TestCase; import org.teiid.connector.api.ConnectorException; import com.metamatrix.cdk.api.SysLogger; -import com.metamatrix.common.util.PropertiesUtils; /** * */ +@SuppressWarnings("nls") public class TestHTTPConnectorState extends TestCase { /** @@ -94,28 +92,20 @@ assertEquals(paramName, state.getXmlParameterName()); } - public void testHostnameVerifier() { - Properties props = FakeHttpProperties.getDefaultXMLRequestProps(); - props.put("HostnameVerifier", "org.teiid.connector.xml.http.MockHostnameVerifier"); + public void testHostnameVerifier() throws ConnectorException { HTTPConnectorState state = new HTTPConnectorState(); - try { - HTTPManagedConnectionFactory env = new HTTPManagedConnectionFactory(); - PropertiesUtils.setBeanProperties(env, props, null); - state.setLogger(new SysLogger(false)); - state.setState(env); - } catch (ConnectorException ce) { - fail(ce.getMessage()); - } + HTTPManagedConnectionFactory env = FakeHttpProperties.getDefaultXMLRequestProps(); + env.setHostnameVerifier("org.teiid.connector.xml.http.MockHostnameVerifier"); + state.setLogger(new SysLogger(false)); + state.setState(env); } public void testBadHostnameVerifier() { - Properties props = FakeHttpProperties.getDefaultXMLRequestProps(); - props.put("HostnameVerifier", "com.metamatrix.connector.xml.BogusHostnameVerifier"); HTTPConnectorState state = new HTTPConnectorState(); try { state.setLogger(new SysLogger(false)); - HTTPManagedConnectionFactory env = new HTTPManagedConnectionFactory(); - PropertiesUtils.setBeanProperties(env, props, null); + HTTPManagedConnectionFactory env = FakeHttpProperties.getDefaultXMLRequestProps(); + env.setHostnameVerifier("com.metamatrix.connector.xml.BogusHostnameVerifier"); state.setState(env); } catch (ConnectorException ce) { return; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicRequestMessage.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicRequestMessage.java 2010-04-07 19:55:09 UTC (rev 2035) +++ trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicRequestMessage.java 2010-04-08 02:41:01 UTC (rev 2036) @@ -73,9 +73,6 @@ // The time when command begins processing on the server. private long processingTimestamp = System.currentTimeMillis(); - // whether to use ResultSet cache if there is one - private boolean useResultSetCache; - private boolean partialResultsFlag; private RequestID requestID; @@ -153,16 +150,6 @@ return processingTimestamp; } - public boolean useResultSetCache() { - //not use caching when there is a txn - return useResultSetCache - && !isTransactional(); - } - - public void setUseResultSetCache(boolean useResultSetCacse) { - this.useResultSetCache = useResultSetCacse; - } - public boolean supportsPartialResults() { return partialResultsFlag; } Modified: trunk/engine/src/main/java/com/metamatrix/query/analysis/AnalysisRecord.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/query/analysis/AnalysisRecord.java 2010-04-07 19:55:09 UTC (rev 2035) +++ trunk/engine/src/main/java/com/metamatrix/query/analysis/AnalysisRecord.java 2010-04-08 02:41:01 UTC (rev 2036) @@ -106,9 +106,6 @@ private boolean recordQueryPlan; private boolean recordDebug; - // Query plan - private PlanNode queryPlan; - // Annotations private Collection<Annotation> annotations; @@ -159,22 +156,6 @@ } /** - * Set the query plan that was created - * @param queryPlan The plan - */ - public void setQueryPlan(PlanNode queryPlan) { - this.queryPlan = queryPlan; - } - - /** - * Get the query plan that was created - * @return The plan - */ - public PlanNode getQueryPlan() { - return this.queryPlan; - } - - /** * Add an annotation. This can only be used if {@link #recordAnnotations} * returns true. * @param annotation Annotation to add Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/relational/RelationalNode.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/query/processor/relational/RelationalNode.java 2010-04-07 19:55:09 UTC (rev 2035) +++ trunk/engine/src/main/java/com/metamatrix/query/processor/relational/RelationalNode.java 2010-04-08 02:41:01 UTC (rev 2036) @@ -500,7 +500,6 @@ PlanNode result = new PlanNode(getClassName()); result.addProperty(PROP_OUTPUT_COLS, AnalysisRecord.getOutputColumnProperties(this.elements)); if(this.context != null && this.context.getCollectNodeStatistics()) { - this.nodeStatistics.setStatisticsList(); result.addProperty(PROP_NODE_STATS_LIST, this.nodeStatistics.getStatisticsList()); } List<String> costEstimates = this.getCostEstimates(); Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/relational/RelationalNodeStatistics.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/query/processor/relational/RelationalNodeStatistics.java 2010-04-07 19:55:09 UTC (rev 2035) +++ trunk/engine/src/main/java/com/metamatrix/query/processor/relational/RelationalNodeStatistics.java 2010-04-08 02:41:01 UTC (rev 2036) @@ -37,7 +37,6 @@ static final int BATCHCOMPLETE_STOP = 0; static final int BLOCKEDEXCEPTION_STOP = 1; - private List<String> statisticsList = new ArrayList<String>(); private boolean setNodeStartTime; // The total amount of rows output by this node @@ -115,18 +114,15 @@ } } - public void setStatisticsList() { - this.statisticsList.clear(); - this.statisticsList.add("Node Output Rows: " + this.nodeOutputRows); //$NON-NLS-1$ - this.statisticsList.add("Node Process Time: " + this.nodeProcessingTime); //$NON-NLS-1$ - this.statisticsList.add("Node Cumulative Process Time: " + this.nodeCumulativeProcessingTime); //$NON-NLS-1$ - this.statisticsList.add("Node Cumulative Next Batch Process Time: " + this.nodeCumulativeNextBatchProcessingTime); //$NON-NLS-1$ - this.statisticsList.add("Node Next Batch Calls: " + this.nodeNextBatchCalls); //$NON-NLS-1$ - this.statisticsList.add("Node Blocks: " + this.nodeBlocks); //$NON-NLS-1$ - } - public List<String> getStatisticsList() { - return this.statisticsList; + ArrayList<String> statisticsList = new ArrayList<String>(6); + statisticsList.add("Node Output Rows: " + this.nodeOutputRows); //$NON-NLS-1$ + statisticsList.add("Node Process Time: " + this.nodeProcessingTime); //$NON-NLS-1$ + statisticsList.add("Node Cumulative Process Time: " + this.nodeCumulativeProcessingTime); //$NON-NLS-1$ + statisticsList.add("Node Cumulative Next Batch Process Time: " + this.nodeCumulativeNextBatchProcessingTime); //$NON-NLS-1$ + statisticsList.add("Node Next Batch Calls: " + this.nodeNextBatchCalls); //$NON-NLS-1$ + statisticsList.add("Node Blocks: " + this.nodeBlocks); //$NON-NLS-1$ + return statisticsList; } /** Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2010-04-07 19:55:09 UTC (rev 2035) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2010-04-08 02:41:01 UTC (rev 2036) @@ -326,7 +326,6 @@ AtomicRequestMessage aqr = new AtomicRequestMessage(request, workItem.getDqpWorkContext(), nodeID); aqr.setCommand(command); aqr.setModelName(modelName); - aqr.setUseResultSetCache(request.useResultSetCache()); aqr.setPartialResults(request.supportsPartialResults()); if (nodeID >= 0) { aqr.setTransactionContext(workItem.getTransactionContext()); Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2010-04-07 19:55:09 UTC (rev 2035) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2010-04-08 02:41:01 UTC (rev 2036) @@ -377,9 +377,6 @@ if (this.transactionContext != null && this.transactionContext.getTransactionType() != Scope.NONE) { this.transactionState = TransactionState.ACTIVE; } - if (analysisRecord.recordQueryPlan()) { - analysisRecord.setQueryPlan(processor.getProcessorPlan().getDescriptionProperties()); - } if (requestMsg.isNoExec()) { doneProducingBatches = true; resultsBuffer.close(); @@ -440,7 +437,7 @@ } int finalRowCount = this.resultsBuffer.isFinal()?this.resultsBuffer.getRowCount():(batch.getTerminationFlag()?batch.getEndRow():-1); - response = createResultsMessage(requestMsg, batch.getAllTuples(), this.originalCommand.getProjectedSymbols(), analysisRecord); + response = createResultsMessage(batch.getAllTuples(), this.originalCommand.getProjectedSymbols()); response.setFirstRow(batch.getBeginRow()); response.setLastRow(batch.getEndRow()); response.setUpdateResult(this.returnsUpdateCount); @@ -479,7 +476,7 @@ return result; } - public static ResultsMessage createResultsMessage(RequestMessage message, List[] batch, List columnSymbols, AnalysisRecord analysisRecord) { + public ResultsMessage createResultsMessage(List[] batch, List columnSymbols) { String[] columnNames = new String[columnSymbols.size()]; String[] dataTypes = new String[columnSymbols.size()]; @@ -488,16 +485,15 @@ columnNames[i] = SingleElementSymbol.getShortName(symbol.getOutputName()); dataTypes[i] = DataTypeManager.getDataTypeName(symbol.getType()); } - - ResultsMessage result = new ResultsMessage(message, batch, columnNames, dataTypes); - setAnalysisRecords(message, result, analysisRecord); + ResultsMessage result = new ResultsMessage(requestMsg, batch, columnNames, dataTypes); + setAnalysisRecords(result); return result; } - private static void setAnalysisRecords(RequestMessage requestMsg, ResultsMessage response, AnalysisRecord analysisRecord) { + private void setAnalysisRecords(ResultsMessage response) { if(analysisRecord != null) { if (requestMsg.getShowPlan() != ShowPlan.OFF) { - response.setPlanDescription(analysisRecord.getQueryPlan()); + response.setPlanDescription(processor.getProcessorPlan().getDescriptionProperties()); response.setAnnotations(analysisRecord.getAnnotations()); } if (requestMsg.getShowPlan() == ShowPlan.DEBUG) { @@ -516,7 +512,7 @@ LogManager.logDetail(LogConstants.CTX_DQP, processingException, "Sending error to client", requestID); //$NON-NLS-1$ ResultsMessage response = new ResultsMessage(requestMsg); response.setException(processingException); - setAnalysisRecords(this.requestMsg, response, analysisRecord); + setAnalysisRecords(response); resultsReceiver.receiveResults(response); } Modified: trunk/engine/src/test/java/com/metamatrix/query/analysis/TestAnalysisRecord.java =================================================================== --- trunk/engine/src/test/java/com/metamatrix/query/analysis/TestAnalysisRecord.java 2010-04-07 19:55:09 UTC (rev 2035) +++ trunk/engine/src/test/java/com/metamatrix/query/analysis/TestAnalysisRecord.java 2010-04-08 02:41:01 UTC (rev 2036) @@ -27,7 +27,6 @@ import junit.framework.TestCase; import org.teiid.client.plan.Annotation; -import org.teiid.client.plan.PlanNode; import org.teiid.client.plan.Annotation.Priority; import com.metamatrix.core.util.StringUtil; @@ -44,16 +43,6 @@ super(name); } - public void testQueryPlan() { - AnalysisRecord rec = new AnalysisRecord(true, false); - assertTrue(rec.recordQueryPlan()); - - PlanNode plan = new PlanNode("test"); //$NON-NLS-1$ - plan.addProperty("node", "value"); //$NON-NLS-1$ //$NON-NLS-2$ - rec.setQueryPlan(plan); - assertEquals(rec.getQueryPlan(), plan); - } - public void testAnnotations() { AnalysisRecord rec = new AnalysisRecord(true, false); assertTrue(rec.recordAnnotations()); Deleted: trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequestWorkItem.java =================================================================== --- trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequestWorkItem.java 2010-04-07 19:55:09 UTC (rev 2035) +++ trunk/engine/src/test/java/org/teiid/dqp/internal/process/TestRequestWorkItem.java 2010-04-08 02:41:01 UTC (rev 2036) @@ -1,45 +0,0 @@ -/* - * 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 org.teiid.dqp.internal.process; - -import java.util.Arrays; -import java.util.List; - -import org.teiid.client.ResultsMessage; -import org.teiid.client.TestRequestMessage; -import org.teiid.dqp.internal.process.RequestWorkItem; - -import com.metamatrix.query.sql.symbol.ElementSymbol; - -import junit.framework.TestCase; - -public class TestRequestWorkItem extends TestCase { - - public void testResultsMetadata() { - ElementSymbol e1 = new ElementSymbol("g1.E1"); //name in metadata - e1.setOutputName("G1.e1"); //name in query - ResultsMessage message = RequestWorkItem.createResultsMessage(TestRequestMessage.example(), new List[] {}, Arrays.asList(e1), null); - assertEquals(Arrays.asList("e1"), Arrays.asList(message.getColumnNames())); - } - -}