teiid SVN: r3653 - in trunk/engine/src/main: java/org/teiid/query/optimizer/relational/rules and 2 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-11-15 13:20:16 -0500 (Tue, 15 Nov 2011)
New Revision: 3653
Modified:
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/NodeConstants.java
trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleChooseDependent.java
trunk/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java
trunk/engine/src/main/resources/org/teiid/query/i18n.properties
Log:
TEIID-1828 adding warning and more plan information related to dependent join backoff
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/NodeConstants.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/NodeConstants.java 2011-11-15 18:10:51 UTC (rev 3652)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/NodeConstants.java 2011-11-15 18:20:16 UTC (rev 3653)
@@ -142,7 +142,8 @@
EST_JOIN_COST, // Float value that represents the estimated cost of a merge join (the join strategy for this could be Nested Loop or Merge)
EST_CARDINALITY, // Float represents the estimated cardinality (amount of rows) produced by this node
EST_COL_STATS,
- EST_SELECTIVITY, // Float that represents the selectivity of a criteria node
+ EST_SELECTIVITY, // Float that represents the selectivity of a criteria node
+ MAX_NDV, // The max NDV before the dependent join will be aborted
// Tuple limit and offset
MAX_TUPLE_LIMIT, // Expression that evaluates to the max number of tuples generated
Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleChooseDependent.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleChooseDependent.java 2011-11-15 18:10:51 UTC (rev 3652)
+++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleChooseDependent.java 2011-11-15 18:20:16 UTC (rev 3653)
@@ -326,11 +326,13 @@
Expression indepExpr = (Expression) independentExpressions.get(i);
DependentSetCriteria crit = new DependentSetCriteria(SymbolMap.getExpression(depExpr), id);
float ndv = NewCalculateCostUtil.UNKNOWN_VALUE;
+ Float maxNdv = null;
if (dca != null && dca.expectedNdv[i] != null) {
if (dca.expectedNdv[i] > 4*dca.maxNdv[i]) {
continue; //not necessary to use
}
ndv = dca.expectedNdv[i];
+ maxNdv = dca.maxNdv[i];
crit.setMaxNdv(dca.maxNdv[i]);
} else {
Collection<ElementSymbol> elems = ElementCollectorVisitor.getElements(indepExpr, true);
@@ -345,6 +347,9 @@
PlanNode selectNode = RelationalPlanner.createSelectNode(crit, false);
selectNode.setProperty(NodeConstants.Info.IS_DEPENDENT_SET, Boolean.TRUE);
+ if (maxNdv != null) {
+ selectNode.setProperty(NodeConstants.Info.MAX_NDV, maxNdv);
+ }
result.add(selectNode);
}
Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java 2011-11-15 18:10:51 UTC (rev 3652)
+++ trunk/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java 2011-11-15 18:20:16 UTC (rev 3653)
@@ -38,6 +38,9 @@
import org.teiid.common.buffer.BlockedException;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
+import org.teiid.logging.LogConstants;
+import org.teiid.logging.LogManager;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.optimizer.relational.rules.NewCalculateCostUtil;
import org.teiid.query.processor.relational.SortUtility.Mode;
import org.teiid.query.rewriter.QueryRewriter;
@@ -116,7 +119,8 @@
}
last = next;
}
- if (distinctCount > setState.maxNdv) {
+ if (!setState.overMax && distinctCount > setState.maxNdv) {
+ LogManager.logWarning(LogConstants.CTX_DQP, QueryPlugin.Util.getString("DependentCriteriaProcessor.dep_join_backoff", valueSource, setState.valueExpression, setState.maxNdv)); //$NON-NLS-1$
setState.overMax = true;
}
}
Modified: trunk/engine/src/main/resources/org/teiid/query/i18n.properties
===================================================================
--- trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2011-11-15 18:10:51 UTC (rev 3652)
+++ trunk/engine/src/main/resources/org/teiid/query/i18n.properties 2011-11-15 18:20:16 UTC (rev 3653)
@@ -944,4 +944,6 @@
support_required=Without required support property {0}, pushdown will not be enabled for {1} on translator {2}.
RuleAssignOutputElements.couldnt_push_expression=Expression(s) {0} cannot be pushed to source.
-RuleAssignOutputElements.cannot_introduce_expressions=Cannot introduce new expressions {1} in duplicate removal.
\ No newline at end of file
+RuleAssignOutputElements.cannot_introduce_expressions=Cannot introduce new expressions {1} in duplicate removal.
+
+DependentCriteriaProcessor.dep_join_backoff=Not performing dependent join using source {0}, since the number of distinct rows for expression {1} exceeds {2}. You should ensure that your source statistics, including column distinct value counts, accurately reflect the source or use a MAKE_DEP hint to force the join.
\ No newline at end of file
12 years, 5 months
teiid SVN: r3652 - in trunk: client/src/main/java/org/teiid/jdbc and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-11-15 13:10:51 -0500 (Tue, 15 Nov 2011)
New Revision: 3652
Added:
trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java
Modified:
trunk/api/src/main/java/org/teiid/translator/ExecutionContext.java
trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java
Log:
TEIID-1829 better handling of source warnings
Modified: trunk/api/src/main/java/org/teiid/translator/ExecutionContext.java
===================================================================
--- trunk/api/src/main/java/org/teiid/translator/ExecutionContext.java 2011-11-15 18:08:40 UTC (rev 3651)
+++ trunk/api/src/main/java/org/teiid/translator/ExecutionContext.java 2011-11-15 18:10:51 UTC (rev 3652)
@@ -28,6 +28,7 @@
import javax.security.auth.Subject;
import org.teiid.adminapi.Session;
+import org.teiid.jdbc.TeiidSQLWarning;
@@ -143,9 +144,8 @@
int getBatchSize();
/**
- * Add an exception as a warning to this Execution. If the exception is not an instance of a SQLWarning
- * it will be wrapped by a SQLWarning for the client. The warnings can be consumed through the
- * {@link Statement#getWarnings()} method.
+ * Add an exception as a warning to this Execution. The exception will be wrapped by a {@link TeiidSQLWarning} for the client.
+ * The warnings can be consumed through the {@link Statement#getWarnings()} method.
* @param ex
*/
void addWarning(Exception ex);
Added: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java (rev 0)
+++ trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java 2011-11-15 18:10:51 UTC (rev 3652)
@@ -0,0 +1,71 @@
+/*
+ * 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.jdbc;
+
+import java.sql.SQLWarning;
+
+
+/**
+ * Teiid specific SQLWarning
+ */
+
+public class TeiidSQLWarning extends SQLWarning {
+
+ private String modelName = "UNKNOWN"; // variable stores the name of the model for the atomic query //$NON-NLS-1$
+ private String sourceName = "UNKNOWN"; // variable stores name of the connector binding //$NON-NLS-1$
+
+ public TeiidSQLWarning() {
+ super();
+ }
+
+ public TeiidSQLWarning(String reason) {
+ super(reason);
+ }
+
+ public TeiidSQLWarning(String reason, String state) {
+ super(reason, state);
+ }
+
+ public TeiidSQLWarning(String reason, String sqlState, Throwable ex, String sourceName, String modelName) {
+ super(reason, sqlState, ex);
+ this.sourceName = sourceName;
+ this.modelName = modelName;
+ }
+
+ /**
+ *
+ * @return the source name or null if the warning is not associated with a source
+ */
+ public String getSourceName() {
+ return sourceName;
+ }
+
+ /**
+ *
+ * @return the model name or null if the warning is not associated with a model
+ */
+ public String getModelName() {
+ return modelName;
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLWarning.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java 2011-11-15 18:08:40 UTC (rev 3651)
+++ trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java 2011-11-15 18:10:51 UTC (rev 3652)
@@ -26,6 +26,7 @@
import java.util.List;
import org.teiid.client.SourceWarning;
+import org.teiid.core.TeiidException;
@@ -44,6 +45,8 @@
* @param ex Throwable object which needs to be wrapped.
*/
static SQLWarning createWarning(Throwable ex) {
+ String sourceName = null;
+ String modelName = null;
if(ex instanceof SourceWarning) {
SourceWarning exception = (SourceWarning)ex;
if (exception.isPartialResultsError()) {
@@ -51,8 +54,15 @@
warning.addConnectorFailure(exception.getConnectorBindingName(), TeiidSQLException.create(exception));
return warning;
}
+ ex = exception.getCause();
+ sourceName = exception.getConnectorBindingName();
+ modelName = exception.getModelName();
}
- return new SQLWarning(ex);
+ String code = null;
+ if (ex instanceof TeiidException) {
+ code = ((TeiidException)ex).getCode();
+ }
+ return new TeiidSQLWarning(ex.getMessage(), code, ex, sourceName, modelName);
}
/**
12 years, 5 months
teiid SVN: r3651 - trunk/client/src/main/java/org/teiid/jdbc.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-11-15 13:08:40 -0500 (Tue, 15 Nov 2011)
New Revision: 3651
Modified:
trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java
Log:
TEIID-1830 correcting the asynch submitNext logic
Modified: trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java 2011-11-15 17:40:20 UTC (rev 3650)
+++ trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java 2011-11-15 18:08:40 UTC (rev 3651)
@@ -238,7 +238,7 @@
if (hasNext != null) {
return StatementImpl.booleanFuture(next());
}
- ResultsFuture<ResultsMessage> pendingResult = submitRequestBatch(batchResults.getHighestRowNumber() + 1);
+ ResultsFuture<ResultsMessage> pendingResult = submitRequestBatch(batchResults.getCurrentRowNumber() + 1);
final ResultsFuture<Boolean> result = new ResultsFuture<Boolean>();
pendingResult.addCompletionListener(new ResultsFuture.CompletionListener<ResultsMessage>() {
@Override
12 years, 5 months
teiid SVN: r3650 - in trunk: engine/src/main/java/org/teiid/dqp/internal/process and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-11-15 12:40:20 -0500 (Tue, 15 Nov 2011)
New Revision: 3650
Modified:
trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java
trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
Log:
TEIID-1830 correcting the asynch submitNext logic
Modified: trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java
===================================================================
--- trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java 2011-11-15 03:38:35 UTC (rev 3649)
+++ trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java 2011-11-15 17:40:20 UTC (rev 3650)
@@ -251,8 +251,21 @@
}
requestNextBatch();
}
-
- return (this.currentRowNumber + next <= highestRowNumber);
+ boolean result = this.currentRowNumber + next <= highestRowNumber;
+ if (result && !wait) {
+ for (int i = 0; i < batches.size(); i++) {
+ Batch batch = batches.get(i);
+ if (this.currentRowNumber + next < batch.getBeginRow()) {
+ continue;
+ }
+ if (this.currentRowNumber + next> batch.getEndRow()) {
+ continue;
+ }
+ return Boolean.TRUE;
+ }
+ return null; //needs to be fetched
+ }
+ return result;
}
public int getFinalRowNumber() {
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 2011-11-15 03:38:35 UTC (rev 3649)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2011-11-15 17:40:20 UTC (rev 3650)
@@ -533,6 +533,7 @@
//restrict the buffer size for forward only results
if (add && !processor.hasFinalBuffer()
&& !batch.getTerminationFlag()
+ && transactionState != TransactionState.ACTIVE
&& this.getTupleBuffer().getManagedRowCount() >= OUTPUT_BUFFER_MAX_BATCHES * this.getTupleBuffer().getBatchSize()) {
if (!dqpCore.hasWaitingPlans(RequestWorkItem.this)) {
//requestMore will trigger more processing
Modified: trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2011-11-15 03:38:35 UTC (rev 3649)
+++ trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2011-11-15 17:40:20 UTC (rev 3650)
@@ -181,6 +181,18 @@
TestMMDatabaseMetaData.compareResultSet(s.getResultSet());
}
+ @Test public void testTransactionalMultibatch() throws Exception {
+ Statement s = conn.createStatement();
+ conn.setAutoCommit(false);
+ assertTrue(s.execute("select tables.name from tables, columns limit 1025"));
+ int count = 0;
+ while (s.getResultSet().next()) {
+ count++;
+ }
+ assertEquals(1025, count);
+ conn.setAutoCommit(true);
+ }
+
@Test public void testMultibatchSelect() throws Exception {
Statement s = conn.createStatement();
assertTrue(s.execute("select * from tables, columns"));
12 years, 5 months
teiid SVN: r3649 - in trunk: documentation/reference/src/main/docbook/en-US/content and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2011-11-14 22:38:35 -0500 (Mon, 14 Nov 2011)
New Revision: 3649
Modified:
trunk/build/kits/jboss-container/teiid-releasenotes.html
trunk/documentation/reference/src/main/docbook/en-US/content/translators.xml
Log:
TEIID-1810: Adding Hive translator document
Modified: trunk/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- trunk/build/kits/jboss-container/teiid-releasenotes.html 2011-11-15 01:42:44 UTC (rev 3648)
+++ trunk/build/kits/jboss-container/teiid-releasenotes.html 2011-11-15 03:38:35 UTC (rev 3649)
@@ -38,7 +38,8 @@
<LI><B>View removal hint</B> - the NO_UNNEST hint now also applies to from clause views and subqueries. It will instruct the planner to not perform view flattening.
<LI><B>Non-blocking statement execution</B> - Teiid JDBC extensions TeiidStatement and TeiidPreparedStatement can be used to submit queries against embedded connections with a callback to process results in a non-blocking manner.
<LI><B>NON_STRICT limit hint</B> - the NON_STRICT hint can be used with unordered limits to tell the optimizer to not inhibit push operations even if the results will not be consistent with the logical application of the limit.
- <LI><B>Source Hints</B> - user and transformation queries can specify a meta source hint, e.g. SELECT /*+ sh my-oracle:'leading' */ * FROM TBL. The hint information will be passed to the passed to the translator. The Oracle translator will by default treat the source hint as an Oracle hint.
+ <LI><B>Source Hints</B> - user and transformation queries can specify a meta source hint, e.g. SELECT /*+ sh my-oracle:'leading' */ * FROM TBL. The hint information will be passed to the passed to the translator. The Oracle translator will by default treat the source hint as an Oracle hint.
+ <LI><B>Hive Translator</B> - Hive translator has been added as technology preview.
</UL>
<h2><a name="Compatibility">Compatibility Issues</a></h2>
Modified: trunk/documentation/reference/src/main/docbook/en-US/content/translators.xml
===================================================================
--- trunk/documentation/reference/src/main/docbook/en-US/content/translators.xml 2011-11-15 01:42:44 UTC (rev 3648)
+++ trunk/documentation/reference/src/main/docbook/en-US/content/translators.xml 2011-11-15 03:38:35 UTC (rev 3649)
@@ -259,8 +259,18 @@
</listitem>
<listitem>
<para>
- <emphasis>hive</emphasis> - For use with Hive database based on Hadoop
+ <emphasis>hive</emphasis> - For use with Hive database based on Hadoop. Hive is a data warehousing
+ infrastructure based on the Hadoop. Hadoop provides massive scale out and fault tolerance capabilities
+ for data storage and processing (using the map-reduce programming paradigm) on commodity hardware.
</para>
+ <para>Hive has limited support for data types as it supports integer varients, boolean, float,
+ double and string. It is does not have native support for time based types, xml or LOBs. These limitations
+ are reflected in the translator capabilities. The view table can use these types, however the tranformation
+ would need to specify the necessary transformations. Note that in those situations, the evaluations will be
+ done in Teiid engine. Another limitation Hive has is, it only supports EQUI join, so using any other joins types
+ on its source tables will result in in-effiecient queries. Currently there is no tooling support for metadata
+ import from Hive in Designer. To write criteria based on partitioned columns, they can be modeled
+ on source table, but do not include in selection columns.</para>
</listitem>
<listitem>
<para>
12 years, 5 months
teiid SVN: r3648 - in branches/as7: build/assembly/jboss-as7 and 9 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2011-11-14 20:42:44 -0500 (Mon, 14 Nov 2011)
New Revision: 3648
Modified:
branches/as7/api/src/main/java/org/teiid/translator/ExecutionFactory.java
branches/as7/build/assembly/jboss-as7/dist.xml
branches/as7/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/api/main/module.xml
branches/as7/connectors/connector-salesforce/pom.xml
branches/as7/connectors/connector-salesforce/src/main/rar/META-INF/MANIFEST.MF
branches/as7/connectors/connector-ws/pom.xml
branches/as7/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSManagedConnectionFactory.java
branches/as7/connectors/connector-ws/src/main/rar/META-INF/MANIFEST.MF
branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java
branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java
branches/as7/jboss-integration/src/main/java/org/teiid/jboss/Transport.java
branches/as7/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java
branches/as7/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java
branches/as7/runtime/src/main/java/org/teiid/transport/SocketListener.java
Log:
TEIID-1720: Adding dependencies for SF. Also modified the Data source dependencies directly to binding based services
Modified: branches/as7/api/src/main/java/org/teiid/translator/ExecutionFactory.java
===================================================================
--- branches/as7/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2011-11-14 03:13:36 UTC (rev 3647)
+++ branches/as7/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2011-11-15 01:42:44 UTC (rev 3648)
@@ -210,14 +210,6 @@
this.sourceRequired = value;
}
- /**
- * Flag to determine between if a underlying connection is a data source or connection-factory
- * @return false
- */
- public boolean isJDBCSource() {
- return false;
- }
-
/**
* Obtain a reference to the default LanguageFactory that can be used to construct
* new language interface objects. This is typically needed when modifying the language
Modified: branches/as7/build/assembly/jboss-as7/dist.xml
===================================================================
--- branches/as7/build/assembly/jboss-as7/dist.xml 2011-11-14 03:13:36 UTC (rev 3647)
+++ branches/as7/build/assembly/jboss-as7/dist.xml 2011-11-15 01:42:44 UTC (rev 3648)
@@ -306,7 +306,7 @@
</includes>
<binaries>
- <includeDependencies>true</includeDependencies>
+ <includeDependencies>false</includeDependencies>
<unpack>false</unpack>
<dependencySets>
<dependencySet>
@@ -319,13 +319,35 @@
<outputDirectory>modules/org/jboss/teiid/translator/salesforce/main</outputDirectory>
<fileMode>0644</fileMode>
</binaries>
-
</moduleSet>
<moduleSet>
<includeSubModules>true</includeSubModules>
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
+ <include>org.jboss.teiid.connectors:salesforce-api</include>
+ </includes>
+
+ <binaries>
+ <includeDependencies>true</includeDependencies>
+ <unpack>false</unpack>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>false</unpack>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ </dependencySet>
+ </dependencySets>
+ <outputDirectory>modules/org/jboss/teiid/translator/salesforce/api/main</outputDirectory>
+ <fileMode>0644</fileMode>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includeSubModules>true</includeSubModules>
+ <useAllReactorProjects>true</useAllReactorProjects>
+
+ <includes>
<include>org.jboss.teiid.connectors:translator-ws</include>
</includes>
Modified: branches/as7/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/api/main/module.xml
===================================================================
--- branches/as7/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/api/main/module.xml 2011-11-14 03:13:36 UTC (rev 3647)
+++ branches/as7/build/kits/jboss-as7/modules/org/jboss/teiid/translator/salesforce/api/main/module.xml 2011-11-15 01:42:44 UTC (rev 3648)
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.0" name="org.jboss.teiid.transalator.salesforce.api">
+<module xmlns="urn:jboss:module:1.0" name="org.jboss.teiid.translator.salesforce.api">
<resources>
<resource-root path="salesforce-api-${project.version}.jar" />
<!-- Insert resources here -->
</resources>
<dependencies>
+ <module name="javax.xml.ws.api"/>
<module name="javax.api"/>
+ <module name="javax.jws.api"/>
</dependencies>
</module>
\ No newline at end of file
Modified: branches/as7/connectors/connector-salesforce/pom.xml
===================================================================
--- branches/as7/connectors/connector-salesforce/pom.xml 2011-11-14 03:13:36 UTC (rev 3647)
+++ branches/as7/connectors/connector-salesforce/pom.xml 2011-11-15 01:42:44 UTC (rev 3648)
@@ -42,25 +42,25 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.2.2</version>
+ <version>2.4.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>2.2.2</version>
+ <version>2.4.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>2.2.2</version>
+ <version>2.4.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>2.2.2</version>
+ <version>2.4.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/as7/connectors/connector-salesforce/src/main/rar/META-INF/MANIFEST.MF
===================================================================
--- branches/as7/connectors/connector-salesforce/src/main/rar/META-INF/MANIFEST.MF 2011-11-14 03:13:36 UTC (rev 3647)
+++ branches/as7/connectors/connector-salesforce/src/main/rar/META-INF/MANIFEST.MF 2011-11-15 01:42:44 UTC (rev 3648)
@@ -1 +1 @@
-Dependencies: org.jboss.teiid.common-core,org.jboss.teiid.api,javax.api
+Dependencies: javax.jws.api,org.jboss.ws.cxf.jbossws-cxf-client services,javax.wsdl4j.api,org.jboss.teiid.common-core,org.jboss.teiid.api,javax.api,org.jboss.teiid.translator.salesforce.api,org.jboss.teiid.translator.salesforce
\ No newline at end of file
Modified: branches/as7/connectors/connector-ws/pom.xml
===================================================================
--- branches/as7/connectors/connector-ws/pom.xml 2011-11-14 03:13:36 UTC (rev 3647)
+++ branches/as7/connectors/connector-ws/pom.xml 2011-11-15 01:42:44 UTC (rev 3648)
@@ -31,25 +31,25 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.2.2</version>
+ <version>2.4.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>2.2.2</version>
+ <version>2.4.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>2.2.2</version>
+ <version>2.4.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>2.2.2</version>
+ <version>2.4.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/as7/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSManagedConnectionFactory.java
===================================================================
--- branches/as7/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSManagedConnectionFactory.java 2011-11-14 03:13:36 UTC (rev 3647)
+++ branches/as7/connectors/connector-ws/src/main/java/org/teiid/resource/adapter/ws/WSManagedConnectionFactory.java 2011-11-15 01:42:44 UTC (rev 3648)
@@ -53,7 +53,7 @@
private Bus bus;
private QName portQName;
- private List<Interceptor> outInterceptors;
+ private List<? extends Interceptor> outInterceptors;
@Override
public BasicConnectionFactory createConnectionFactory() throws ResourceException {
@@ -135,7 +135,7 @@
return portQName;
}
- public List<Interceptor> getOutInterceptors() {
+ public List<? extends Interceptor> getOutInterceptors() {
return outInterceptors;
}
Modified: branches/as7/connectors/connector-ws/src/main/rar/META-INF/MANIFEST.MF
===================================================================
--- branches/as7/connectors/connector-ws/src/main/rar/META-INF/MANIFEST.MF 2011-11-14 03:13:36 UTC (rev 3647)
+++ branches/as7/connectors/connector-ws/src/main/rar/META-INF/MANIFEST.MF 2011-11-15 01:42:44 UTC (rev 3648)
@@ -1 +1 @@
-Dependencies: org.jboss.teiid.common-core,org.jboss.teiid.api,javax.api
+Dependencies: javax.jws.api,org.jboss.ws.cxf.jbossws-cxf-client services,javax.wsdl4j.api,org.jboss.teiid.common-core,org.jboss.teiid.api,javax.api
Modified: branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java
===================================================================
--- branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java 2011-11-14 03:13:36 UTC (rev 3647)
+++ branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java 2011-11-15 01:42:44 UTC (rev 3648)
@@ -224,11 +224,6 @@
return true;
}
- @Override
- public boolean isJDBCSource() {
- return true;
- }
-
@Override
public ResultSetExecution createResultSetExecution(QueryExpression command, ExecutionContext executionContext, RuntimeMetadata metadata, Connection conn)
throws TranslatorException {
Modified: branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java
===================================================================
--- branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2011-11-14 03:13:36 UTC (rev 3647)
+++ branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java 2011-11-15 01:42:44 UTC (rev 3648)
@@ -327,7 +327,7 @@
processorTarget.addDeploymentProcessor(Phase.STRUCTURE, Phase.STRUCTURE_WAR_DEPLOYMENT_INIT|0x0001,new VDBStructureDeployer());
processorTarget.addDeploymentProcessor(Phase.PARSE, Phase.PARSE_WEB_DEPLOYMENT|0x0001, new VDBParserDeployer());
processorTarget.addDeploymentProcessor(Phase.DEPENDENCIES, Phase.DEPENDENCIES_WAR_MODULE|0x0001, new VDBDependencyDeployer());
- processorTarget.addDeploymentProcessor(Phase.INSTALL, Phase.INSTALL_WAR_DEPLOYMENT|0x0001, new VDBDeployer(translatorRepo, asyncThreadPoolName, statusChecker));
+ processorTarget.addDeploymentProcessor(Phase.INSTALL, Phase.INSTALL_WAR_DEPLOYMENT|0x1000, new VDBDeployer(translatorRepo, asyncThreadPoolName, statusChecker));
// translator deployers
processorTarget.addDeploymentProcessor(Phase.STRUCTURE, Phase.STRUCTURE_JDBC_DRIVER|0x0001,new TranslatorStructureDeployer());
Modified: branches/as7/jboss-integration/src/main/java/org/teiid/jboss/Transport.java
===================================================================
--- branches/as7/jboss-integration/src/main/java/org/teiid/jboss/Transport.java 2011-11-14 03:13:36 UTC (rev 3647)
+++ branches/as7/jboss-integration/src/main/java/org/teiid/jboss/Transport.java 2011-11-15 01:42:44 UTC (rev 3648)
@@ -125,15 +125,19 @@
if (this.socketConfig != null) {
InetSocketAddress address = getSocketBindingInjector().getValue().getSocketAddress();
Protocol protocol = Protocol.valueOf(socketConfig.getProtocol());
+ boolean sslEnabled = false;
+ if (this.socketConfig.getSSLConfiguration() != null) {
+ sslEnabled = this.socketConfig.getSSLConfiguration().isSslEnabled();
+ }
if (protocol == Protocol.teiid) {
this.socketListener = new SocketListener(address, this.socketConfig, this.csr, getBufferServiceInjector().getValue().getBufferManager());
- LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("socket_enabled","Teiid JDBC = ",(this.socketConfig.getSSLConfiguration().isSslEnabled()?"mms://":"mm://")+address.getHostName()+":"+address.getPort())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("socket_enabled","Teiid JDBC = ",(sslEnabled?"mms://":"mm://")+address.getHostName()+":"+address.getPort())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
}
else if (protocol == Protocol.pg) {
getVdbRepository().odbcEnabled();
ODBCSocketListener odbc = new ODBCSocketListener(address, this.socketConfig, this.csr, getBufferServiceInjector().getValue().getBufferManager(), getMaxODBCLobSizeAllowed(), this.logon);
odbc.setAuthenticationType(this.sessionService.getAuthenticationType());
- LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("odbc_enabled","Teiid ODBC - SSL=", (this.socketConfig.getSSLConfiguration().isSslEnabled()?"ON":"OFF")+" Host = "+address.getHostName()+" Port = "+address.getPort())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
+ LogManager.logInfo(LogConstants.CTX_RUNTIME, IntegrationPlugin.Util.getString("odbc_enabled","Teiid ODBC - SSL=", (sslEnabled?"ON":"OFF")+" Host = "+address.getHostName()+" Port = "+address.getPort())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
}
else {
throw new StartException(IntegrationPlugin.Util.getString("wrong_protocol")); //$NON-NLS-1$
Modified: branches/as7/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java
===================================================================
--- branches/as7/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java 2011-11-14 03:13:36 UTC (rev 3647)
+++ branches/as7/jboss-integration/src/main/java/org/teiid/jboss/VDBDeployer.java 2011-11-15 01:42:44 UTC (rev 3648)
@@ -22,13 +22,12 @@
package org.teiid.jboss;
import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.IdentityHashMap;
import java.util.List;
import java.util.concurrent.Executor;
import javax.naming.InitialContext;
+import org.jboss.as.naming.deployment.ContextNames;
import org.jboss.as.server.deployment.Attachments;
import org.jboss.as.server.deployment.DeploymentPhaseContext;
import org.jboss.as.server.deployment.DeploymentUnit;
@@ -49,14 +48,12 @@
import org.teiid.deployers.VDBRepository;
import org.teiid.deployers.VDBStatusChecker;
import org.teiid.dqp.internal.datamgr.TranslatorRepository;
-import org.teiid.jboss.VDBService.TranslatorNotFoundException;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
import org.teiid.metadata.index.IndexMetadataFactory;
import org.teiid.query.ObjectReplicator;
import org.teiid.runtime.RuntimePlugin;
import org.teiid.services.BufferServiceImpl;
-import org.teiid.translator.ExecutionFactory;
class VDBDeployer implements DeploymentUnitProcessor {
@@ -139,7 +136,7 @@
// add dependencies to data-sources
dataSourceDependencies(deployment, new DependentServices() {
@Override
- public void serviceFound(String dsName, ServiceName svcName) {
+ public void dependentService(final String dsName, final ServiceName svcName) {
DataSourceListener dsl = new DataSourceListener(dsName, svcName, vdbStatusChecker);
ServiceBuilder<DataSourceListener> sb = context.getServiceTarget().addService(TeiidServiceNames.dsListenerServiceName(dsName), dsl);
sb.addDependency(svcName);
@@ -178,7 +175,7 @@
}
}
- private void dataSourceDependencies(VDBMetaData deployment, DependentServices svcListener) throws DeploymentUnitProcessingException {
+ private void dataSourceDependencies(VDBMetaData deployment, DependentServices svcListener) {
for (ModelMetaData model:deployment.getModelMetaDatas().values()) {
for (String sourceName:model.getSourceNames()) {
@@ -187,31 +184,17 @@
VDBTranslatorMetaData translator = deployment.getTranslator(translatorName);
translatorName = translator.getType();
}
-
- boolean jdbcSource = true;
- try {
- ExecutionFactory ef = VDBService.getExecutionFactory(translatorName, new TranslatorRepository(), this.translatorRepository, deployment, new IdentityHashMap<Translator, ExecutionFactory<Object, Object>>(), new HashSet<String>());
- jdbcSource = ef.isJDBCSource();
- } catch (TranslatorNotFoundException e) {
- if (e.getCause() != null) {
- throw new DeploymentUnitProcessingException(e.getCause());
- }
- throw new DeploymentUnitProcessingException(e.getMessage());
- }
// Need to make the data source service as dependency; otherwise dynamic vdbs will not work correctly.
String dsName = model.getSourceConnectionJndiName(sourceName);
- ServiceName svcName = ServiceName.JBOSS.append("data-source", getJndiName(dsName)); //$NON-NLS-1$
- if (!jdbcSource) {
- svcName = ServiceName.JBOSS.append("connector", "connection-factory", getJndiName(dsName)); //$NON-NLS-1$ //$NON-NLS-2$
- }
- svcListener.serviceFound(dsName, svcName);
+ final ContextNames.BindInfo bindInfo = ContextNames.bindInfoFor(getJndiName(dsName));
+ svcListener.dependentService(dsName, bindInfo.getBinderServiceName());
}
}
}
interface DependentServices {
- void serviceFound(String dsName, ServiceName svc);
+ void dependentService(String dsName, ServiceName svc);
}
static class DataSourceListener implements Service<DataSourceListener>{
@@ -283,19 +266,15 @@
VDBService vdbService = (VDBService)controller.getService();
vdbService.undeployInProgress();
- try {
- dataSourceDependencies(deployment, new DependentServices() {
- @Override
- public void serviceFound(String dsName, ServiceName svcName) {
- ServiceController<?> controller = deploymentUnit.getServiceRegistry().getService(TeiidServiceNames.dsListenerServiceName(dsName));
- if (controller != null) {
- controller.setMode(ServiceController.Mode.REMOVE);
- }
+ dataSourceDependencies(deployment, new DependentServices() {
+ @Override
+ public void dependentService(String dsName, ServiceName svcName) {
+ ServiceController<?> controller = deploymentUnit.getServiceRegistry().getService(TeiidServiceNames.dsListenerServiceName(dsName));
+ if (controller != null) {
+ controller.setMode(ServiceController.Mode.REMOVE);
}
- });
- } catch (DeploymentUnitProcessingException e) {
- LogManager.logDetail(LogConstants.CTX_RUNTIME, e, IntegrationPlugin.Util.getString("vdb-undeploy-failed", deployment.getName(), deployment.getVersion())); //$NON-NLS-1$
- }
+ }
+ });
controller.setMode(ServiceController.Mode.REMOVE);
}
}
Modified: branches/as7/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java
===================================================================
--- branches/as7/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java 2011-11-14 03:13:36 UTC (rev 3647)
+++ branches/as7/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java 2011-11-15 01:42:44 UTC (rev 3648)
@@ -224,10 +224,12 @@
public ChannelPipeline getPipeline() throws Exception {
ChannelPipeline pipeline = new DefaultChannelPipeline();
- SSLEngine engine = config.getServerSSLEngine();
- if (engine != null) {
- pipeline.addLast("ssl", new SslHandler(engine)); //$NON-NLS-1$
- }
+ if (this.config != null) {
+ SSLEngine engine = config.getServerSSLEngine();
+ if (engine != null) {
+ pipeline.addLast("ssl", new SslHandler(engine)); //$NON-NLS-1$
+ }
+ }
pipeline.addLast("decoder", new ObjectDecoder(1 << 20, classLoader, storageManager)); //$NON-NLS-1$
pipeline.addLast("chunker", new ChunkedWriteHandler()); //$NON-NLS-1$
pipeline.addLast("encoder", new ObjectEncoder()); //$NON-NLS-1$
Modified: branches/as7/runtime/src/main/java/org/teiid/transport/SocketListener.java
===================================================================
--- branches/as7/runtime/src/main/java/org/teiid/transport/SocketListener.java 2011-11-14 03:13:36 UTC (rev 3647)
+++ branches/as7/runtime/src/main/java/org/teiid/transport/SocketListener.java 2011-11-15 01:42:44 UTC (rev 3648)
@@ -66,7 +66,9 @@
*/
public SocketListener(InetSocketAddress address, int inputBufferSize,
int outputBufferSize, int maxWorkers, SSLConfiguration config, ClientServiceRegistryImpl csr, StorageManager storageManager) {
- this.isClientEncryptionEnabled = config.isClientEncryptionEnabled();
+ if (config != null) {
+ this.isClientEncryptionEnabled = config.isClientEncryptionEnabled();
+ }
this.csr = csr;
this.nettyPool = Executors.newCachedThreadPool(new NamedThreadFactory("NIO")); //$NON-NLS-1$
12 years, 5 months
teiid SVN: r3647 - in trunk: test-integration/common/src/test/java/org/teiid/transport and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-11-13 22:13:36 -0500 (Sun, 13 Nov 2011)
New Revision: 3647
Modified:
trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
Log:
TEIID-1812 fix for indexoutofbounds exception
Modified: trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2011-11-14 03:12:43 UTC (rev 3646)
+++ trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2011-11-14 03:13:36 UTC (rev 3647)
@@ -801,7 +801,9 @@
initBuffer(estimatedLength);
}
this.dataOut.writeByte((byte)newMessageType);
- this.dataOut.writerIndex(this.dataOut.writerIndex() + 4);
+ int nextByte = this.dataOut.writerIndex() + 4;
+ this.dataOut.ensureWritableBytes(nextByte);
+ this.dataOut.writerIndex(nextByte);
}
private void initBuffer(int estimatedLength) {
Modified: trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2011-11-14 03:12:43 UTC (rev 3646)
+++ trunk/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java 2011-11-14 03:13:36 UTC (rev 3647)
@@ -221,6 +221,20 @@
String clob = rs.getString(1);
assertEquals(3000, clob.length());
}
+
+ @Test public void testMultiRowBuffering() throws Exception {
+ Statement s = conn.createStatement();
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < 11; i++) {
+ sb.append("select '' union all ");
+ }
+ sb.append("select ''");
+ assertTrue(s.execute(sb.toString()));
+ ResultSet rs = s.getResultSet();
+ assertTrue(rs.next());
+ String str = rs.getString(1);
+ assertEquals(0, str.length());
+ }
@Test public void testTransactionCycle() throws Exception {
//TODO: drill in to ensure that the underlying statement has been set to autocommit false
12 years, 5 months
teiid SVN: r3646 - trunk/connectors/translator-hive.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2011-11-13 22:12:43 -0500 (Sun, 13 Nov 2011)
New Revision: 3646
Modified:
trunk/connectors/translator-hive/pom.xml
Log:
TEIID-1810 correcting the version
Modified: trunk/connectors/translator-hive/pom.xml
===================================================================
--- trunk/connectors/translator-hive/pom.xml 2011-11-13 19:14:29 UTC (rev 3645)
+++ trunk/connectors/translator-hive/pom.xml 2011-11-14 03:12:43 UTC (rev 3646)
@@ -3,7 +3,7 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>org.jboss.teiid</groupId>
- <version>teiid-7.6.0.CR1-SNAPSHOT</version>
+ <version>7.6.0.CR1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>translator-hive</artifactId>
12 years, 5 months
teiid SVN: r3645 - in trunk/connectors/translator-hive: .settings and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2011-11-13 14:14:29 -0500 (Sun, 13 Nov 2011)
New Revision: 3645
Modified:
trunk/connectors/translator-hive/
trunk/connectors/translator-hive/.settings/
Log:
TEIID-1810: adding ignores
Property changes on: trunk/connectors/translator-hive
___________________________________________________________________
Added: svn:ignore
+ .classpath
.project
target
Property changes on: trunk/connectors/translator-hive/.settings
___________________________________________________________________
Added: svn:ignore
+ org.eclipse.jdt.core.prefs
org.maven.ide.eclipse.prefs
12 years, 5 months
teiid SVN: r3644 - trunk/connectors/translator-hive/src/main/resources/META-INF.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2011-11-13 14:09:31 -0500 (Sun, 13 Nov 2011)
New Revision: 3644
Added:
trunk/connectors/translator-hive/src/main/resources/META-INF/jboss-beans.xml
Log:
TEIID-1810: Adding Hive translator to Teiid
Added: trunk/connectors/translator-hive/src/main/resources/META-INF/jboss-beans.xml
===================================================================
--- trunk/connectors/translator-hive/src/main/resources/META-INF/jboss-beans.xml (rev 0)
+++ trunk/connectors/translator-hive/src/main/resources/META-INF/jboss-beans.xml 2011-11-13 19:09:31 UTC (rev 3644)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="translator-hive-template" class="org.teiid.templates.TranslatorDeploymentTemplate">
+ <property name="info"><inject bean="translator-hive"/></property>
+ <property name="managedObjectFactory"><inject bean="ManagedObjectFactory"/></property>
+ </bean>
+
+ <bean name="translator-hive" class="org.teiid.templates.TranslatorTemplateInfo">
+ <constructor factoryMethod="createTemplateInfo">
+ <factory bean="TranslatorDeploymentTemplateInfoFactory"/>
+ <parameter class="java.lang.Class">org.teiid.templates.TranslatorTemplateInfo</parameter>
+ <parameter class="java.lang.Class">org.teiid.translator.hive.HiveExecutionFactory</parameter>
+ <parameter class="java.lang.String">translator-hive</parameter>
+ <parameter class="java.lang.String">Hive</parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Property changes on: trunk/connectors/translator-hive/src/main/resources/META-INF/jboss-beans.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 5 months