=
Teiid ${project.version} Release Notes
-Teiid ${project.version} adds ODBC and caching features. = +
Teiid ${project.version} adds ODBC, SQL, and caching features. = =
Overview
-
@@ -26,6 +26,8 @@
Highlights
-
+
- ODBC Support - Support for ODBC access is now available thr= ough PostgreSQL ODBC driver clients. See the Client Developer's Guide for = more on how + to use Teiid's ODBC access. =
- SQL Support
- =
- Added NULLS FIST/LAST handling - including pushdown support= . = @@ -33,6 +35,7 @@
- Added support for the boolean aggregate functions ANY, SOME= , EVERY.
- Added support for using boolean value expression as both cr= iteria and expressions, e.g. "... where boolean_value" or "select x =3D 1 a= s boolean_value ...".
- Changed named procedure syntax to accept param=3D>value, ra= ther than param=3Dvalue. +
- Added PRIMARY KEY and the associated index support to temp = tables.
- Parallel Source Queries - reestablished parallel execution = of source queries within a query plan along with a prioritized work system = to help prevent resource contention.
- SHOW Statement - added client handling for the SHOW stateme=
nt to retrieve query plan information and see parameter values.
Modified: trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java 2010-07-28=
18:04:14 UTC (rev 2386)
+++ trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java 2010-07-28=
18:27:57 UTC (rev 2387)
@@ -712,9 +712,9 @@
StatementImpl statement =3D createMockStatement(ResultSet.TYPE_FORWAR=
D_ONLY);
ResultsFuture
future =3D new ResultsFuture (); future.getResultsReceiver().receiveResults(new LobChunk("".getByt= es(Charset.forName("UTF-8")), true)); - Mockito.stub(statement.getDQP().requestNextLobChunk(0, 0, null)).toRe= turn(future); + XMLType result =3D new XMLType(); + Mockito.stub(statement.getDQP().requestNextLobChunk(0, 0, result.getR= eferenceStreamId())).toReturn(future); ResultsMessage resultsMsg =3D new ResultsMessage(); - XMLType result =3D new XMLType(); result.setEncoding("UTF-8"); resultsMsg.setResults(new List[] {Arrays.asList(result)}); resultsMsg.setLastRow(1); Modified: trunk/common-core/src/main/java/org/teiid/core/types/Streamable.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java 20= 10-07-28 18:04:14 UTC (rev 2386) +++ trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java 20= 10-07-28 18:27:57 UTC (rev 2387) @@ -27,6 +27,7 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import java.nio.charset.Charset; +import java.util.concurrent.atomic.AtomicInteger; = import org.teiid.core.CorePlugin; = @@ -43,12 +44,14 @@ = private static final long serialVersionUID =3D -8252488562134729374L; = + private static AtomicInteger counter =3D new AtomicInteger(); + = public static final String ENCODING =3D "UTF-8"; //$NON-NLS-1$ public static final Charset CHARSET =3D Charset.forName(ENCODING); public static final String FORCE_STREAMING =3D "FORCE_STREAMING"; //$N= ON-NLS-1$ public static final int STREAMING_BATCH_SIZE_IN_BYTES =3D 102400; // 1= 00K = - private String referenceStreamId; + private String referenceStreamId =3D String.valueOf(counter.getAndIncr= ement()); protected transient T reference; protected long length =3D -1; = @@ -80,9 +83,9 @@ return this.referenceStreamId; } = - public void setReferenceStreamId(String id) { + /*public void setReferenceStreamId(String id) { this.referenceStreamId =3D id; - } + }*/ = @Override public String toString() { Modified: trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValu= e.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java= 2010-07-28 18:04:14 UTC (rev 2386) +++ trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java= 2010-07-28 18:27:57 UTC (rev 2387) @@ -51,9 +51,8 @@ String testString =3D "this is test clob"; //$NON-NLS-1$ SerialBlob blob =3D new SerialBlob(testString.getBytes()); = - String key =3D "keytodata"; //$NON-NLS-1$ BlobType bv =3D new BlobType(blob); - bv.setReferenceStreamId(key); = + String key =3D bv.getReferenceStreamId(); = // now force to serialize File saved =3D new File(UnitTestUtil.getTestScratchPath()+"/blobas= saved.bin"); //$NON-NLS-1$ Modified: trunk/common-core/src/test/java/org/teiid/core/types/TestClobValu= e.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java= 2010-07-28 18:04:14 UTC (rev 2386) +++ trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java= 2010-07-28 18:27:57 UTC (rev 2387) @@ -52,9 +52,8 @@ String testString =3D "this is test clob"; //$NON-NLS-1$ SerialClob clob =3D new SerialClob(testString.toCharArray()); = - String key =3D "keytodata"; //$NON-NLS-1$ ClobType cv =3D new ClobType(clob); - cv.setReferenceStreamId(key); = + String key =3D cv.getReferenceStreamId(); = // now force to serialize File saved =3D new File(UnitTestUtil.getTestScratchPath()+"/clobas= saved.bin"); //$NON-NLS-1$ Modified: trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java = 2010-07-28 18:04:14 UTC (rev 2386) +++ trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java = 2010-07-28 18:27:57 UTC (rev 2387) @@ -51,10 +51,8 @@ String testString =3D " this is an xml value test "; //$N= ON-NLS-1$ SQLXMLImpl xml =3D new SQLXMLImpl(testString); = = - String key =3D "keytodata"; //$NON-NLS-1$ - String pkey =3D "peresistkeytodata"; //$NON-NLS-1$ XMLType xv =3D new XMLType(xml); - xv.setReferenceStreamId(key); = + String key =3D xv.getReferenceStreamId(); = // now force to serialize File saved =3D new File(UnitTestUtil.getTestScratchPath()+"/xmlsav= ed.bin"); //$NON-NLS-1$ Modified: trunk/documentation/client-developers-guide/src/main/docbook/en-U= S/content/odbc.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/client-developers-guide/src/main/docbook/en-US/cont= ent/odbc.xml 2010-07-28 18:04:14 UTC (rev 2386) +++ trunk/documentation/client-developers-guide/src/main/docbook/en-US/cont= ent/odbc.xml 2010-07-28 18:27:57 UTC (rev 2387) @@ -6,37 +6,36 @@ODBC Support = -Short for Open DataBase Connectivity, a standard database access= method developed by the SQL Access group in 1992. = - The goal of ODBC is to make it possible to access any data from any ap= plication, regardless of which database management = - system (DBMS) is handling the data. ODBC manages this by inserting a m= iddle layer, called a database driver , = - between an application and the DBMS. The purpose of this layer is to t= ranslate the application's data queries = + = -Open DataBase Connectivity (ODBC) is a standard database access = method developed by the SQL Access group in 1992. = + ODBC, just like JDBC in Java, allows consistent client access regardle= ss of which database management = + system (DBMS) is handling the data. ODBC uses a driver to translate t= he application's data queries = into commands that the DBMS understands. For this to work, both the ap= plication and the DBMS must be ODBC-compliant = -- that is, the application must be capable of issuing ODBC commands a= nd the = - DBMS must be capable of responding to them + DBMS must be capable of responding to them.Teiid provides the ODBC access to deployed VDBs in the Teiid run= time through = - +PostgreSQL 's ODBC d= river. This is possible by redirecting the ODBC commands = - from a client application to a different port than default PostgreSQL= port.Teiid can provide ODBC access to deployed VDBs in the Teiid runt= ime through = + =PostgreSQL 's ODBC d= river. = + This is possible because Teiid has specialized handling that allows i= t emulate a PostgreSQL server and respond appropriate to expected + metadata queries.By default, ODBC on the Teiid is enabled and running on o= n port 35432 .Before your application can use the ODBC, you must first instal= l ODBC driver on same machine that = - your application is running and then create Data Source Name (DSN) fo= r that represents a connection profile for your Teiid VDB. + Before an application can use ODBC, you must first install the = ODBC driver on same machine that = + the application is running on and then create Data Source Name (DSN) = that represents a connection profile for your Teiid VDB. =Installing the ODBC Driver Client -The PostgreSQL ODBC driver that is needed to make the ODBC c= onnection to Teiid is +not = - bundled with Teiid distribution. The driver needs bedownloaded = - directly from PostgreSQL web site. We have tested with8= .04.200 version of the ODBC driver for = - this release.A PostgreSQL ODBC driver needed to make the ODBC connection = to Teiid is =not = + bundled with the Teiid distribution. The appropriate driver needs = bedownloaded = + directly from the PostgreSQL web site. We have tested with Microsoft Windows Download the ODBC driver from PostgreSQL download site . If you are looking for 6= 4-bit Windows driver download the driver fromhere .Extract the contents of the ZIP file into = a temporary location on you system. For example: "c:\temp\pgodbc" +Extract the contents of the ZIP file into = a temporary location on your system. For example: "c:\temp\pgodbc" Double click on "psqlodbc.msi" file or (.e= xe file in the case of 64 bit) to start installation of the driver. <= /listitem>The Wizard appears as @@ -62,7 +61,7 @@If you want to install in a different directory = than the default that is already selected, = - click the "Browse" button and select a directory if yo= u want install. = + click the "Browse" button and select a directory. = Click "Next" to start installing in the selected direc= tory. @@ -88,10 +87,10 @@ Other *nix Platform Installations -For all other platforms other than Microsoft Windows, th= e ODBC driver needs compiled and built from the = + For all other platforms other than Microsoft Windows, th= e ODBC driver needs built from the = source files provided. Download the ODBC driver source files f= rom = - PostgreSQL download site . Untar the files to a tem= porary location. For example: "~/tmp/pgodbc". = + the PostgreSQL download site. Untar the files to a= temporary location. For example: "~/tmp/pgodbc". = Build and install the driver by running the commands below= .You should use super user account or use "sudo" co= mmand for running the "make install" command. - = - The the next step in the process is to create a DSN for = accessing the Teiid VDB. +Some *nix distributions may already provide binary forms= of the appropriate driver, which can be used as an alternative to + building from source. |
+<CREATE> <LOCAL> <TEMPORARY> <TABLE> id <LPAREN> createElements= WithTypes ( <COMMA> <PRIMARY> n= onReserved <LPAREN> id ( <CO= MMA> id )* <RPAREN> )? <RPAREN&g= t;createTempTable ::=3D = -<CREATE> <LOCAL> <TEMPORARY> <TABLE> id <LPAREN> createElements= WithTypes <RPAREN> -
errorStatement errorStatement ::=3D = -<ERROR> expression -
+( ifStatement | l= oopStatement | whileStatement |statement statement ::=3D = -( ifStatement | l= oopStatement | whileStatement | -
+( sqlStatement | = errorStatement | assignStatement | <= link linkend=3D"prod25">declareStatement | = continueStatement | breakStatement )= <SEMICOLON>delimitedStatement delimitedStatement ::=3D = -( sqlStatement | = errorStatement | assignStatement | <= link linkend=3D"prod24">declareStatement | = continueStatement | breakStatement )= <SEMICOLON> -
+( statement | ( <BEGIN> ( statement )* <END> ) )block block ::=3D = -( statement | ( <BEGIN> ( statement )* <END> ) ) -
breakStatement breakStatement ::=3D = <BREAK> -
continueStatement continueStatement ::=3D = <CONTINUE> -
+<WHILE> <LPAREN> criteria <= RPAREN> blockwhileStatement whileStatement ::=3D = -<WHILE> <LPAREN> criteria <= RPAREN> block -
+<LOOP> <ON> <LPAREN> queryExpres= sion <RPAREN> <AS> idloopStatement loopStatement ::=3D = -<LOOP> <ON> <LPAREN> queryExpres= sion <RPAREN> <AS> id -
+<IF> <LPAREN> criteria <RPA= REN> block ( <ELSE> block )?ifStatement ifStatement ::=3D = -<IF> <LPAREN> criteria <RPA= REN> block ( <ELSE> block )? -
criteriaSelector criteriaSelector ::=3D = ( ( <EQ> | <NE> | <NE2> | <LE> | <GE> | <= LT> | <GT> | <IN> | <LIKE> | ( <IS> <NULL>= ) | <BETWEEN> ) )? <CRITERIA> ( <ON> <LPAREN> -
+<HAS> criteriaSelectorhasCriteria hasCriteria ::=3D = -<HAS> criteriaSelector -
+<DECLARE> dataType id ( <EQ> assignStatementOpera= nd )?declareStatement declareStatement ::=3D = -<DECLARE> dataType id ( <EQ> assignStatementOpera= nd )? -
+id <EQ> assi= gnStatementOperandassignStatement assignStatement ::=3D = -id <EQ> assi= gnStatementOperand -
+( ( insert ) | upd= ate | delete | storedProcedure | ( expression ) = | queryExpression )assignStatementOperand assignStatementOperand ::=3D = -( ( insert ) | upd= ate | delete | storedProcedure | ( expression ) = | queryExpression ) -
+( ( dynamicCommand ) | userCommand )sqlStatement sqlStatement ::=3D = -( ( dynamicCommand ) | userCommand ) -
+<TRANSLATE> criteriaSelector ( <W= ITH> <LPAREN> id <EQ> expression ( <COMMA> id <EQ> expression )* <RPA= REN> )?translateCriteria translateCriteria ::=3D = -<TRANSLATE> criteriaSelector ( <W= ITH> <LPAREN> id <EQ> expression ( <COMMA> id <EQ> expression )* <RPA= REN> )? |
+<CREATE> ( <VIRTUAL> )? ( <UPDATE> )? <PROCEDURE> = blockcreateUpdateProcedure ::=3D = -<CREATE> ( <VIRTUAL> )? ( <UPDATE> )? <PROCEDURE> = block -
+( <EXECUTE> | <EXEC> ) <STRING> expression ( <AS> createElementsWith= Types ( <INTO> id )? )? ( <U= SING> setClauseList )? ( <UPDATE> = ( ( <INTEGERVAL> ) | ( <STAR> ) ) )?dynamicCommand dynamicCommand ::=3D = -( <EXECUTE> | <EXEC> ) <STRING> expression ( <AS> createElementsWith= Types ( <INTO> id )? )? ( <U= SING> setClauseList )? ( <UPDATE> = ( ( <INTEGERVAL> ) | ( <STAR> ) ) )? -
setClauseList setClauseList ::=3D = id <EQ> ( <COMMA> id <EQ> )* |
+id dataType= ( <COMMA> id dataType )*createElementsWithTypes ::=3D = -id dataType= ( <COMMA> id dataType )* |
+<LBRACE> ( <QMARK> <EQ> )? <CALL> id ( <LPAREN> ( executeUnname= dParams ) <RPAREN> )? <RBRACE> ( option )?callableStatement ::=3D = -<LBRACE> ( <QMARK> <EQ> )? <CALL> id ( <LPAREN> ( executeUnname= dParams ) <RPAREN> )? <RBRACE> ( option )? storedProcedure ::=3D = -( ( ( <EXEC> ) | ( <EXECUTE> ) | ( <CALL> ) ) id <LPAREN> ( executeNa= medParams | executeUnnamedParams ) &= lt;RPAREN> ) ( option )? -
+( expression ( <COMMA> expression )* )?executeUnnamedParams executeUnnamedParams ::=3D = -( expression ( <COMMA> expression )* )? -
+( id <EQ> ( <GT> )? expression ( <COMMA> id<= /link> <EQ> ( <GT> )? expression )* )executeNamedParams executeNamedParams ::=3D = -( id <EQ> ( <GT> )? expression ( <COMMA> id<= /link> <EQ> ( <GT> )? expression )* ) |
+<INSERT> <INTO> id ( <LPAREN= > id ( <COMMA> id )* <RPAREN> )? ( ( <VALUES> rowValues ) | ( queryExpression )= ) ( option )?insert ::=3D = -<INSERT> <INTO> id ( <LPAREN= > id ( <COMMA> id )* <RPAREN> )? ( ( <VALUES> rowValues ) | ( queryExpression )= ) ( option )? -
+<LPAREN> expression ( <COMMA> = expression )* <RPAREN>=rowValues rowValues ::=3D = -<LPAREN> expression ( <COMMA> = expression )* <RPAREN> |
+<UPDATE> id <SET> setClauseList ( where )?= ( option )?update ::=3D = -<UPDATE> id <SET> setClauseList ( where )?= ( option )? |
+<DELETE> <FROM> id ( where )? ( option )?<= /para>delete ::=3D = -<DELETE> <FROM> id ( where )? ( option )?<= /para> |
+queryExpressionBodyqueryExpression ::=3D = -queryExpressionBody -
+queryTerm ( ( <UNION> | <EXCEPT&g= t; ) ( <ALL> | <DISTINCT> )? queryTerm= )* ( orderby )? ( limit )? ( option )?<= /entry>queryExpressionBody queryExpressionBody ::=3D = -queryTerm ( ( <UNION> | <EXCEPT&g= t; ) ( <ALL> | <DISTINCT> )? queryTerm= )* ( orderby )? ( limit )? ( option )? <= /entry>-
+queryPrimary ( <INTERSECT> ( <ALL= > | <DISTINCT> )? queryPrimary )*<= /para>queryTerm queryTerm ::=3D = -queryPrimary ( <INTERSECT> ( <ALL= > | <DISTINCT> )? queryPrimary )*<= /para> -
queryPrimary queryPrimary ::=3D = -( query | ( <LPAREN> queryExpressionBody <RPAREN> ) ) -
query query ::=3D = -select ( into -
into into ::=3D = <INTO> ( id ) -
+<SELECT> ( <ALL> | ( <DISTINCT> ) )? ( <STAR> | ( = selectSymbol ( <COMMA> selectSymbol )* ) )select select ::=3D = -<SELECT> ( <ALL> | ( <DISTINCT> ) )? ( <STAR> | ( = selectSymbol ( <COMMA> selectSymbol )* ) ) -
+( selectExpression | allInGroupSymbol )selectSymbol selectSymbol ::=3D = -( selectExpression | allInGroupSymbol ) -
+( expression ( ( <AS> )? id )? )selectExpression selectExpression ::=3D = -( expression ( ( <AS> )? id )? ) -
+( expression ( <AS> id )? )derivedColumn derivedColumn ::=3D = -( expression ( <AS> id )? ) -
allInGroupSymbol allInGroupSymbol ::=3D = <ALL_IN_GROUP> -
xmlAgg xmlAgg ::=3D = -<XMLAGG> <LPAREN> expression (= orderby )? <RPAREN> -
+( ( nonReserved <LPAREN> <STAR>= ; <RPAREN> ) | ( ( nonReserved | <= ANY> | <SOME> ) <LPAREN> ( <DISTINCT> | <ALL> )?= expression <RPAREN> ) )aggregateSymbol aggregateSymbol ::=3D = -( ( nonReserved <LPAREN> <STAR>= ; <RPAREN> ) | ( ( nonReserved | <= ANY> | <SOME> ) <LPAREN> ( <DISTINCT> | <ALL> )?= expression <RPAREN> ) ) -
from from ::=3D = <FROM> ( tableReference ( <COMMA&= gt; tableReference )* ) |
+( ( <LBRACE> nonReserved joinedTable <RBRACE> ) | joinedTable )tableReference ::=3D = -( ( <LBRACE> nonReserved joinedTable <RBRACE> ) | joinedTable ) joinedTable ::=3D = @@ -599,7 +599,7 @@ |
+( ( ( <RIGHT> ( <OUTER> )? ) | ( <LEFT> ( <OUTER> = )? ) | ( <FULL> ( <OUTER> )? ) | <INNER> )? <JOIN> = tableReference <ON> criteria )qualifiedJoin ::=3D = -( ( ( <RIGHT> ( <OUTER> )? ) | ( <LEFT> ( <OUTER> = )? ) | ( <FULL> ( <OUTER> )? ) | <INNER> )? <JOIN> = tableReference <ON> criteria ) tablePrimary ::=3D = @@ -607,31 +607,31 @@ |
+<XMLSERIALIZE> <LPAREN> ( nonReserved= )? expression ( <AS> ( <ST= RING> | <VARCHAR> | <CLOB> ) )? <RPAREN>xmlSerialize ::=3D = -<XMLSERIALIZE> <LPAREN> ( nonReserved= )? expression ( <AS> ( <ST= RING> | <VARCHAR> | <CLOB> ) )? <RPAREN> -
nonReserved nonReserved ::=3D = <ID> |
+<ID> <LPAREN> expressiontextTable ::=3D = -<ID> <LPAREN> expression |
+id dataType= ( <ID> intVal )?textColumn ::=3D = -id dataType= ( <ID> intVal )? |
+<XMLQUERY> <LPAREN> ( xmlNamespaces <COMMA> )? stringVal ( <ID>= ; derivedColumn ( <COMMA> derivedColumn )* )? ( ( <NULL> | nonReserved ) <ON> nonRes= erved )? <RPAREN>xmlQuery ::=3D = -<XMLQUERY> <LPAREN> ( xmlNamespaces <COMMA> )? stringVal ( <ID>= ; derivedColumn ( <COMMA> derivedColumn )* )? ( ( <NULL> | nonReserved ) <ON> nonRes= erved )? <RPAREN> |
+<XMLTABLE> <LPAREN> ( xmlNamespaces <COMMA> )? stringVal ( <ID>= ; derivedColumn ( <COMMA> derivedColumn )* )? ( <ID> xmlColumn ( <COMMA> xmlColumn )* )? <RPAREN> ( <AS> )? id<= /para>xmlTable ::=3D = -<XMLTABLE> <LPAREN> ( xmlNamespaces <COMMA> )? stringVal ( <ID>= ; derivedColumn ( <COMMA> derivedColumn )* )? ( <ID> xmlColumn ( <COMMA> xmlColumn )* )? <RPAREN> ( <AS> )? id<= /para> |
+id ( ( <FOR> nonReserved ) | ( dataType ( <DE= FAULT_KEYWORD> expression )? ( nonReserved stringVal= )? ) )xmlColumn ::=3D = -id ( ( <FOR> nonReserved ) | ( dataType ( <DE= FAULT_KEYWORD> expression )? ( nonReserved stringVal= )? ) ) intVal ::=3D = @@ -645,11 +645,11 @@ ::=3D = ( <ID> ( ( <AS> )? id )? ) -
+<WHERE> criteriawhere where ::=3D = -<WHERE> criteria -
criteria criteria ::=3D = compoundCritOr @@ -667,7 +667,7 @@
|
+( translateCriteria | ( commonValueExpression ( ( betweenCri= t | matchCrit | setCrit | isNullCrit | subqueryCompareCriteria | = compareCrit ) )? ) | existsCriteria = | hasCriteria )booleanPrimary ::=3D = -( translateCriteria | ( commonValueExpression ( ( betweenCri= t | matchCrit | setCrit | isNullCrit | subqueryCompareCriteria | = compareCrit ) )? ) | existsCriteria = | hasCriteria ) operator ::=3D = @@ -709,41 +709,41 @@ ::=3D = <EXISTS> subquery -
groupBy groupBy ::=3D = <GROUP> <BY> ( groupByItem ( &= lt;COMMA> groupByItem )* ) |
+expressiongroupByItem ::=3D = -expression -
having having ::=3D = -<HAVING> criteria -
orderby orderby ::=3D = <ORDER> <BY> sortSpecification= ( <COMMA> sortSpecification )* |
+sortKey ( <ASC> | <DESC> )? ( = nonReserved nonRes= erved )?sortSpecification ::=3D = -sortKey ( <ASC> | <DESC> )? ( = nonReserved nonRes= erved )? |
+expressionsortKey ::=3D = -expression -
limit limit ::=3D = <LIMIT> ( <INTEGERVAL> | <QMARK> ) ( <COMMA> ( <= ;INTEGERVAL> | <QMARK> ) )? -
option option ::=3D = <OPTION> ( <MAKEDEP> id ( <C= OMMA> id )* | <MAKENOTDEP> id ( <COMMA> id= )* | <NOCACHE> ( id ( <COMMA> <= link linkend=3D"prod2">id )* )? )* -
+criteriaexpression expression ::=3D = -criteria commonValueExpression ::=3D = @@ -767,19 +767,19 @@ |
+( <QMARK> | literal | ( <LBRACE&g= t; nonReserved fun= ction <RBRACE> ) | ( aggregateSymbol<= /link> ) | ( aggregateSymbol ) | ( aggregateSymbol ) | ( xmlA= gg ) | ( function ) | ( <ID> )= | subquery | ( <LPAREN> expression <RPAREN> ) | = searchedCaseExpression | caseExpression )valueExpressionPrimary ::=3D = -( <QMARK> | literal | ( <LBRACE&g= t; nonReserved fun= ction <RBRACE> ) | ( aggregateSymbol<= /link> ) | ( aggregateSymbol ) | ( aggregateSymbol ) | ( xmlA= gg ) | ( function ) | ( <ID> )= | subquery | ( <LPAREN> expression <RPAREN> ) | = searchedCaseExpression | caseExpression ) |
+<CASE> expression ( <WHEN>caseExpression ::=3D = -<CASE> expression ( <WHEN> |
+<CASE> ( <WHEN> criteria <T= HEN> expression )+ ( <ELSE> expression )? <END>searchedCaseExpression ::=3D = -<CASE> ( <WHEN> criteria <T= HEN> expression )+ ( <ELSE> expression )? <END> function ::=3D = -( ( <CONVERT> <LPAREN> expression stringConstant ::=3D = @@ -787,23 +787,23 @@ xmlParse ::=3D = -<XMLPARSE> <LPAREN> nonReserved |
+nonReserved <LPAREN> expression ( <COMMA> deri= vedColumn )* <RPAREN>queryString ::=3D = -nonReserved <LPAREN> expression ( <COMMA> deri= vedColumn )* <RPAREN> |
+<XMLELEMENT> <LPAREN> ( <ID> id<= /link> | id ) ( <COMMA> xmlNamespaces )? ( <COMMA> xmlAttributes )? ( <COMMA> express= ion )* <RPAREN>xmlElement ::=3D = -<XMLELEMENT> <LPAREN> ( <ID> id<= /link> | id ) ( <COMMA> xmlNamespaces )? ( <COMMA> xmlAttributes )? ( <COMMA> express= ion )* <RPAREN> |
+<XMLATTRIBUTES> <LPAREN> derivedColum= n ( <COMMA> derivedColumn )* &= lt;RPAREN>xmlAttributes ::=3D = -<XMLATTRIBUTES> <LPAREN> derivedColum= n ( <COMMA> derivedColumn )* &= lt;RPAREN> |
+<XMLFOREST> <LPAREN> ( xmlNamespaces<= /link> <COMMA> )? derivedColumn ( <= ;COMMA> derivedColumn )* <RPAREN><= /para>xmlForest ::=3D = -<XMLFOREST> <LPAREN> ( xmlNamespaces<= /link> <COMMA> )? derivedColumn ( <= ;COMMA> derivedColumn )* <RPAREN><= /para> xmlNamespaces ::=3D = @@ -825,13 +825,13 @@ ::=3D = id -
dataType dataType ::=3D = ( <STRING> | <VARCHAR> | <BOOLEAN> | <BYTE> | <= TINYINT> | <SHORT> | <SMALLINT> | <CHAR> | <INTEGER= > | <LONG> | <BIGINT> | <BIGINTEGER> | <FLOAT> |= <REAL> | <DOUBLE> | <BIGDECIMAL> | <DECIMAL> | <= ;DATE> | <TIME> | <TIMESTAMP> | <OBJECT> | <BLOB>= ; | <CLOB> | <XML> ) |
+( nonReserved )intervalType ::=3D = -( nonReserved ) literal ::=3D = Modified: trunk/documentation/reference/src/main/docbook/en-US/content/sql_= support.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/reference/src/main/docbook/en-US/content/sql_suppor= t.xml 2010-07-28 18:04:14 UTC (rev 2386) +++ trunk/documentation/reference/src/main/docbook/en-US/content/sql_suppor= t.xml 2010-07-28 18:27:57 UTC (rev 2387) @@ -639,7 +639,7 @@ Temp tables can be defined implicitly by referencing them in a - SELECT INTO or in an INSERT statement or explicitly with a CREATE TA= BLE + INSERT statement or explicitly with a CREATE TABLE statement. Implicitly created temp tables must have a name that starts with '#'. @@ -647,31 +647,39 @@Creation syntax: - CREATE LOCAL TEMPORARY TABLE<temporary table name> (&l= t;column name> <data type>,...) + CREATE LOCAL TEMPORARY TABLE x (column type, ... [PRIMARY KE= Y (column, ...)]) - -SELECT <column name>,...INTO <temporary table name>= FROM <table name> + INSERT INTO #x (column, ...) VALUES (value, ...) - INSERT INTO <temporary table name> ((<column name>,= ...)VALUES (<value>,...) - -Drop syntax: - DROP TABLE <temporary table name> + DROP TABLE x + +Primary Key Support ++ +All key columns must be comparable. ++ +Use of a primary key creates a clustered index that support= s search improvements for comparison, in, like, and order by. ++ +Null is an allowable primary key value, but there must be o= nly 1 row that has an all null key. +Limitations: = - With the CREATE TABLE syntax only basic table definition (co= lumn name and type information) is supported. + With the CREATE TABLE syntax only basic table definition (co= lumn name and type information) and an optional primary key are supported. = @@ -691,8 +699,13 @@ = =- = +temp tables are non-transactional. + Temp tables are non-transactional. = ++ =Lob values (xml, clob, blob) are tracked by reference rather= than by value in a temporary table. = + Lob values from external sources that are inserted in a temporary = table may become unreadable when the associated statement or connection is = closed. + =The following example is a series of statements that loads a tem= porary table with data from 2 sources, and with a manually inserted record,= and then uses that temp table in a subsequent query. Added: trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java = (rev 0) +++ trunk/engine/src/main/java/org/teiid/common/buffer/LobManager.java 2010= -07-28 18:27:57 UTC (rev 2387) @@ -0,0 +1,94 @@ +/* + * 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.common.buffer; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import org.teiid.core.TeiidComponentException; +import org.teiid.core.types.DataTypeManager; +import org.teiid.core.types.Streamable; +import org.teiid.dqp.DQPPlugin; +import org.teiid.query.sql.symbol.Expression; + +/** + * Tracks lob references so they are not lost during serialization. + * TODO: for temp tables we may need to have a copy by value management st= rategy + */ +public class LobManager { + + private Map()); - } - = public List insert(List tuple, boolean replace) throws TeiidComponentExce= ption { LinkedList places =3D new LinkedList (); List match =3D find(tuple, places); @@ -306,7 +306,8 @@ = public void remove() { truncate(); - this.manager.remove(); + this.keyManager.remove(); + this.leafManager.remove(); } = public int getRowCount() { Modified: trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java 2010= -07-28 18:04:14 UTC (rev 2386) +++ trunk/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java 2010= -07-28 18:27:57 UTC (rev 2387) @@ -63,13 +63,6 @@ public TupleBatch() { } = - public static TupleBatch directBatch(int rowOffset, List - tuples)=
{
- TupleBatch result =3D new TupleBatch();
- result.rowOffset =3D rowOffset;
- result.tuples =3D tuples;
- return result;
- }
- =
/**
* Constructor
* @param beginRow indicates the row of the tuple source which is the
@@ -156,10 +149,6 @@
this.terminationFlag =3D terminationFlag; =
}
=
- public String[] getDataTypes() {
- return types;
- }
- =
public void setDataTypes(String[] types) {
this.types =3D types;
}
Modified: trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java 201=
0-07-28 18:04:14 UTC (rev 2386)
+++ trunk/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java 201=
0-07-28 18:27:57 UTC (rev 2387)
@@ -27,8 +27,6 @@
import java.util.ListIterator;
import java.util.Map;
import java.util.TreeMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
=
import org.teiid.core.TeiidComponentException;
import org.teiid.core.types.DataTypeManager;
@@ -61,8 +59,6 @@
return types;
}
=
- private static final AtomicLong LOB_ID =3D new AtomicLong();
- =
//construction state
private BatchManager manager;
private String tupleSourceID;
@@ -77,36 +73,28 @@
private boolean removed;
private boolean forwardOnly;
=
- //lob management
- private Map
- rows) throws TeiidComponentE=
xception {
- int columns =3D schema.size();
- // walk through the results and find all the lobs
- for (List list : rows) {
- correctLobReferences(columns, list);
- }
- }
-
- private void correctLobReferences(int columns, List list)
- throws TeiidComponentException {
- for (int col =3D 0; col < columns; col++) { =
=
- Object anObj =3D list.get(col);
- =
- if (!(anObj instanceof Streamable)) {
- continue;
- }
- Streamable lob =3D (Streamable)anObj; =
- String id =3D lob.getReferenceStreamId();
- if (id =3D=3D null) {
- id =3D String.valueOf(LOB_ID.getAndIncrement());
- lob.setReferenceStreamId(id);
- }
- if (this.lobReferences =3D=3D null) {
- this.lobReferences =3D new ConcurrentHashMap
(batch); + } else { + assert persistent; } } catch (IOException e) { throw new TeiidComponentException(e); + } catch (Throwable e) { + throw new TeiidComponentException(e); } finally { persistent =3D true; activeBatch =3D null; @@ -343,6 +361,9 @@ if (info !=3D null) { batchManager.unusedSpace.addAndGet(info[1]); = } + if (lobManager !=3D null) { + lobManager.clear(); + } activeBatch =3D null; batchReference =3D null; } @@ -444,23 +465,24 @@ public TupleBuffer createTupleBuffer(final List elements, String group= Name, TupleSourceType tupleSourceType) { final String newID =3D String.valueOf(this.tsId.getAndIncrement()); - = - BatchManager batchManager =3D new BatchManagerImpl(newID, elements.si= ze()); - TupleBuffer tupleBuffer =3D new TupleBuffer(batchManager, newID, e= lements, getProcessorBatchSize()); + int[] lobIndexes =3D LobManager.getLobIndexes(elements); + BatchManager batchManager =3D new BatchManagerImpl(newID, elements.si= ze(), lobIndexes); + TupleBuffer tupleBuffer =3D new TupleBuffer(batchManager, newID, e= lements, lobIndexes, getProcessorBatchSize()); LogManager.logDetail(LogConstants.CTX_BUFFER_MGR, "Creating TupleB= uffer:", newID, "of type ", tupleSourceType); //$NON-NLS-1$ //$NON-NLS-2$ return tupleBuffer; } = public STree createSTree(final List elements, String groupName, TupleS= ourceType tupleSourceType, int keyLength) { - final String newID =3D String.valueOf(this.tsId.getAndIncrement()); - = - BatchManager bm =3D new BatchManagerImpl(newID, elements.size()); + String newID =3D String.valueOf(this.tsId.getAndIncrement()); + int[] lobIndexes =3D LobManager.getLobIndexes(elements); + BatchManager bm =3D new BatchManagerImpl(newID, elements.size(), lobI= ndexes); + BatchManager keyManager =3D new BatchManagerImpl(String.valueOf(this.= tsId.getAndIncrement()), keyLength, null); int[] compareIndexes =3D new int[keyLength]; for (int i =3D 1; i < compareIndexes.length; i++) { compareIndexes[i] =3D i; } LogManager.logDetail(LogConstants.CTX_BUFFER_MGR, "Creating STree:= ", newID, "of type ", tupleSourceType); //$NON-NLS-1$ //$NON-NLS-2$ - return new STree(bm, new ListNestedSortComparator(compareIndexes), ge= tProcessorBatchSize(), keyLength, TupleBuffer.getTypeNames(elements)); + return new STree(keyManager, bm, new ListNestedSortComparator(compare= Indexes), getProcessorBatchSize(), keyLength, TupleBuffer.getTypeNames(elem= ents)); } = @Override Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request= WorkItem.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkIt= em.java 2010-07-28 18:04:14 UTC (rev 2386) +++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkIt= em.java 2010-07-28 18:27:57 UTC (rev 2387) @@ -193,7 +193,7 @@ LogManager.logDetail(LogConstants.CTX_DQP, e, "Request Thread", r= equestID, "- error occurred"); //$NON-NLS-1$ //$NON-NLS-2$ = if (!isCanceled()) { - dqpCore.logMMCommand(this, Event.CANCEL, null); + dqpCore.logMMCommand(this, Event.ERROR, null); //Case 5558: Differentiate between system level errors and //processing errors. Only log system level errors as erro= rs, = //log the processing errors as warnings only Modified: trunk/engine/src/main/java/org/teiid/query/tempdata/TempTable.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/org/teiid/query/tempdata/TempTable.java 2010= -07-28 18:04:14 UTC (rev 2386) +++ trunk/engine/src/main/java/org/teiid/query/tempdata/TempTable.java 2010= -07-28 18:27:57 UTC (rev 2387) @@ -288,7 +288,7 @@ SortUtility sort =3D new SortUtility(ts, orderBy.getOrderByItems(), Mod= e.SORT, bm, sessionID); tb =3D sort.sort(); } else { - tb =3D bm.createTupleBuffer(getColumns(), sessionID, TupleSourceType.PR= OCESSOR); + tb =3D bm.createTupleBuffer(projectedCols, sessionID, TupleSourceType.P= ROCESSOR); List next =3D null; while ((next =3D ts.nextTuple()) !=3D null) { tb.addTuple(next); @@ -359,7 +359,7 @@ protected void tuplePassed(List tuple) = throws BlockedException, TeiidComponentException, TeiidProcessing= Exception { if (rowId !=3D null) { - tuple.add(0, rowId.getAndAdd(1)); + tuple.add(0, rowId.getAndIncrement()); } insertTuple(tuple); } Modified: trunk/engine/src/test/java/org/teiid/common/buffer/TestTupleBuffe= r.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/org/teiid/common/buffer/TestTupleBuffer.java= 2010-07-28 18:04:14 UTC (rev 2386) +++ trunk/engine/src/test/java/org/teiid/common/buffer/TestTupleBuffer.java= 2010-07-28 18:27:57 UTC (rev 2387) @@ -67,7 +67,7 @@ ElementSymbol x =3D new ElementSymbol("x"); //$NON-NLS-1$ x.setType(DataTypeManager.DefaultDataClasses.INTEGER); List schema =3D Arrays.asList(x); - TupleBuffer tb =3D new TupleBuffer(new FakeBatchManager(), "x", schema, = 32); //$NON-NLS-1$ = + TupleBuffer tb =3D new TupleBuffer(new FakeBatchManager(), "x", schema, = null, 32); //$NON-NLS-1$ = tb.setForwardOnly(true); tb.addTuple(Arrays.asList(1)); TupleBatch batch =3D tb.getBatch(1); @@ -90,11 +90,11 @@ ElementSymbol x =3D new ElementSymbol("x"); //$NON-NLS-1$ x.setType(DataTypeManager.DefaultDataClasses.CLOB); List schema =3D Arrays.asList(x); - TupleBuffer tb =3D new TupleBuffer(new FakeBatchManager(), "x", schema, = 32); //$NON-NLS-1$ + TupleBuffer tb =3D new TupleBuffer(new FakeBatchManager(), "x", schema, = LobManager.getLobIndexes(schema), 32); //$NON-NLS-1$ ClobType c =3D new ClobType(new SerialClob(new char[0])); TupleBatch batch =3D new TupleBatch(1, new List[] {Arrays.asList(c)}); tb.addTupleBatch(batch, false); - assertNotNull(c.getReferenceStreamId()); + assertNotNull(tb.getLobReference(c.getReferenceStreamId())); } = } --===============5438220590264745684==--