November 2011 - teiid-commits - Jboss List Archives

teiid SVN: r3643 - in trunk: build/kits/jboss-container/teiid-examples/jca and 18 other directories.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2011-11-13 14:08:32 -0500 (Sun, 13 Nov 2011) New Revision: 3643 Added: trunk/build/kits/jboss-container/teiid-examples/jca/hive-ds.xml trunk/connectors/translator-hive/ trunk/connectors/translator-hive/.settings/ trunk/connectors/translator-hive/pom.xml trunk/connectors/translator-hive/src/ trunk/connectors/translator-hive/src/main/ trunk/connectors/translator-hive/src/main/java/ trunk/connectors/translator-hive/src/main/java/org/ trunk/connectors/translator-hive/src/main/java/org/teiid/ trunk/connectors/translator-hive/src/main/java/org/teiid/translator/ trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/ trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveMetadataProcessor.java trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveSQLConversionVisitor.java trunk/connectors/translator-hive/src/main/resources/ trunk/connectors/translator-hive/src/main/resources/META-INF/ trunk/connectors/translator-hive/src/test/ trunk/connectors/translator-hive/src/test/java/ trunk/connectors/translator-hive/src/test/java/org/ trunk/connectors/translator-hive/src/test/java/org/teiid/ trunk/connectors/translator-hive/src/test/java/org/teiid/translator/ trunk/connectors/translator-hive/src/test/java/org/teiid/translator/hive/ trunk/connectors/translator-hive/src/test/java/org/teiid/translator/hive/TestHiveExecutionFactory.java Modified: trunk/build/assembly/jboss-container/dist.xml trunk/connectors/pom.xml trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ConvertModifier.java trunk/documentation/reference/src/main/docbook/en-US/content/translators.xml Log: TEIID-1810: Adding Hive translator to Teiid Modified: trunk/build/assembly/jboss-container/dist.xml =================================================================== --- trunk/build/assembly/jboss-container/dist.xml 2011-11-13 18:31:49 UTC (rev 3642) +++ trunk/build/assembly/jboss-container/dist.xml 2011-11-13 19:08:32 UTC (rev 3643) @@ -185,6 +185,7 @@ <include>org.jboss.teiid.connectors:translator-salesforce</include> <include>org.jboss.teiid.connectors:translator-ws</include> <include>org.jboss.teiid.connectors:translator-olap</include> + <include>org.jboss.teiid.connectors:translator-hive</include> </includes> <binaries> Added: trunk/build/kits/jboss-container/teiid-examples/jca/hive-ds.xml =================================================================== --- trunk/build/kits/jboss-container/teiid-examples/jca/hive-ds.xml (rev 0) +++ trunk/build/kits/jboss-container/teiid-examples/jca/hive-ds.xml 2011-11-13 19:08:32 UTC (rev 3643) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> +  + <local-tx-datasource> + <jndi-name>HiveDS</jndi-name> + <connection-url>jdbc:hive://localhost:10000/default</connection-url> + <driver-class>org.apache.hadoop.hive.jdbc.HiveDriver</driver-class> + </local-tx-datasource> + +</datasources> Property changes on: trunk/build/kits/jboss-container/teiid-examples/jca/hive-ds.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2011-11-13 18:31:49 UTC (rev 3642) +++ trunk/connectors/pom.xml 2011-11-13 19:08:32 UTC (rev 3643) @@ -87,5 +87,6 @@ <module>sandbox</module> <module>translator-ws</module> <module>translator-olap</module> + <module>translator-hive</module> </modules> </project> Added: trunk/connectors/translator-hive/pom.xml =================================================================== --- trunk/connectors/translator-hive/pom.xml (rev 0) +++ trunk/connectors/translator-hive/pom.xml 2011-11-13 19:08:32 UTC (rev 3643) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>connectors</artifactId> + <groupId>org.jboss.teiid</groupId> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>translator-hive</artifactId> + <groupId>org.jboss.teiid.connectors</groupId> + <name>Hive Translator</name> + <description>This translator provides access HDFS system using Hive.</description> + + <dependencies> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid</groupId> + <artifactId>teiid-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>translator-jdbc</artifactId> + <version>${version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.teiid.connectors</groupId> + <artifactId>translator-jdbc</artifactId> + <version>${version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <outputDirectory>target/classes</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.xml</exclude> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + </build> +</project> Property changes on: trunk/connectors/translator-hive/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java =================================================================== --- trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java (rev 0) +++ trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java 2011-11-13 19:08:32 UTC (rev 3643) @@ -0,0 +1,350 @@ +/* + * 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.translator.hive; + +import static org.teiid.translator.TypeFacility.RUNTIME_NAMES.BIG_INTEGER; +import static org.teiid.translator.TypeFacility.RUNTIME_NAMES.DATE; +import static org.teiid.translator.TypeFacility.RUNTIME_NAMES.DOUBLE; +import static org.teiid.translator.TypeFacility.RUNTIME_NAMES.INTEGER; +import static org.teiid.translator.TypeFacility.RUNTIME_NAMES.OBJECT; +import static org.teiid.translator.TypeFacility.RUNTIME_NAMES.STRING; + +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Time; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.teiid.core.util.PropertiesUtils; +import org.teiid.language.Command; +import org.teiid.language.Function; +import org.teiid.language.Limit; +import org.teiid.metadata.MetadataFactory; +import org.teiid.translator.ExecutionContext; +import org.teiid.translator.SourceSystemFunctions; +import org.teiid.translator.Translator; +import org.teiid.translator.TranslatorException; +import org.teiid.translator.TypeFacility; +import org.teiid.translator.jdbc.AliasModifier; +import org.teiid.translator.jdbc.ConvertModifier; +import org.teiid.translator.jdbc.FunctionModifier; +import org.teiid.translator.jdbc.JDBCExecutionFactory; +import org.teiid.translator.jdbc.ModFunctionModifier; +import org.teiid.translator.jdbc.SQLConversionVisitor; + +@Translator(name="hive", description="A translator for hive based database on HDFS") +public class HiveExecutionFactory extends JDBCExecutionFactory { + + public static String HIVE = "hive"; //$NON-NLS-1$ + protected ConvertModifier convert = new ConvertModifier(); + + + public HiveExecutionFactory() { + setSupportedJoinCriteria(SupportedJoinCriteria.EQUI); + } + + @Override + public void start() throws TranslatorException { + super.start(); + convert.addTypeMapping("tinyint", FunctionModifier.BYTE); //$NON-NLS-1$ + convert.addTypeMapping("smallint", FunctionModifier.SHORT); //$NON-NLS-1$ + convert.addTypeMapping("int", FunctionModifier.INTEGER); //$NON-NLS-1$ + convert.addTypeMapping("bigint", FunctionModifier.BIGINTEGER, FunctionModifier.LONG); //$NON-NLS-1$ + convert.addTypeMapping("boolean", FunctionModifier.BOOLEAN); //$NON-NLS-1$ + convert.addTypeMapping("double", FunctionModifier.DOUBLE, FunctionModifier.BIGDECIMAL); //$NON-NLS-1$ + convert.addTypeMapping("float", FunctionModifier.FLOAT); //$NON-NLS-1$ + convert.addTypeMapping("string", FunctionModifier.STRING); //$NON-NLS-1$ + + // unsupported types + //FunctionModifier.DATE, + //FunctionModifier.TIMESTAMP + //FunctionModifier.TIME, + //FunctionModifier.CHAR, + //FunctionModifier.BLOB, + //FunctionModifier.CLOB, + //FunctionModifier.XML + + registerFunctionModifier(SourceSystemFunctions.CONVERT, convert); + + registerFunctionModifier(SourceSystemFunctions.BITAND, new AliasModifier("&")); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.BITNOT, new AliasModifier("~")); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.BITOR, new AliasModifier("&")); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.BITXOR, new AliasModifier("|")); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.CURDATE, new AliasModifier("unix_timestamp")); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.IFNULL, new AliasModifier("coalesce")); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.MOD, new ModFunctionModifier("%", getLanguageFactory(), Arrays.asList(TypeFacility.RUNTIME_TYPES.BIG_INTEGER, TypeFacility.RUNTIME_TYPES.BIG_DECIMAL))); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.ARRAY_GET, new FunctionModifier() { + + @Override + public List<?> translate(Function function) { + return Arrays.asList(function.getParameters().get(0), '[', function.getParameters().get(1), ']'); + } + }); + + + addPushDownFunction(HIVE, "lower", STRING, STRING); //$NON-NLS-1$ + addPushDownFunction(HIVE, "upper", STRING, STRING); //$NON-NLS-1$ + addPushDownFunction(HIVE, "positive", INTEGER, DOUBLE); //$NON-NLS-1$ + addPushDownFunction(HIVE, "positive", DOUBLE, DOUBLE); //$NON-NLS-1$ + addPushDownFunction(HIVE, "negitive", INTEGER, DOUBLE); //$NON-NLS-1$ + addPushDownFunction(HIVE, "negitive", DOUBLE, DOUBLE); //$NON-NLS-1$ + addPushDownFunction(HIVE, "ln", DOUBLE, DOUBLE); //$NON-NLS-1$ + addPushDownFunction(HIVE, "reverse", STRING, STRING); //$NON-NLS-1$ + addPushDownFunction(HIVE, "space", INTEGER, STRING); //$NON-NLS-1$ + addPushDownFunction(HIVE, "split", OBJECT, STRING, STRING); //$NON-NLS-1$ + addPushDownFunction(HIVE, "hex", STRING, STRING); //$NON-NLS-1$ + addPushDownFunction(HIVE, "unhex", STRING, STRING); //$NON-NLS-1$ + addPushDownFunction(HIVE, "bin", STRING, BIG_INTEGER); //$NON-NLS-1$ + addPushDownFunction(HIVE, "day", INTEGER, DATE); //$NON-NLS-1$ + addPushDownFunction(HIVE, "datediff", INTEGER, DATE, DATE); //$NON-NLS-1$ + addPushDownFunction(HIVE, "date_add", INTEGER, DATE, INTEGER); //$NON-NLS-1$ + addPushDownFunction(HIVE, "date_sub", INTEGER, DATE, INTEGER); //$NON-NLS-1$ + } + + @Override + public SQLConversionVisitor getSQLConversionVisitor() { + return new HiveSQLConversionVisitor(this); + } + + @Override + public boolean useAnsiJoin() { + return true; + } + + @Override + public boolean supportsBetweenCriteria() { + return false; + } + + @Override + public boolean supportsCaseExpressions() { + //https://issues.apache.org/jira/browse/HIVE-164 + return true; + } + + @Override + public boolean supportsCorrelatedSubqueries() { + //https://issues.apache.org/jira/browse/HIVE-784 + return false; + } + + @Override + public boolean supportsExistsCriteria() { + return false; + } + + @Override + public boolean supportsInCriteriaSubquery() { + // the website documents a way to semi-join to re-write this but did not handle NOT IN case. + return false; + } + + @Override + public boolean supportsLikeCriteriaEscapeCharacter() { + return false; + } + + @Override + public boolean supportsQuantifiedCompareCriteriaAll() { + return false; + } + + @Override + public boolean supportsQuantifiedCompareCriteriaSome() { + return false; + } + + @Override + public boolean supportsBulkUpdate() { + return false; + } + + @Override + public boolean supportsBatchedUpdates() { + return false; + } + + @Override + public List<?> translateCommand(Command command, ExecutionContext context) { + return null; + } + + @Override + public List<?> translateLimit(Limit limit, ExecutionContext context) { + return null; + } + + @Override + public boolean addSourceComment() { + return false; + } + + @Override + public boolean useAsInGroupAlias(){ + return false; + } + + public boolean hasTimeType() { + return false; + } + + public String getLikeRegexString() { + return "REGEXP"; //$NON-NLS-1$ + } + + @Override + public boolean supportsScalarSubqueries() { + // Supported only in FROM clause + return false; + } + + @Override + public boolean supportsInlineViews() { + // must be aliased. + return true; + } + + @Override + public boolean supportsUnions() { + return true; + // only union all in subquery + } + + @Override + public boolean supportsInsertWithQueryExpression() { + return false; // insert seems to be only with overwrite always + } + + @Override + public boolean supportsIntersect() { + return false; + } + + @Override + public boolean supportsExcept() { + return false; + } + + @Override + public boolean supportsAggregatesEnhancedNumeric() { + return true; + } + + @Override + public boolean supportsCommonTableExpressions() { + return false; + } + + @Override + public String translateLiteralBoolean(Boolean booleanValue) { + if(booleanValue.booleanValue()) { + return "true"; //$NON-NLS-1$ + } + return "false"; //$NON-NLS-1$ + } + + @Override + public String translateLiteralDate(java.sql.Date dateValue) { + return formatDateValue(dateValue); + } + + @Override + public String translateLiteralTime(Time timeValue) { + if (!hasTimeType()) { + return translateLiteralTimestamp(new Timestamp(timeValue.getTime())); + } + return formatDateValue(timeValue); + } + + @Override + public String translateLiteralTimestamp(Timestamp timestampValue) { + return formatDateValue(timestampValue); + } + + @Override + public List<String> getSupportedFunctions() { + List<String> supportedFunctions = new ArrayList<String>(); + supportedFunctions.addAll(super.getSupportedFunctions()); + + supportedFunctions.add(SourceSystemFunctions.ABS); + supportedFunctions.add(SourceSystemFunctions.ACOS); + supportedFunctions.add(SourceSystemFunctions.ARRAY_GET); + supportedFunctions.add(SourceSystemFunctions.ASIN); + supportedFunctions.add(SourceSystemFunctions.ASCII); + supportedFunctions.add(SourceSystemFunctions.ATAN); + supportedFunctions.add(SourceSystemFunctions.BITAND); + supportedFunctions.add(SourceSystemFunctions.BITNOT); + supportedFunctions.add(SourceSystemFunctions.BITOR); + supportedFunctions.add(SourceSystemFunctions.BITXOR); + supportedFunctions.add(SourceSystemFunctions.CEILING); + supportedFunctions.add(SourceSystemFunctions.COALESCE); + supportedFunctions.add(SourceSystemFunctions.CONCAT); + supportedFunctions.add(SourceSystemFunctions.COS); + supportedFunctions.add(SourceSystemFunctions.CONVERT); + supportedFunctions.add(SourceSystemFunctions.CURDATE); + supportedFunctions.add(SourceSystemFunctions.CURTIME); + supportedFunctions.add(SourceSystemFunctions.DEGREES); + supportedFunctions.add(SourceSystemFunctions.DAYOFMONTH); + supportedFunctions.add(SourceSystemFunctions.EXP); + supportedFunctions.add(SourceSystemFunctions.FLOOR); + supportedFunctions.add(SourceSystemFunctions.HOUR); + supportedFunctions.add(SourceSystemFunctions.IFNULL); + supportedFunctions.add(SourceSystemFunctions.LCASE); + supportedFunctions.add(SourceSystemFunctions.LOCATE); + supportedFunctions.add(SourceSystemFunctions.LPAD); + supportedFunctions.add(SourceSystemFunctions.LENGTH); + supportedFunctions.add(SourceSystemFunctions.LTRIM); + supportedFunctions.add(SourceSystemFunctions.LOG); + supportedFunctions.add(SourceSystemFunctions.LOG10); + supportedFunctions.add(SourceSystemFunctions.MINUTE); + supportedFunctions.add(SourceSystemFunctions.MOD); + supportedFunctions.add(SourceSystemFunctions.POWER); + supportedFunctions.add(SourceSystemFunctions.SECOND); + supportedFunctions.add(SourceSystemFunctions.SQRT); + supportedFunctions.add(SourceSystemFunctions.RAND); + supportedFunctions.add(SourceSystemFunctions.ROUND); + supportedFunctions.add(SourceSystemFunctions.RTRIM); + supportedFunctions.add(SourceSystemFunctions.RPAD); + supportedFunctions.add(SourceSystemFunctions.MONTH); + supportedFunctions.add(SourceSystemFunctions.PI); + supportedFunctions.add(SourceSystemFunctions.SIN); + supportedFunctions.add(SourceSystemFunctions.SUBSTRING); + supportedFunctions.add(SourceSystemFunctions.TRIM); + supportedFunctions.add(SourceSystemFunctions.UCASE); + supportedFunctions.add(SourceSystemFunctions.YEAR); + return supportedFunctions; + } + + @Override + public void getMetadata(MetadataFactory metadataFactory, Connection conn) throws TranslatorException { + try { + HiveMetadataProcessor metadataProcessor = new HiveMetadataProcessor(); + PropertiesUtils.setBeanProperties(metadataProcessor, metadataFactory.getImportProperties(), "importer"); //$NON-NLS-1$ + metadataProcessor.getConnectorMetadata(conn, metadataFactory); + } catch (SQLException e) { + throw new TranslatorException(e); + } + } + +} Property changes on: trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveExecutionFactory.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveMetadataProcessor.java =================================================================== --- trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveMetadataProcessor.java (rev 0) +++ trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveMetadataProcessor.java 2011-11-13 19:08:32 UTC (rev 3643) @@ -0,0 +1,113 @@ +/* + * 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.translator.hive; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.List; + +import org.teiid.logging.LogConstants; +import org.teiid.logging.LogManager; +import org.teiid.metadata.Column; +import org.teiid.metadata.MetadataFactory; +import org.teiid.metadata.Table; +import org.teiid.translator.TranslatorException; +import org.teiid.translator.TypeFacility; +import org.teiid.translator.jdbc.JDBCMetdataProcessor; + +public class HiveMetadataProcessor extends JDBCMetdataProcessor { + + @Override + public void getConnectorMetadata(Connection conn, MetadataFactory metadataFactory) throws SQLException, TranslatorException { + List<String> tables = getTables(conn); + for (String table:tables) { + addTable(table, conn, metadataFactory); + } + } + + private List<String> getTables(Connection conn) { + ArrayList<String> tables = new ArrayList<String>(); + try { + Statement stmt = conn.createStatement(); + ResultSet rs = stmt.executeQuery("SHOW TABLES"); //$NON-NLS-1$ + if (rs.next()){ + tables.add(rs.getString(1)); + } + rs.close(); + } catch (SQLException e) { + LogManager.logDetail(LogConstants.CTX_CONNECTOR, "HiveMetadataProcessor - failed getting table names"); //$NON-NLS-1$ + } + return tables; + } + + private String getRuntimeType(String type) { + if (type.equalsIgnoreCase("int")) { //$NON-NLS-1$ + return TypeFacility.RUNTIME_NAMES.INTEGER; + } + else if (type.equalsIgnoreCase("tinyint")) { //$NON-NLS-1$ + return TypeFacility.RUNTIME_NAMES.BYTE; + } + else if (type.equalsIgnoreCase("smallint")) { //$NON-NLS-1$ + return TypeFacility.RUNTIME_NAMES.SHORT; + } + else if (type.equalsIgnoreCase("bigint")) { //$NON-NLS-1$ + return TypeFacility.RUNTIME_NAMES.BIG_INTEGER; + } + else if (type.equalsIgnoreCase("string")) { //$NON-NLS-1$ + return TypeFacility.RUNTIME_NAMES.STRING; + } + else if (type.equalsIgnoreCase("float")) { //$NON-NLS-1$ + return TypeFacility.RUNTIME_NAMES.FLOAT; + } + else if (type.equalsIgnoreCase("double")) { //$NON-NLS-1$ + return TypeFacility.RUNTIME_NAMES.DOUBLE; + } + else if (type.equalsIgnoreCase("boolean")) { //$NON-NLS-1$ + return TypeFacility.RUNTIME_NAMES.BOOLEAN; + } + return TypeFacility.RUNTIME_NAMES.STRING; + } + private void addTable(String tableName, Connection conn, MetadataFactory metadataFactory) throws TranslatorException { + try { + Table table = metadataFactory.addTable(tableName); + table.setNameInSource(tableName); + table.setSupportsUpdate(true); + Statement stmt = conn.createStatement(); + ResultSet rs = stmt.executeQuery("DESCRIBE "+tableName); //$NON-NLS-1$ + if (rs.next()){ + String name = rs.getString(1); + String type = rs.getString(2); + String runtimeType = getRuntimeType(type); + + Column column = metadataFactory.addColumn(name, runtimeType, table); + column.setNameInSource(name); + column.setUpdatable(true); + } + rs.close(); + } catch (SQLException e) { + LogManager.logDetail(LogConstants.CTX_CONNECTOR, "HiveMetadataProcessor - failed getting column names"); //$NON-NLS-1$ + } + } +} Property changes on: trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveMetadataProcessor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveSQLConversionVisitor.java =================================================================== --- trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveSQLConversionVisitor.java (rev 0) +++ trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveSQLConversionVisitor.java 2011-11-13 19:08:32 UTC (rev 3643) @@ -0,0 +1,185 @@ +/* + * 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.translator.hive; + +import static org.teiid.language.SQLConstants.Reserved.ALL; +import static org.teiid.language.SQLConstants.Reserved.DISTINCT; +import static org.teiid.language.SQLConstants.Reserved.FROM; +import static org.teiid.language.SQLConstants.Reserved.FULL; +import static org.teiid.language.SQLConstants.Reserved.JOIN; +import static org.teiid.language.SQLConstants.Reserved.LEFT; +import static org.teiid.language.SQLConstants.Reserved.ON; +import static org.teiid.language.SQLConstants.Reserved.OUTER; +import static org.teiid.language.SQLConstants.Reserved.RIGHT; +import static org.teiid.language.SQLConstants.Reserved.SELECT; + +import java.util.List; + +import org.teiid.language.ColumnReference; +import org.teiid.language.Condition; +import org.teiid.language.DerivedColumn; +import org.teiid.language.Expression; +import org.teiid.language.Join; +import org.teiid.language.Limit; +import org.teiid.language.OrderBy; +import org.teiid.language.SQLConstants.Tokens; +import org.teiid.language.Select; +import org.teiid.language.SetQuery; +import org.teiid.language.TableReference; +import org.teiid.translator.jdbc.SQLConversionVisitor; + +public class HiveSQLConversionVisitor extends SQLConversionVisitor { + + public HiveSQLConversionVisitor(HiveExecutionFactory hef) { + super(hef); + } + + public void visit(Join obj) { + TableReference leftItem = obj.getLeftItem(); + if(useParensForJoins() && leftItem instanceof Join) { + buffer.append(Tokens.LPAREN); + append(leftItem); + buffer.append(Tokens.RPAREN); + } else { + append(leftItem); + } + buffer.append(Tokens.SPACE); + + switch(obj.getJoinType()) { + case CROSS_JOIN: + // Hive just works with "JOIN" keyword no inner or cross + //buffer.append(CROSS); + break; + case FULL_OUTER_JOIN: + buffer.append(FULL) + .append(Tokens.SPACE) + .append(OUTER); + break; + case INNER_JOIN: + // Hive just works with "JOIN" keyword no inner or cross + //buffer.append(INNER); + break; + case LEFT_OUTER_JOIN: + buffer.append(LEFT) + .append(Tokens.SPACE) + .append(OUTER); + break; + case RIGHT_OUTER_JOIN: + buffer.append(RIGHT) + .append(Tokens.SPACE) + .append(OUTER); + break; + default: buffer.append(UNDEFINED); + } + buffer.append(Tokens.SPACE) + .append(JOIN) + .append(Tokens.SPACE); + + TableReference rightItem = obj.getRightItem(); + if(rightItem instanceof Join && (useParensForJoins() || obj.getJoinType() == Join.JoinType.CROSS_JOIN)) { + buffer.append(Tokens.LPAREN); + append(rightItem); + buffer.append(Tokens.RPAREN); + } else { + append(rightItem); + } + + final Condition condition = obj.getCondition(); + if (condition != null) { + buffer.append(Tokens.SPACE) + .append(ON) + .append(Tokens.SPACE); + append(condition); + } + } + + public void addColumns(List<DerivedColumn> items) { + if (items != null && items.size() != 0) { + addColumn(items.get(0)); + for (int i = 1; i < items.size(); i++) { + buffer.append(Tokens.COMMA) + .append(Tokens.SPACE); + addColumn(items.get(i)); + } + } + } + + private void addColumn(DerivedColumn dc) { + if (dc.getAlias() != null) { + buffer.append(dc.getAlias()); + } + else { + Expression expr = dc.getExpression(); + if (expr instanceof ColumnReference) { + buffer.append(((ColumnReference)expr).getName()); + } + else { + append(expr); + } + } + } + + @Override + public void visit(SetQuery obj) { + if (obj.getWith() != null) { + append(obj.getWith()); + } + + Select select = (Select)obj.getLeftQuery(); + buffer.append(SELECT).append(Tokens.SPACE); + if(!obj.isAll()) { + buffer.append(DISTINCT).append(Tokens.SPACE); + } + addColumns(select.getDerivedColumns()); + buffer.append(Tokens.SPACE); + buffer.append(FROM).append(Tokens.SPACE); + buffer.append(Tokens.LPAREN); + + appendSetQuery(obj, obj.getLeftQuery(), false); + + buffer.append(Tokens.SPACE); + + appendSetOperation(obj.getOperation()); + + // UNION "ALL" always + buffer.append(Tokens.SPACE); + buffer.append(ALL); + buffer.append(Tokens.SPACE); + + appendSetQuery(obj, obj.getRightQuery(), true); + + OrderBy orderBy = obj.getOrderBy(); + if(orderBy != null) { + buffer.append(Tokens.SPACE); + append(orderBy); + } + + Limit limit = obj.getLimit(); + if(limit != null) { + buffer.append(Tokens.SPACE); + append(limit); + } + buffer.append(Tokens.RPAREN); + buffer.append(Tokens.SPACE); + buffer.append("X__"); //$NON-NLS-1$ + } +} Property changes on: trunk/connectors/translator-hive/src/main/java/org/teiid/translator/hive/HiveSQLConversionVisitor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/connectors/translator-hive/src/test/java/org/teiid/translator/hive/TestHiveExecutionFactory.java =================================================================== --- trunk/connectors/translator-hive/src/test/java/org/teiid/translator/hive/TestHiveExecutionFactory.java (rev 0) +++ trunk/connectors/translator-hive/src/test/java/org/teiid/translator/hive/TestHiveExecutionFactory.java 2011-11-13 19:08:32 UTC (rev 3643) @@ -0,0 +1,168 @@ +package org.teiid.translator.hive; + +import static org.junit.Assert.assertEquals; + +import java.math.BigInteger; +import java.util.Arrays; +import java.util.List; + +import org.junit.BeforeClass; +import org.junit.Test; +import org.mockito.Mockito; +import org.teiid.cdk.CommandBuilder; +import org.teiid.core.types.DataTypeManager; +import org.teiid.language.Command; +import org.teiid.language.Expression; +import org.teiid.language.Function; +import org.teiid.language.LanguageFactory; +import org.teiid.metadata.Column; +import org.teiid.metadata.MetadataStore; +import org.teiid.metadata.Schema; +import org.teiid.metadata.Table; +import org.teiid.query.mapping.relational.QueryNode; +import org.teiid.query.metadata.QueryMetadataInterface; +import org.teiid.query.metadata.TransformationMetadata; +import org.teiid.query.unittest.RealMetadataFactory; +import org.teiid.translator.ExecutionContext; +import org.teiid.translator.TranslatorException; +import org.teiid.translator.TypeFacility; +import org.teiid.translator.jdbc.SQLConversionVisitor; +import org.teiid.translator.jdbc.TranslatedCommand; + +@SuppressWarnings("nls") +public class TestHiveExecutionFactory { + + private static HiveExecutionFactory hiveTranslator; + private static final LanguageFactory LANG_FACTORY = new LanguageFactory(); + private static TransformationMetadata bqt; + + @BeforeClass + public static void setUp() throws TranslatorException { + hiveTranslator = new HiveExecutionFactory(); + hiveTranslator.setUseBindVariables(false); + hiveTranslator.start(); + bqt = exampleBQT(); + } + + private void helpTest(Expression srcExpression, String tgtType, String expectedExpression) throws Exception { + Function func = LANG_FACTORY.createFunction("convert", Arrays.asList( srcExpression,LANG_FACTORY.createLiteral(tgtType, String.class)),TypeFacility.getDataTypeClass(tgtType)); + SQLConversionVisitor sqlVisitor = hiveTranslator.getSQLConversionVisitor(); + sqlVisitor.append(func); + assertEquals("Error converting from " + srcExpression.getType() + " to " + tgtType, expectedExpression,sqlVisitor.toString()); + } + + private void helpTestVisitor(QueryMetadataInterface metadata, String input, String expectedOutput) throws TranslatorException { + // Convert from sql to objects + CommandBuilder commandBuilder = new CommandBuilder(metadata); + Command obj = commandBuilder.getCommand(input); + + // Convert back to SQL + TranslatedCommand tc = new TranslatedCommand(Mockito.mock(ExecutionContext.class), hiveTranslator); + tc.translateCommand(obj); + + // Check stuff + assertEquals("Did not get correct sql", expectedOutput, tc.getSql()); //$NON-NLS-1$ + } + + @Test public void testConvertions() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), TypeFacility.RUNTIME_NAMES.BOOLEAN, "cast(true AS boolean)"); + helpTest(LANG_FACTORY.createLiteral(Byte.parseByte("123"), Byte.class), TypeFacility.RUNTIME_NAMES.BYTE, "cast(123 AS tinyint)"); + helpTest(LANG_FACTORY.createLiteral(new Integer(12345), Integer.class), TypeFacility.RUNTIME_NAMES.INTEGER, "cast(12345 AS int)"); + helpTest(LANG_FACTORY.createLiteral(Short.parseShort("1234"), Short.class), TypeFacility.RUNTIME_NAMES.SHORT, "cast(1234 AS smallint)"); + helpTest(LANG_FACTORY.createLiteral(new BigInteger("123451266182"), BigInteger.class), TypeFacility.RUNTIME_NAMES.BIG_INTEGER, "cast(123451266182 AS bigint)"); + helpTest(LANG_FACTORY.createLiteral(new String("foo-bar"), String.class), TypeFacility.RUNTIME_NAMES.STRING, "cast('foo-bar' AS string)"); + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), TypeFacility.RUNTIME_NAMES.STRING, "cast(true AS string)"); + //helpTest(LANG_FACTORY.createLiteral(new Timestamp(1320883518391L), Timestamp.class), TypeFacility.RUNTIME_NAMES.STRING, "cast('2011-11-09 18:05:18.391' AS string)"); + } + + @Test + public void testEqualityJoinCriteria() throws Exception { + String input = "SELECT A.intkey FROM BQT1.SMALLA A JOIN BQT1.SmallB B on A.intkey=B.intkey"; + String output = "SELECT A.IntKey FROM SmallA A JOIN SmallB B ON A.IntKey = B.IntKey"; + helpTestVisitor(bqt, input, output); + } + + @Test + public void testCrossJoinCriteria() throws Exception { + String input = "SELECT A.intkey FROM BQT1.SMALLA A Cross join BQT1.SmallB B"; + String output = "SELECT A.IntKey FROM SmallA A JOIN SmallB B"; + helpTestVisitor(bqt, input, output); + } + + + @Test + public void testMustHaveAliasOnView() throws Exception { + String input = "SELECT intkey FROM (select intkey from BQT1.SmallA) as X"; + String output = "SELECT X.intkey FROM (SELECT SmallA.IntKey FROM SmallA) X"; + helpTestVisitor(bqt, input, output); + } + + @Test + public void testUnionAllRewrite() throws Exception { + String input = "SELECT intkey, stringkey FROM BQT1.SmallA union all SELECT intkey, stringkey FROM BQT1.Smallb"; + String output = "SELECT intkey, stringkey FROM (SELECT SmallA.IntKey, SmallA.StringKey FROM SmallA UNION ALL SELECT SmallB.IntKey, SmallB.StringKey FROM SmallB) X__"; + helpTestVisitor(bqt, input, output); + } + + @Test + public void testUnionAllExprRewrite() throws Exception { + String input = "SELECT count(*) as key, stringkey FROM BQT1.SmallA union all SELECT intkey, stringkey FROM BQT1.Smallb"; + String output = "SELECT key, stringkey FROM (SELECT COUNT(*) AS key, SmallA.StringKey FROM SmallA UNION ALL SELECT SmallB.IntKey, SmallB.StringKey FROM SmallB) X__"; + helpTestVisitor(bqt, input, output); + } + + @Test + public void testUnionRewrite() throws Exception { + String input = "SELECT intkey, stringkey FROM BQT1.SmallA union SELECT intkey, stringkey FROM BQT1.Smallb"; + String output = "SELECT DISTINCT intkey, stringkey FROM (SELECT SmallA.IntKey, SmallA.StringKey FROM SmallA UNION ALL SELECT SmallB.IntKey, SmallB.StringKey FROM SmallB) X__"; + helpTestVisitor(bqt, input, output); + } + + + public static TransformationMetadata exampleBQT() { + MetadataStore metadataStore = new MetadataStore(); + Schema bqt1 = RealMetadataFactory.createPhysicalModel("BQT1", metadataStore); //$NON-NLS-1$ + Table bqt1SmallA = RealMetadataFactory.createPhysicalGroup("SmallA", bqt1); //$NON-NLS-1$ + Table bqt1SmallB = RealMetadataFactory.createPhysicalGroup("SmallB", bqt1); //$NON-NLS-1$ + String[] elemNames = new String[] { + "IntKey", "StringKey", //$NON-NLS-1$ //$NON-NLS-2$ + "IntNum", "StringNum", //$NON-NLS-1$ //$NON-NLS-2$ + "FloatNum", "LongNum", //$NON-NLS-1$ //$NON-NLS-2$ + "DoubleNum", "ByteNum", //$NON-NLS-1$ //$NON-NLS-2$ + "DateValue", "TimeValue", //$NON-NLS-1$ //$NON-NLS-2$ + "TimestampValue", "BooleanValue", //$NON-NLS-1$ //$NON-NLS-2$ + "CharValue", "ShortValue", //$NON-NLS-1$ //$NON-NLS-2$ + "BigIntegerValue", "BigDecimalValue", //$NON-NLS-1$ //$NON-NLS-2$ + "ObjectValue" }; //$NON-NLS-1$ + + String[] nativeTypes = new String[] { DataTypeManager.DefaultDataTypes.INTEGER, DataTypeManager.DefaultDataTypes.STRING, + DataTypeManager.DefaultDataTypes.INTEGER, DataTypeManager.DefaultDataTypes.STRING, + DataTypeManager.DefaultDataTypes.FLOAT, DataTypeManager.DefaultDataTypes.BIG_INTEGER, + DataTypeManager.DefaultDataTypes.DOUBLE, DataTypeManager.DefaultDataTypes.BYTE, + DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.STRING, + DataTypeManager.DefaultDataTypes.TIMESTAMP, DataTypeManager.DefaultDataTypes.BOOLEAN, + DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.SHORT, + DataTypeManager.DefaultDataTypes.BIG_INTEGER, DataTypeManager.DefaultDataTypes.BIG_INTEGER, + DataTypeManager.DefaultDataTypes.STRING}; + + String[] runtimeTypes = new String[] { DataTypeManager.DefaultDataTypes.INTEGER, DataTypeManager.DefaultDataTypes.STRING, + DataTypeManager.DefaultDataTypes.INTEGER, DataTypeManager.DefaultDataTypes.STRING, + DataTypeManager.DefaultDataTypes.FLOAT, DataTypeManager.DefaultDataTypes.LONG, + DataTypeManager.DefaultDataTypes.DOUBLE, DataTypeManager.DefaultDataTypes.BYTE, + DataTypeManager.DefaultDataTypes.DATE, DataTypeManager.DefaultDataTypes.TIME, + DataTypeManager.DefaultDataTypes.TIMESTAMP, DataTypeManager.DefaultDataTypes.BOOLEAN, + DataTypeManager.DefaultDataTypes.CHAR, DataTypeManager.DefaultDataTypes.SHORT, + DataTypeManager.DefaultDataTypes.BIG_INTEGER, DataTypeManager.DefaultDataTypes.BIG_DECIMAL, + DataTypeManager.DefaultDataTypes.OBJECT }; + + List<Column> bqt1SmallAe = RealMetadataFactory.createElements(bqt1SmallA, elemNames, nativeTypes); + List<Column> bqt1SmallBe = RealMetadataFactory.createElements(bqt1SmallB, elemNames, nativeTypes); + + Schema vqt = RealMetadataFactory.createVirtualModel("VQT", metadataStore); //$NON-NLS-1$ + QueryNode vqtn1 = new QueryNode("SELECT * FROM BQT1.SmallA"); //$NON-NLS-1$ + Table vqtg1 = RealMetadataFactory.createUpdatableVirtualGroup("SmallA", vqt, vqtn1); //$NON-NLS-1$ + RealMetadataFactory.createElements(vqtg1, elemNames, runtimeTypes); + + return RealMetadataFactory.createTransformationMetadata(metadataStore, "bqt");//$NON-NLS-1$ + } +} Property changes on: trunk/connectors/translator-hive/src/test/java/org/teiid/translator/hive/TestHiveExecutionFactory.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ConvertModifier.java =================================================================== --- trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ConvertModifier.java 2011-11-13 18:31:49 UTC (rev 3642) +++ trunk/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ConvertModifier.java 2011-11-13 19:08:32 UTC (rev 3643) @@ -44,11 +44,20 @@ * etc. * <p>The choice of conversion logic is as follows: * <ul> - * <li>Look for a specific conversion between the source and target - {@link #addConvert(int, int, FunctionModifier)}</li> + * <li>Provide specific conversion between the source and target - {@link #addConvert(int, int, FunctionModifier)} + * mostly one do not need to provide any conversion if the default is cast(srcType AS targetType), however if the source + * database requires different specific format for example to cast(srctype, targetType FORMAT 'more-info') this conversion needs to be added</li> * <li>Filter common implicit conversions</li> * <li>Look for a general source conversion - {@link #addSourceConversion(FunctionModifier, int...)}</li> - * <li>Look for a general target conversion - {@link #addTypeConversion(FunctionModifier, int...)}</li> - * <li>Look for a type mapping, which will replace the target type with the given native type - {@link #addTypeMapping(String, int...)}</li> + * <li>Look for a general target conversion - {@link #addTypeConversion(FunctionModifier, int...)}. If the source + * database provides a specific function for converting *any* source datatype to this target datatype then use this to define it. + * Like in oracle "to_char" function will convert any other data type to string. Use this to define those kind of conversions + * convert any data type to string. so you can use this for purpose.</li> + * <li>Type maps from database data type to Teiid runtime types. - {@link #addTypeMapping(String, int...)} + * define mappings for every datatype available in database. The cast operation will replace the target type (teiid type) with the given + * native type in the cast operation generated. Do not need to really look at implicit/explicit conversions that are + * supported by the source database, because when a cast is defined on the sql it is up to the source database to apply it + * as implicit or explicit operation. Teiid generates cast always when needed</li> * <li>Drop the conversion</li> * </ul> */ 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-13 18:31:49 UTC (rev 3642) +++ trunk/documentation/reference/src/main/docbook/en-US/content/translators.xml 2011-11-13 19:08:32 UTC (rev 3643) @@ -259,6 +259,11 @@ </listitem> <listitem> <para> + <emphasis>hive</emphasis> - For use with Hive database based on Hadoop + </para> + </listitem> + <listitem> + <para> <emphasis>hsql</emphasis> - for use with HSQLDB 1.7 or later. </para> </listitem>

12 years, 11 months

1
0
0 / 0

teiid SVN: r3642 - trunk/client/src/main/java/org/teiid/jdbc.

by teiid-commits＠lists.jboss.org

Author: rareddy Date: 2011-11-13 13:31:49 -0500 (Sun, 13 Nov 2011) New Revision: 3642 Modified: trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java Log: TEIID-1825: changed Logger class to JDK based. Modified: trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java =================================================================== --- trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java 2011-11-13 13:09:21 UTC (rev 3641) +++ trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java 2011-11-13 18:31:49 UTC (rev 3642) @@ -27,8 +27,9 @@ import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.logging.Level; +import java.util.logging.Logger; -import org.jboss.logging.Logger; import org.teiid.core.util.ExecutorUtils; /** @@ -38,7 +39,7 @@ */ public class EnhancedTimer { - private static final Logger LOGGER = Logger.getLogger(EnhancedTimer.class); + private static final Logger LOGGER = Logger.getLogger("org.teiid.jdbc"); //$NON-NLS-1$ private static AtomicLong id = new AtomicLong(); public class Task implements Comparable<Task>, Runnable { @@ -139,7 +140,7 @@ try { taskExecutor.execute(task); } catch (Throwable t) { - LOGGER.error("Unexpected exception running task", t); //$NON-NLS-1$ + LOGGER.log(Level.SEVERE, "Unexpected exception running task", t); //$NON-NLS-1$ } return true; }

12 years, 11 months

1
0
0 / 0

teiid SVN: r3641 - in trunk: engine/src/main/java/org/teiid/query/eval and 3 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-11-13 08:09:21 -0500 (Sun, 13 Nov 2011) New Revision: 3641 Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java trunk/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java Log: TEIID-1813 adding asynch processing for faster batch delivery. Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2011-11-13 13:03:20 UTC (rev 3640) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2011-11-13 13:09:21 UTC (rev 3641) @@ -335,6 +335,7 @@ request.initialize(requestMsg, bufferManager, dataTierMgr, transactionService, state.sessionTables, workContext, this.prepPlanCache); + request.setExecutor(this.processWorkerPool); request.setResultSetCacheEnabled(this.rsCache != null); request.setAuthorizationValidator(this.authorizationValidator); request.setUserRequestConcurrency(this.getUserRequestSourceConcurrency()); Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java =================================================================== --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2011-11-13 13:03:20 UTC (rev 3640) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2011-11-13 13:09:21 UTC (rev 3641) @@ -28,6 +28,7 @@ import java.util.List; import java.util.Properties; import java.util.Set; +import java.util.concurrent.Executor; import org.teiid.adminapi.impl.VDBMetaData; import org.teiid.api.exception.query.QueryMetadataException; @@ -134,6 +135,7 @@ private boolean resultSetCacheEnabled = true; private int userRequestConcurrency; private AuthorizationValidator authorizationValidator; + private Executor executor; void initialize(RequestMessage requestMsg, BufferManager bufferManager, @@ -240,7 +242,7 @@ multiSourceModels, workContext, context); context.setPlanToProcessConverter(modifier); } - + context.setExecutor(this.executor); context.setSecurityFunctionEvaluator(this); context.setTempTableStore(tempTableStore); context.setQueryProcessorFactory(new QueryProcessorFactoryImpl(this.bufferManager, this.processorDataManager, this.capabilitiesFinder, idGenerator, metadata)); @@ -475,4 +477,8 @@ } } + public void setExecutor(Executor executor) { + this.executor = executor; + } + } Modified: trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java 2011-11-13 13:03:20 UTC (rev 3640) +++ trunk/engine/src/main/java/org/teiid/query/eval/Evaluator.java 2011-11-13 13:09:21 UTC (rev 3641) @@ -925,6 +925,17 @@ public Result evaluateXQuery(SaxonXQueryExpression xquery, List<DerivedColumn> cols, List<?> tuple, RowProcessor processor) throws BlockedException, TeiidComponentException, TeiidProcessingException { HashMap<String, Object> parameters = new HashMap<String, Object>(); + Object contextItem = evaluateParameters(cols, tuple, parameters); + return XQueryEvaluator.evaluateXQuery(xquery, contextItem, parameters, processor, context); + } + + /** + * Evaluate the parameters and return the context item if it exists + */ + public Object evaluateParameters(List<DerivedColumn> cols, List<?> tuple, + HashMap<String, Object> parameters) + throws ExpressionEvaluationException, BlockedException, + TeiidComponentException { Object contextItem = null; for (DerivedColumn passing : cols) { Object value = this.evaluate(passing.getExpression(), tuple); @@ -934,7 +945,7 @@ parameters.put(passing.getAlias(), value); } } - return XQueryEvaluator.evaluateXQuery(xquery, contextItem, parameters, processor, context); + return contextItem; } private Evaluator.NameValuePair<Object>[] getNameValuePairs(List<?> tuple, List<DerivedColumn> args, boolean xmlNames) Modified: trunk/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java 2011-11-13 13:03:20 UTC (rev 3640) +++ trunk/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java 2011-11-13 13:09:21 UTC (rev 3641) @@ -52,9 +52,11 @@ import org.teiid.core.types.DataTypeManager; import org.teiid.core.types.XMLType; import org.teiid.query.QueryPlugin; +import org.teiid.query.eval.Evaluator; import org.teiid.query.function.FunctionDescriptor; import org.teiid.query.sql.lang.XMLTable; import org.teiid.query.sql.lang.XMLTable.XMLColumn; +import org.teiid.query.xquery.saxon.XQueryEvaluator; import org.teiid.query.xquery.saxon.SaxonXQueryExpression.Result; import org.teiid.query.xquery.saxon.SaxonXQueryExpression.RowProcessor; @@ -76,6 +78,8 @@ typeMapping.put(DataTypeManager.DefaultDataClasses.DOUBLE, BuiltInAtomicType.DOUBLE); } + private static RuntimeException EARLY_TERMINATION = new RuntimeException(); + private XMLTable table; private List<XMLColumn> projectedColumns; @@ -84,6 +88,8 @@ private Item item; private TupleBuffer buffer; + private boolean batchAvailable = false; + private TeiidRuntimeException asynchException; private int outputRow = 1; private boolean usingOutput; @@ -92,7 +98,7 @@ } @Override - public void closeDirect() { + public synchronized void closeDirect() { super.closeDirect(); if(this.buffer != null) { if (!usingOutput) { @@ -115,6 +121,8 @@ outputRow = 1; usingOutput = false; this.buffer = null; + this.batchAvailable = false; + this.asynchException = null; } public void setTable(XMLTable table) { @@ -135,14 +143,23 @@ } @Override - protected TupleBatch nextBatchDirect() throws BlockedException, + protected synchronized TupleBatch nextBatchDirect() throws BlockedException, TeiidComponentException, TeiidProcessingException { - evaluate(); + evaluate(false); if (this.table.getXQueryExpression().isStreaming()) { + while (!batchAvailable) { + try { + this.wait(); + } catch (InterruptedException e) { + throw new TeiidRuntimeException(e); + } + } + unwrapException(asynchException); TupleBatch batch = this.buffer.getBatch(outputRow); outputRow = batch.getEndRow() + 1; + batchAvailable = hasNextBatch(); return batch; } @@ -164,34 +181,70 @@ return pullBatch(); } - private void evaluate() throws TeiidComponentException, + private void evaluate(final boolean useFinalBuffer) throws TeiidComponentException, ExpressionEvaluationException, BlockedException, TeiidProcessingException { - if (result == null) { - if (this.buffer == null && this.table.getXQueryExpression().isStreaming()) { - this.buffer = this.getBufferManager().createTupleBuffer(getOutputElements(), getConnectionID(), TupleSourceType.PROCESSOR); + if (result != null || this.buffer != null) { + return; + } + setReferenceValues(this.table); + final HashMap<String, Object> parameters = new HashMap<String, Object>(); + Evaluator eval = getEvaluator(Collections.emptyMap()); + final Object contextItem = eval.evaluateParameters(this.table.getPassing(), null, parameters); + + if (this.table.getXQueryExpression().isStreaming()) { + if (this.buffer == null) { + this.buffer = this.getBufferManager().createTupleBuffer(getOutputElements(), getConnectionID(), TupleSourceType.PROCESSOR); } - setReferenceValues(this.table); - try { - result = getEvaluator(Collections.emptyMap()).evaluateXQuery(this.table.getXQueryExpression(), this.table.getPassing(), null, this); - if (this.buffer != null) { - this.buffer.close(); - if (!usingOutput) { - this.buffer.setForwardOnly(true); + Runnable r = new Runnable() { + @Override + public void run() { + try { + if (!useFinalBuffer) { + buffer.setForwardOnly(true); + } + XQueryEvaluator.evaluateXQuery(table.getXQueryExpression(), contextItem, parameters, XMLTableNode.this, getContext()); + buffer.close(); + } catch (TeiidException e) { + asynchException = new TeiidRuntimeException(e); + } catch (TeiidRuntimeException e) { + asynchException = e; + } catch (RuntimeException e) { + if (e != EARLY_TERMINATION) { + asynchException = new TeiidRuntimeException(e); + } + } finally { + batchAvailable = true; + synchronized (XMLTableNode.this) { + XMLTableNode.this.notifyAll(); + } } } - } catch (TeiidRuntimeException e) { - if (e.getCause() instanceof TeiidComponentException) { - throw (TeiidComponentException)e.getCause(); - } - if (e.getCause() instanceof TeiidProcessingException) { - throw (TeiidProcessingException)e.getCause(); - } - throw e; - } + }; + this.getContext().getExecutor().execute(r); + return; } + try { + result = XQueryEvaluator.evaluateXQuery(this.table.getXQueryExpression(), contextItem, parameters, null, this.getContext()); + } catch (TeiidRuntimeException e) { + unwrapException(e); + } } + private void unwrapException(TeiidRuntimeException e) + throws TeiidComponentException, TeiidProcessingException { + if (e == null) { + return; + } + if (e.getCause() instanceof TeiidComponentException) { + throw (TeiidComponentException)e.getCause(); + } + if (e.getCause() instanceof TeiidProcessingException) { + throw (TeiidProcessingException)e.getCause(); + } + throw e; + } + private List<?> processRow() throws ExpressionEvaluationException, BlockedException, TeiidComponentException, TeiidProcessingException { List<Object> tuple = new ArrayList<Object>(projectedColumns.size()); @@ -256,23 +309,35 @@ @Override public TupleBuffer getFinalBuffer() throws BlockedException, TeiidComponentException, TeiidProcessingException { - evaluate(); + evaluate(true); usingOutput = true; TupleBuffer finalBuffer = this.buffer; - this.buffer = null; - close(); + if (!this.table.getXQueryExpression().isStreaming()) { + close(); + } return finalBuffer; } @Override - public void processRow(NodeInfo row) { + public synchronized void processRow(NodeInfo row) { + if (isClosed()) { + throw EARLY_TERMINATION; + } this.item = row; rowCount++; try { this.buffer.addTuple(processRow()); + if (hasNextBatch()) { + this.batchAvailable = true; + this.notifyAll(); + } } catch (TeiidException e) { throw new TeiidRuntimeException(e); } } - + + private boolean hasNextBatch() { + return this.outputRow + this.buffer.getBatchSize() <= rowCount + 1; + } + } \ No newline at end of file Modified: trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java 2011-11-13 13:03:20 UTC (rev 3640) +++ trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java 2011-11-13 13:09:21 UTC (rev 3641) @@ -32,6 +32,7 @@ import java.util.Random; import java.util.Set; import java.util.TimeZone; +import java.util.concurrent.Executor; import javax.security.auth.Subject; @@ -42,6 +43,7 @@ import org.teiid.common.buffer.BufferManager; import org.teiid.core.TeiidComponentException; import org.teiid.core.util.ArgCheck; +import org.teiid.core.util.ExecutorUtils; import org.teiid.dqp.internal.process.DQPWorkContext; import org.teiid.dqp.internal.process.PreparedPlan; import org.teiid.dqp.internal.process.SessionAwareCache; @@ -135,6 +137,7 @@ private TransactionContext transactionContext; private TransactionService transactionService; private SourceHint sourceHint; + private Executor executor = ExecutorUtils.getDirectExecutor(); } private GlobalState globalState = new GlobalState(); @@ -639,4 +642,12 @@ this.globalState.sourceHint = hint; } + public Executor getExecutor() { + return this.globalState.executor; + } + + public void setExecutor(Executor e) { + this.globalState.executor = e; + } + } Modified: trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java 2011-11-13 13:03:20 UTC (rev 3640) +++ trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java 2011-11-13 13:09:21 UTC (rev 3641) @@ -26,6 +26,7 @@ import java.net.InetSocketAddress; import java.sql.Connection; +import java.sql.ResultSet; import java.sql.Statement; import java.util.Properties; @@ -97,6 +98,22 @@ assertEquals("<root></root>", s.getResultSet().getString(1)); } + @Test public void testXmlTableScrollable() throws Exception { + Statement s = conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); + assertTrue(s.execute("select * from xmltable('/root/row' passing (select xmlelement(name \"root\", xmlagg(xmlelement(name \"row\", xmlforest(t.name)) order by t.name)) from tables as t, columns as t1) columns \"Name\" string) as x")); + ResultSet rs = s.getResultSet(); + int count = 0; + while (rs.next()) { + count++; + } + assertEquals(7812, count); + rs.beforeFirst(); + while (rs.next()) { + count--; + } + assertEquals(0, count); + } + /** * Ensures if you start more than the maxActivePlans * where all the plans take up more than output buffer limit

12 years, 11 months

1
0
0 / 0

teiid SVN: r3640 - in trunk: engine/src/main/java/org/teiid/common/buffer and 2 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-11-13 08:03:20 -0500 (Sun, 13 Nov 2011) New Revision: 3640 Modified: trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java trunk/engine/src/main/java/org/teiid/query/function/source/XMLSystemFunctions.java trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingOutputter.java Log: TEIID-1824 performance enhancement for sql/xml Modified: trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java =================================================================== --- trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java 2011-11-12 12:46:01 UTC (rev 3639) +++ trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java 2011-11-13 13:03:20 UTC (rev 3640) @@ -117,7 +117,7 @@ if (sourceClass == null || sourceClass == StreamSource.class) { return (T)new StreamSource(getBinaryStream(), this.getStreamFactory().getSystemId()); } else if (sourceClass == StAXSource.class) { - XMLInputFactory factory = XMLInputFactory.newInstance(); + XMLInputFactory factory = XMLType.getXmlInputFactory(); try { return (T) new StAXSource(factory.createXMLStreamReader(getBinaryStream())); } catch (XMLStreamException e) { Modified: trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java =================================================================== --- trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java 2011-11-12 12:46:01 UTC (rev 3639) +++ trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java 2011-11-13 13:03:20 UTC (rev 3640) @@ -54,9 +54,31 @@ private static final long serialVersionUID = -7922647237095135723L; + private static ThreadLocal<XMLInputFactory> threadLocalFactory = new ThreadLocal<XMLInputFactory>() { + protected XMLInputFactory initialValue() { + return XMLInputFactory.newInstance(); + } + }; + private static XMLInputFactory factory = XMLInputFactory.newInstance(); + private static Boolean factoriesTreadSafe; + private transient Type type = Type.UNKNOWN; private String encoding; - + + public static boolean isThreadSafeXmlFactories() { + if (factoriesTreadSafe == null) { + factoriesTreadSafe = factory.getClass().getName().contains(".wstx."); //$NON-NLS-1$ + } + return factoriesTreadSafe; + } + + public static XMLInputFactory getXmlInputFactory() { + if (isThreadSafeXmlFactories()) { + return factory; + } + return threadLocalFactory.get(); + } + public XMLType(){ } @@ -175,7 +197,6 @@ } public static String getEncoding(InputStream is) { - XMLInputFactory factory = XMLInputFactory.newInstance(); XMLStreamReader reader; try { reader = factory.createXMLStreamReader(is); Modified: trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java =================================================================== --- trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java 2011-11-12 12:46:01 UTC (rev 3639) +++ trunk/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java 2011-11-13 13:03:20 UTC (rev 3640) @@ -26,12 +26,14 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStreamWriter; +import java.io.Reader; import java.io.Writer; import java.nio.charset.Charset; import org.teiid.common.buffer.FileStore.FileStoreOutputStream; import org.teiid.core.types.DataTypeManager; import org.teiid.core.types.InputStreamFactory; +import org.teiid.core.util.InputStreamReader; public final class FileStoreInputStreamFactory extends InputStreamFactory { private final FileStore lobBuffer; @@ -51,6 +53,11 @@ } return lobBuffer.createInputStream(0); } + + @Override + public Reader getCharacterStream() throws IOException { + return new InputStreamReader(getInputStream(), Charset.forName(encoding).newDecoder()); + } @Override public long getLength() { Modified: trunk/engine/src/main/java/org/teiid/query/function/source/XMLSystemFunctions.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/function/source/XMLSystemFunctions.java 2011-11-12 12:46:01 UTC (rev 3639) +++ trunk/engine/src/main/java/org/teiid/query/function/source/XMLSystemFunctions.java 2011-11-13 13:03:20 UTC (rev 3640) @@ -234,9 +234,39 @@ return true; } } + + private static ThreadLocal<TransformerFactory> threadLocalTransformerFactory = new ThreadLocal<TransformerFactory>() { + protected TransformerFactory initialValue() { + return TransformerFactory.newInstance(); + } + }; + static ThreadLocal<XMLOutputFactory> threadLocalOutputFactory = new ThreadLocal<XMLOutputFactory>() { + protected XMLOutputFactory initialValue() { + return newXmlOutputFactory(); + } + }; + static ThreadLocal<XMLEventFactory> threadLocalEventtFactory = new ThreadLocal<XMLEventFactory>() { + protected XMLEventFactory initialValue() { + return XMLEventFactory.newInstance(); + } + }; + private static final String P_OUTPUT_VALIDATE_STRUCTURE = "com.ctc.wstx.outputValidateStructure"; //$NON-NLS-1$ + static XMLOutputFactory newXmlOutputFactory() throws FactoryConfigurationError { + XMLOutputFactory factory = XMLOutputFactory.newInstance(); + if (factory.isPropertySupported(P_OUTPUT_VALIDATE_STRUCTURE)) { + factory.setProperty(P_OUTPUT_VALIDATE_STRUCTURE, false); + } + return factory; + } + static XMLOutputFactory xmlOutputFactory = newXmlOutputFactory(); + + public static XMLOutputFactory getOutputFactory() throws FactoryConfigurationError { + if (XMLType.isThreadSafeXmlFactories()) { + return xmlOutputFactory; + } + return threadLocalOutputFactory.get(); + } - private static final String P_OUTPUT_VALIDATE_STRUCTURE = "com.ctc.wstx.outputValidateStructure"; //$NON-NLS-1$ - public static ClobType xslTransform(CommandContext context, Object xml, Object styleSheet) throws Exception { Source styleSource = null; Source xmlSource = null; @@ -244,7 +274,7 @@ styleSource = convertToSource(styleSheet); xmlSource = convertToSource(xml); final Source xmlParam = xmlSource; - TransformerFactory factory = TransformerFactory.newInstance(); + TransformerFactory factory = threadLocalTransformerFactory.get(); final Transformer transformer = factory.newTransformer(styleSource); //this creates a non-validated sqlxml - it may not be valid xml/root-less xml @@ -284,7 +314,7 @@ try { XMLOutputFactory factory = getOutputFactory(); XMLEventWriter eventWriter = factory.createXMLEventWriter(writer); - XMLEventFactory eventFactory = XMLEventFactory.newInstance(); + XMLEventFactory eventFactory = threadLocalEventtFactory.get(); for (Evaluator.NameValuePair nameValuePair : values) { if (nameValuePair.value == null) { continue; @@ -320,7 +350,7 @@ try { XMLOutputFactory factory = getOutputFactory(); XMLEventWriter eventWriter = factory.createXMLEventWriter(writer); - XMLEventFactory eventFactory = XMLEventFactory.newInstance(); + XMLEventFactory eventFactory = threadLocalEventtFactory.get(); addElement(name, writer, eventWriter, eventFactory, namespaces, attributes, contents); eventWriter.close(); } catch (XMLStreamException e) { @@ -465,14 +495,6 @@ } - private static XMLOutputFactory getOutputFactory() throws FactoryConfigurationError { - XMLOutputFactory factory = XMLOutputFactory.newInstance(); - if (factory.isPropertySupported(P_OUTPUT_VALIDATE_STRUCTURE)) { - factory.setProperty(P_OUTPUT_VALIDATE_STRUCTURE, false); - } - return factory; - } - public static XMLType xmlPi(String name) { return xmlPi(name, ""); //$NON-NLS-1$ } @@ -555,7 +577,7 @@ } case UNKNOWN: //assume a document case DOCUMENT: //filter the doc declaration - XMLInputFactory inputFactory = XMLInputFactory.newInstance(); + XMLInputFactory inputFactory = XMLType.getXmlInputFactory(); if (!(r instanceof BufferedReader)) { r = new BufferedReader(r); } @@ -569,7 +591,7 @@ eventWriter.add(eventReader); break; case TEXT: - XMLEventFactory eventFactory = XMLEventFactory.newInstance(); + XMLEventFactory eventFactory = threadLocalEventtFactory.get(); char[] buf = new char[1 << 13]; int read = -1; while ((read = r.read(buf)) != -1) { Modified: trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingOutputter.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingOutputter.java 2011-11-12 12:46:01 UTC (rev 3639) +++ trunk/engine/src/main/java/org/teiid/query/mapping/xml/MappingOutputter.java 2011-11-13 13:03:20 UTC (rev 3640) @@ -35,6 +35,7 @@ import javax.xml.stream.XMLStreamWriter; import org.teiid.query.QueryPlugin; +import org.teiid.query.function.source.XMLSystemFunctions; /** @@ -59,7 +60,7 @@ */ public void write(MappingDocument doc, PrintWriter stream) throws IOException { try { - XMLOutputFactory xof = XMLOutputFactory.newInstance(); + XMLOutputFactory xof = XMLSystemFunctions.getOutputFactory(); writer = xof.createXMLStreamWriter(stream); writer.writeStartDocument("UTF-8", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ writer.writeStartElement(ELEM_ROOT);

12 years, 11 months

1
0
0 / 0

teiid SVN: r3639 - in trunk/engine/src: test/java/org/teiid/common/buffer/impl and 1 other directory.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-11-12 07:46:01 -0500 (Sat, 12 Nov 2011) New Revision: 3639 Modified: trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java trunk/engine/src/test/java/org/teiid/common/buffer/impl/TestBufferFrontedFileStoreCache.java Log: TEIID-1750 fixing a timing issue with eviction in a constrained scenario Modified: trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java =================================================================== --- trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java 2011-11-11 20:22:49 UTC (rev 3638) +++ trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java 2011-11-12 12:46:01 UTC (rev 3639) @@ -39,9 +39,12 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Semaphore; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import org.teiid.common.buffer.AutoCleanupUtil; @@ -98,7 +101,7 @@ private static final int DEFAULT_MIN_DEFRAG = 1 << 26; private static final byte[] HEADER_SKIP_BUFFER = new byte[16]; - private static final int EVICTION_SCANS = 5; + private static final int EVICTION_SCANS = 2; public static final int DEFAuLT_MAX_OBJECT_SIZE = 1 << 23; @@ -343,6 +346,8 @@ LrfuEvictionQueue<PhysicalInfo> memoryBufferEntries = new LrfuEvictionQueue<PhysicalInfo>(readAttempts); private Semaphore memoryWritePermits; //prevents deadlock waiting for free blocks private ReentrantReadWriteLock memoryEvictionLock = new ReentrantReadWriteLock(true); + private ReentrantLock freedLock = new ReentrantLock(); + private Condition blocksFreed = freedLock.newCondition(); private int blocks; private ConcurrentBitSet blocksInuse; @@ -625,16 +630,11 @@ private void checkForLowMemory() { //proactively create freespace - if (!cleanerRunning.get()) { - if (lowBlocks(false) && cleanerRunning.compareAndSet(false, true)) { - LogManager.logDetail(LogConstants.CTX_BUFFER_MGR, "Starting memory buffer cleaner"); //$NON-NLS-1$ - asynchPool.execute(cleaningTask); - if (lowBlocks(true)) { - //do a non-blocking removal before we're forced to block - evictFromMemoryBuffer(false); - } - } - } else if (lowBlocks(true)) { + if (!cleanerRunning.get() && lowBlocks(false) && cleanerRunning.compareAndSet(false, true)) { + LogManager.logDetail(LogConstants.CTX_BUFFER_MGR, "Starting memory buffer cleaner"); //$NON-NLS-1$ + asynchPool.execute(cleaningTask); + } + if (lowBlocks(true)) { //do a non-blocking removal before we're forced to block evictFromMemoryBuffer(false); } @@ -931,6 +931,12 @@ } if (bm != null) { result = bm.free(acquireDataBlock); + freedLock.lock(); + try { + blocksFreed.signalAll(); + } finally { + freedLock.unlock(); + } } } } @@ -993,8 +999,27 @@ } } if (acquire && next == EMPTY_ADDRESS) { - throw new AssertionError("Could not free space for pending write"); //$NON-NLS-1$ + if (!writeLocked) { + memoryEvictionLock.writeLock().lock(); + writeLocked = true; + } + freedLock.lock(); + try { + next = blocksInuse.getAndSetNextClearBit(); + if (next != EMPTY_ADDRESS) { + return next; + } + blocksFreed.await(120, TimeUnit.SECONDS); + } finally { + freedLock.unlock(); + } + next = blocksInuse.getAndSetNextClearBit(); + if (next == EMPTY_ADDRESS) { + throw new AssertionError("Could not free space for pending write"); //$NON-NLS-1$ + } } + } catch (InterruptedException e) { + throw new TeiidRuntimeException(e); } finally { if (writeLocked) { memoryEvictionLock.writeLock().unlock(); Modified: trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java =================================================================== --- trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java 2011-11-11 20:22:49 UTC (rev 3638) +++ trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java 2011-11-12 12:46:01 UTC (rev 3639) @@ -608,15 +608,12 @@ if (LogManager.isMessageToBeRecorded(LogConstants.CTX_BUFFER_MGR, MessageLevel.TRACE)) { LogManager.logTrace(LogConstants.CTX_BUFFER_MGR, "Releasing buffer space", count); //$NON-NLS-1$ } - if (lock.tryLock()) { - try { - this.reserveBatchBytes.addAndGet(count); - batchesFreed.signalAll(); - } finally { - lock.unlock(); - } - } else { - this.reserveBatchBytes.addAndGet(count); + lock.lock(); + try { + this.reserveBatchBytes.addAndGet(count); + batchesFreed.signalAll(); + } finally { + lock.unlock(); } } Modified: trunk/engine/src/test/java/org/teiid/common/buffer/impl/TestBufferFrontedFileStoreCache.java =================================================================== --- trunk/engine/src/test/java/org/teiid/common/buffer/impl/TestBufferFrontedFileStoreCache.java 2011-11-11 20:22:49 UTC (rev 3638) +++ trunk/engine/src/test/java/org/teiid/common/buffer/impl/TestBufferFrontedFileStoreCache.java 2011-11-12 12:46:01 UTC (rev 3639) @@ -36,7 +36,7 @@ public class TestBufferFrontedFileStoreCache { - private final class SimpleSerializer implements Serializer<Integer> { + private final static class SimpleSerializer implements Serializer<Integer> { @Override public Integer deserialize(ObjectInput ois) throws IOException, ClassNotFoundException { @@ -138,7 +138,7 @@ assertEquals(0, cache.getInodesInUse()); } - private CacheEntry get(BufferFrontedFileStoreCache cache, Long oid, + private static CacheEntry get(BufferFrontedFileStoreCache cache, Long oid, Serializer<Integer> s) throws TeiidComponentException { PhysicalInfo o = cache.lockForLoad(oid, s); CacheEntry ce = cache.get(o, oid, new WeakReference<Serializer<?>>(s)); @@ -166,8 +166,8 @@ cache.addToCacheGroup(s.getId(), ce.getId()); cache.add(ce, s); - assertEquals(3, cache.getDataBlocksInUse()); - assertEquals(1, cache.getInodesInUse()); + assertTrue(cache.getDataBlocksInUse() < 4); + assertTrue(cache.getInodesInUse() < 2); ce = get(cache, 2l, s); assertEquals(Integer.valueOf(5000), ce.getObject()); @@ -176,7 +176,7 @@ assertEquals(Integer.valueOf(5001), ce.getObject()); } - private BufferFrontedFileStoreCache createLayeredCache(int bufferSpace, int objectSize) throws TeiidComponentException { + private static BufferFrontedFileStoreCache createLayeredCache(int bufferSpace, int objectSize) throws TeiidComponentException { BufferFrontedFileStoreCache fsc = new BufferFrontedFileStoreCache(); fsc.setMemoryBufferSpace(bufferSpace); fsc.setMaxStorageObjectSize(objectSize);

12 years, 11 months

1
0
0 / 0

teiid SVN: r3638 - in trunk/engine/src: main/java/org/teiid/query/optimizer/relational/plantree and 1 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-11-11 15:22:49 -0500 (Fri, 11 Nov 2011) New Revision: 3638 Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/PlanNode.java trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java Log: TEIID-1823 fix for subquery evaluation in the passing clause Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2011-11-11 19:53:20 UTC (rev 3637) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2011-11-11 20:22:49 UTC (rev 3638) @@ -298,7 +298,7 @@ private void connectSubqueryContainers(PlanNode plan) throws QueryPlannerException, QueryMetadataException, TeiidComponentException { Set<GroupSymbol> groupSymbols = getGroupSymbols(plan); - for (PlanNode node : NodeEditor.findAllNodes(plan, NodeConstants.Types.PROJECT | NodeConstants.Types.SELECT | NodeConstants.Types.JOIN)) { + for (PlanNode node : NodeEditor.findAllNodes(plan, NodeConstants.Types.PROJECT | NodeConstants.Types.SELECT | NodeConstants.Types.JOIN | NodeConstants.Types.SOURCE)) { List<SubqueryContainer> subqueryContainers = node.getSubqueryContainers(); if (subqueryContainers.isEmpty()){ continue; Modified: trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/PlanNode.java =================================================================== --- trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/PlanNode.java 2011-11-11 19:53:20 UTC (rev 3637) +++ trunk/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/PlanNode.java 2011-11-11 20:22:49 UTC (rev 3638) @@ -38,6 +38,7 @@ import org.teiid.query.sql.LanguageObject; import org.teiid.query.sql.lang.Criteria; import org.teiid.query.sql.lang.SubqueryContainer; +import org.teiid.query.sql.lang.TableFunctionReference; import org.teiid.query.sql.symbol.ElementSymbol; import org.teiid.query.sql.symbol.Expression; import org.teiid.query.sql.symbol.GroupSymbol; @@ -376,6 +377,13 @@ toSearch = (List<Criteria>) this.getProperty(NodeConstants.Info.JOIN_CRITERIA); break; } + case NodeConstants.Types.SOURCE: { + TableFunctionReference tfr = (TableFunctionReference)this.getProperty(NodeConstants.Info.TABLE_FUNCTION); + if (tfr != null) { + toSearch = Arrays.asList(tfr); + } + break; + } } return ValueIteratorProviderCollectorVisitor.getValueIteratorProviders(toSearch); } Modified: trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java =================================================================== --- trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java 2011-11-11 19:53:20 UTC (rev 3637) +++ trunk/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java 2011-11-11 20:22:49 UTC (rev 3638) @@ -193,6 +193,21 @@ process(sql, expected); } + @Test public void testXmlTablePassingSubquery() throws Exception { + String sql = "select * from xmltable('/a/b' passing (SELECT xmlelement(name a, xmlAgg(xmlelement(name b, e1))) from pm1.g1) columns val string path '/.') as x"; //$NON-NLS-1$ + + List<?>[] expected = new List<?>[] { + Arrays.asList("a"), + Arrays.asList(""), + Arrays.asList("a"), + Arrays.asList("c"), + Arrays.asList("b"), + Arrays.asList("a") + }; + + process(sql, expected); + } + @Test public void testXmlTableInView() throws Exception { String sql = "select * from g1"; //$NON-NLS-1$

12 years, 11 months

1
0
0 / 0

teiid SVN: r3637 - 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-11 14:53:20 -0500 (Fri, 11 Nov 2011) New Revision: 3637 Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java Log: TEIID-1750 fix for lob streaming. lobs must be run through the lobmanager before being returned to the client 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-11 15:33:45 UTC (rev 3636) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2011-11-11 19:53:20 UTC (rev 3637) @@ -522,6 +522,9 @@ } addToCache(); synchronized (lobStreams) { + if (resultsBuffer.isLobs()) { + super.flushBatchDirect(batch, false); + } add = sendResultsIfNeeded(batch); if (cid != null) { return; Modified: trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java =================================================================== --- trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java 2011-11-11 15:33:45 UTC (rev 3636) +++ trunk/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java 2011-11-11 19:53:20 UTC (rev 3637) @@ -90,6 +90,13 @@ TestMMDatabaseMetaData.compareResultSet(s.getResultSet()); } + @Test public void testLobStreaming() throws Exception { + Statement s = conn.createStatement(); + assertTrue(s.execute("select xmlelement(name \"root\") from tables")); + s.getResultSet().next(); + assertEquals("<root></root>", s.getResultSet().getString(1)); + } + /** * Ensures if you start more than the maxActivePlans * where all the plans take up more than output buffer limit

12 years, 11 months

1
0
0 / 0

teiid SVN: r3636 - in trunk: adminshell and 37 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-11-11 10:33:45 -0500 (Fri, 11 Nov 2011) New Revision: 3636 Modified: trunk/adminshell/pom.xml trunk/api/pom.xml trunk/build/pom.xml trunk/cache-jbosscache/pom.xml trunk/client-jdk15/pom.xml trunk/client/pom.xml trunk/common-core/pom.xml trunk/connectors/connector-file/pom.xml trunk/connectors/connector-ldap/pom.xml trunk/connectors/connector-salesforce/pom.xml trunk/connectors/connector-ws/pom.xml trunk/connectors/pom.xml trunk/connectors/salesforce-api/pom.xml trunk/connectors/sandbox/pom.xml trunk/connectors/sandbox/translator-yahoo/pom.xml trunk/connectors/translator-file/pom.xml trunk/connectors/translator-jdbc/pom.xml trunk/connectors/translator-ldap/pom.xml trunk/connectors/translator-loopback/pom.xml trunk/connectors/translator-olap/pom.xml trunk/connectors/translator-salesforce/pom.xml trunk/connectors/translator-ws/pom.xml trunk/console/pom.xml trunk/documentation/admin-guide/pom.xml trunk/documentation/caching-guide/pom.xml trunk/documentation/client-developers-guide/pom.xml trunk/documentation/developer-guide/pom.xml trunk/documentation/pom.xml trunk/documentation/quick-start-example/pom.xml trunk/documentation/reference/pom.xml trunk/engine/pom.xml trunk/hibernate-dialect/pom.xml trunk/jboss-integration/pom.xml trunk/metadata/pom.xml trunk/pom.xml trunk/runtime/pom.xml trunk/test-integration/common/pom.xml trunk/test-integration/db/pom.xml trunk/test-integration/pom.xml Log: correcting pom versions Modified: trunk/adminshell/pom.xml =================================================================== --- trunk/adminshell/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/adminshell/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</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>teiid-adminshell</artifactId> Modified: trunk/api/pom.xml =================================================================== --- trunk/api/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/api/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</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>teiid-api</artifactId> Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/build/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</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>teiid</artifactId> Modified: trunk/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/cache-jbosscache/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</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>teiid-cache-jbosscache</artifactId> Modified: trunk/client/pom.xml =================================================================== --- trunk/client/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/client/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</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>teiid-client</artifactId> Modified: trunk/client-jdk15/pom.xml =================================================================== --- trunk/client-jdk15/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/client-jdk15/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</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>teiid-client-jdk15</artifactId> Modified: trunk/common-core/pom.xml =================================================================== --- trunk/common-core/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/common-core/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</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>teiid-common-core</artifactId> Modified: trunk/connectors/connector-file/pom.xml =================================================================== --- trunk/connectors/connector-file/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/connectors/connector-file/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -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>connector-file</artifactId> Modified: trunk/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/connectors/connector-ldap/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -2,7 +2,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>connector-ldap</artifactId> Modified: trunk/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/connectors/connector-salesforce/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -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>connector-salesforce</artifactId> Modified: trunk/connectors/connector-ws/pom.xml =================================================================== --- trunk/connectors/connector-ws/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/connectors/connector-ws/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -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>connector-ws</artifactId> Modified: trunk/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/connectors/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</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> <groupId>org.jboss.teiid</groupId> Modified: trunk/connectors/salesforce-api/pom.xml =================================================================== --- trunk/connectors/salesforce-api/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/connectors/salesforce-api/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -2,7 +2,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>salesforce-api</artifactId> Modified: trunk/connectors/sandbox/pom.xml =================================================================== --- trunk/connectors/sandbox/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/connectors/sandbox/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -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> <groupId>org.jboss.teiid.connectors</groupId> Modified: trunk/connectors/sandbox/translator-yahoo/pom.xml =================================================================== --- trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>teiid-7.6.0.CR1-SNAPSHOT</version> + <version>7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-yahoo</artifactId> Modified: trunk/connectors/translator-file/pom.xml =================================================================== --- trunk/connectors/translator-file/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/connectors/translator-file/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -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-file</artifactId> Modified: trunk/connectors/translator-jdbc/pom.xml =================================================================== --- trunk/connectors/translator-jdbc/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/connectors/translator-jdbc/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -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-jdbc</artifactId> Modified: trunk/connectors/translator-ldap/pom.xml =================================================================== --- trunk/connectors/translator-ldap/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/connectors/translator-ldap/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -2,7 +2,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-ldap</artifactId> Modified: trunk/connectors/translator-loopback/pom.xml =================================================================== --- trunk/connectors/translator-loopback/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/connectors/translator-loopback/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -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-loopback</artifactId> Modified: trunk/connectors/translator-olap/pom.xml =================================================================== --- trunk/connectors/translator-olap/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/connectors/translator-olap/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -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-olap</artifactId> Modified: trunk/connectors/translator-salesforce/pom.xml =================================================================== --- trunk/connectors/translator-salesforce/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/connectors/translator-salesforce/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -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-salesforce</artifactId> Modified: trunk/connectors/translator-ws/pom.xml =================================================================== --- trunk/connectors/translator-ws/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/connectors/translator-ws/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -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-ws</artifactId> Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/console/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</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> Modified: trunk/documentation/admin-guide/pom.xml =================================================================== --- trunk/documentation/admin-guide/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/documentation/admin-guide/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>teiid-7.6.0.CR1-SNAPSHOT</version> + <version>7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>admin-guide</artifactId> Modified: trunk/documentation/caching-guide/pom.xml =================================================================== --- trunk/documentation/caching-guide/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/documentation/caching-guide/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>teiid-7.6.0.CR1-SNAPSHOT</version> + <version>7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>caching-guide</artifactId> Modified: trunk/documentation/client-developers-guide/pom.xml =================================================================== --- trunk/documentation/client-developers-guide/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/documentation/client-developers-guide/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>teiid-7.6.0.CR1-SNAPSHOT</version> + <version>7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>client-developers-guide</artifactId> Modified: trunk/documentation/developer-guide/pom.xml =================================================================== --- trunk/documentation/developer-guide/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/documentation/developer-guide/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>teiid-7.6.0.CR1-SNAPSHOT</version> + <version>7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>developer-guide</artifactId> Modified: trunk/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/documentation/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</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> <groupId>org.jboss.teiid</groupId> Modified: trunk/documentation/quick-start-example/pom.xml =================================================================== --- trunk/documentation/quick-start-example/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/documentation/quick-start-example/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>teiid-7.6.0.CR1-SNAPSHOT</version> + <version>7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>quick-start-example</artifactId> Modified: trunk/documentation/reference/pom.xml =================================================================== --- trunk/documentation/reference/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/documentation/reference/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>teiid-7.6.0.CR1-SNAPSHOT</version> + <version>7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>reference</artifactId> Modified: trunk/engine/pom.xml =================================================================== --- trunk/engine/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/engine/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</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>teiid-engine</artifactId> Modified: trunk/hibernate-dialect/pom.xml =================================================================== --- trunk/hibernate-dialect/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/hibernate-dialect/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</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>teiid-hibernate-dialect</artifactId> Modified: trunk/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/jboss-integration/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</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> <groupId>org.jboss.teiid</groupId> Modified: trunk/metadata/pom.xml =================================================================== --- trunk/metadata/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/metadata/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</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>teiid-metadata</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -5,7 +5,7 @@ <artifactId>teiid-parent</artifactId> <packaging>pom</packaging> <name>Teiid</name> - <version>teiid-7.6.0.CR1-SNAPSHOT</version> + <version>7.6.0.CR1-SNAPSHOT</version> <description>Federated SQL and XML query engine.</description> <properties> <ant.version>1.7.0</ant.version> @@ -125,15 +125,6 @@ </plugins> </pluginManagement> <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.2.1</version> - <configuration> - <preparationGoals>clean install</preparationGoals> - </configuration> - </plugin>  <plugin> <groupId>org.apache.maven.plugins</groupId> Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/runtime/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</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> <groupId>org.jboss.teiid</groupId> Modified: trunk/test-integration/common/pom.xml =================================================================== --- trunk/test-integration/common/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/test-integration/common/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-test-integration</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>test-integration-common</artifactId> Modified: trunk/test-integration/db/pom.xml =================================================================== --- trunk/test-integration/db/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/test-integration/db/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -9,7 +9,7 @@ <parent> <artifactId>teiid-test-integration</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> Modified: trunk/test-integration/pom.xml =================================================================== --- trunk/test-integration/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) +++ trunk/test-integration/pom.xml 2011-11-11 15:33:45 UTC (rev 3636) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</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>teiid-test-integration</artifactId>

12 years, 11 months

1
0
0 / 0

teiid SVN: r3635 - in trunk: adminshell and 37 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-11-10 14:13:29 -0500 (Thu, 10 Nov 2011) New Revision: 3635 Modified: trunk/adminshell/pom.xml trunk/api/pom.xml trunk/build/pom.xml trunk/cache-jbosscache/pom.xml trunk/client-jdk15/pom.xml trunk/client/pom.xml trunk/common-core/pom.xml trunk/connectors/connector-file/pom.xml trunk/connectors/connector-ldap/pom.xml trunk/connectors/connector-salesforce/pom.xml trunk/connectors/connector-ws/pom.xml trunk/connectors/pom.xml trunk/connectors/salesforce-api/pom.xml trunk/connectors/sandbox/pom.xml trunk/connectors/sandbox/translator-yahoo/pom.xml trunk/connectors/translator-file/pom.xml trunk/connectors/translator-jdbc/pom.xml trunk/connectors/translator-ldap/pom.xml trunk/connectors/translator-loopback/pom.xml trunk/connectors/translator-olap/pom.xml trunk/connectors/translator-salesforce/pom.xml trunk/connectors/translator-ws/pom.xml trunk/console/pom.xml trunk/documentation/admin-guide/pom.xml trunk/documentation/caching-guide/pom.xml trunk/documentation/client-developers-guide/pom.xml trunk/documentation/developer-guide/pom.xml trunk/documentation/pom.xml trunk/documentation/quick-start-example/pom.xml trunk/documentation/reference/pom.xml trunk/engine/pom.xml trunk/hibernate-dialect/pom.xml trunk/jboss-integration/pom.xml trunk/metadata/pom.xml trunk/pom.xml trunk/runtime/pom.xml trunk/test-integration/common/pom.xml trunk/test-integration/db/pom.xml trunk/test-integration/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/adminshell/pom.xml =================================================================== --- trunk/adminshell/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/adminshell/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-adminshell</artifactId> Modified: trunk/api/pom.xml =================================================================== --- trunk/api/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/api/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-api</artifactId> Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/build/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid</artifactId> Modified: trunk/cache-jbosscache/pom.xml =================================================================== --- trunk/cache-jbosscache/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/cache-jbosscache/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-cache-jbosscache</artifactId> Modified: trunk/client/pom.xml =================================================================== --- trunk/client/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/client/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client</artifactId> Modified: trunk/client-jdk15/pom.xml =================================================================== --- trunk/client-jdk15/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/client-jdk15/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client-jdk15</artifactId> Modified: trunk/common-core/pom.xml =================================================================== --- trunk/common-core/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/common-core/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-common-core</artifactId> Modified: trunk/connectors/connector-file/pom.xml =================================================================== --- trunk/connectors/connector-file/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/connectors/connector-file/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-file</artifactId> Modified: trunk/connectors/connector-ldap/pom.xml =================================================================== --- trunk/connectors/connector-ldap/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/connectors/connector-ldap/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ldap</artifactId> Modified: trunk/connectors/connector-salesforce/pom.xml =================================================================== --- trunk/connectors/connector-salesforce/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/connectors/connector-salesforce/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-salesforce</artifactId> Modified: trunk/connectors/connector-ws/pom.xml =================================================================== --- trunk/connectors/connector-ws/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/connectors/connector-ws/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ws</artifactId> Modified: trunk/connectors/pom.xml =================================================================== --- trunk/connectors/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/connectors/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/connectors/salesforce-api/pom.xml =================================================================== --- trunk/connectors/salesforce-api/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/connectors/salesforce-api/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>salesforce-api</artifactId> Modified: trunk/connectors/sandbox/pom.xml =================================================================== --- trunk/connectors/sandbox/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/connectors/sandbox/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid.connectors</groupId> Modified: trunk/connectors/sandbox/translator-yahoo/pom.xml =================================================================== --- trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/connectors/sandbox/translator-yahoo/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-yahoo</artifactId> Modified: trunk/connectors/translator-file/pom.xml =================================================================== --- trunk/connectors/translator-file/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/connectors/translator-file/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-file</artifactId> Modified: trunk/connectors/translator-jdbc/pom.xml =================================================================== --- trunk/connectors/translator-jdbc/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/connectors/translator-jdbc/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-jdbc</artifactId> Modified: trunk/connectors/translator-ldap/pom.xml =================================================================== --- trunk/connectors/translator-ldap/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/connectors/translator-ldap/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ldap</artifactId> Modified: trunk/connectors/translator-loopback/pom.xml =================================================================== --- trunk/connectors/translator-loopback/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/connectors/translator-loopback/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-loopback</artifactId> Modified: trunk/connectors/translator-olap/pom.xml =================================================================== --- trunk/connectors/translator-olap/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/connectors/translator-olap/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-olap</artifactId> Modified: trunk/connectors/translator-salesforce/pom.xml =================================================================== --- trunk/connectors/translator-salesforce/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/connectors/translator-salesforce/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-salesforce</artifactId> Modified: trunk/connectors/translator-ws/pom.xml =================================================================== --- trunk/connectors/translator-ws/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/connectors/translator-ws/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ws</artifactId> Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/console/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/documentation/admin-guide/pom.xml =================================================================== --- trunk/documentation/admin-guide/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/documentation/admin-guide/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>admin-guide</artifactId> Modified: trunk/documentation/caching-guide/pom.xml =================================================================== --- trunk/documentation/caching-guide/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/documentation/caching-guide/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>caching-guide</artifactId> Modified: trunk/documentation/client-developers-guide/pom.xml =================================================================== --- trunk/documentation/client-developers-guide/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/documentation/client-developers-guide/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>client-developers-guide</artifactId> Modified: trunk/documentation/developer-guide/pom.xml =================================================================== --- trunk/documentation/developer-guide/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/documentation/developer-guide/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>developer-guide</artifactId> Modified: trunk/documentation/pom.xml =================================================================== --- trunk/documentation/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/documentation/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/documentation/quick-start-example/pom.xml =================================================================== --- trunk/documentation/quick-start-example/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/documentation/quick-start-example/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>quick-start-example</artifactId> Modified: trunk/documentation/reference/pom.xml =================================================================== --- trunk/documentation/reference/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/documentation/reference/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>reference</artifactId> Modified: trunk/engine/pom.xml =================================================================== --- trunk/engine/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/engine/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-engine</artifactId> Modified: trunk/hibernate-dialect/pom.xml =================================================================== --- trunk/hibernate-dialect/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/hibernate-dialect/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-hibernate-dialect</artifactId> Modified: trunk/jboss-integration/pom.xml =================================================================== --- trunk/jboss-integration/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/jboss-integration/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/metadata/pom.xml =================================================================== --- trunk/metadata/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/metadata/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-metadata</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -5,16 +5,16 @@ <artifactId>teiid-parent</artifactId> <packaging>pom</packaging> <name>Teiid</name> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> <description>Federated SQL and XML query engine.</description> <properties> <ant.version>1.7.0</ant.version> <site.url>http://www.jboss.org/teiid</site.url> </properties> <scm> - <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-7.6.0.Beta2</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/tags/teiid-parent-7.6.0.Beta2</developerConnection> - <url>http://anonsvn.jboss.org/repos/teiid/tags/teiid-parent-7.6.0.Beta2</url> + <connection>scm:svn:https://anonsvn.jboss.org/repos/teiid/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/teiid/trunk</developerConnection> + <url>http://anonsvn.jboss.org/repos/teiid/trunk</url> </scm> <licenses> <license> Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/runtime/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: trunk/test-integration/common/pom.xml =================================================================== --- trunk/test-integration/common/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/test-integration/common/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>test-integration-common</artifactId> Modified: trunk/test-integration/db/pom.xml =================================================================== --- trunk/test-integration/db/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/test-integration/db/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -9,7 +9,7 @@ <parent> <artifactId>teiid-test-integration</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: trunk/test-integration/pom.xml =================================================================== --- trunk/test-integration/pom.xml 2011-11-10 19:13:11 UTC (rev 3634) +++ trunk/test-integration/pom.xml 2011-11-10 19:13:29 UTC (rev 3635) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Beta2</version> + <version>teiid-7.6.0.CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-test-integration</artifactId>

12 years, 11 months

1
0
0 / 0

teiid SVN: r3634 - tags.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2011-11-10 14:13:11 -0500 (Thu, 10 Nov 2011) New Revision: 3634 Added: tags/teiid-parent-7.6.0.Beta2/ Log: [maven-release-plugin] copy for tag teiid-parent-7.6.0.Beta2

12 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

teiid-commits November 2011