January 2013 - teiid-commits - Jboss List Archives

teiid SVN: r4545 - in branches/7.7.x/engine/src: main/java/org/teiid/query/processor/proc and 2 other directories.

by teiid-commits＠lists.jboss.org

Author: shawkins Date: 2013-01-17 13:36:23 -0500 (Thu, 17 Jan 2013) New Revision: 4545 Modified: branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java branches/7.7.x/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java branches/7.7.x/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.java branches/7.7.x/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java Log: TEIID-2205 fix for procedure/block/local connection txn issues Modified: branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java =================================================================== --- branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2013-01-15 16:56:56 UTC (rev 4544) +++ branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2013-01-17 18:36:23 UTC (rev 4545) @@ -266,7 +266,6 @@ this.context.setRequestId(this.requestId); this.context.setDQPWorkContext(this.workContext); this.context.setTransactionService(this.transactionService); - this.context.setTransactionContext(this.transactionContext); } @Override @@ -374,6 +373,7 @@ tc.setIsolationLevel(requestMsg.getTransactionIsolation()); this.transactionContext = tc; + this.context.setTransactionContext(tc); this.processor = new QueryProcessor(processPlan, context, bufferManager, processorDataManager); } Modified: branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java =================================================================== --- branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2013-01-15 16:56:56 UTC (rev 4544) +++ branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2013-01-17 18:36:23 UTC (rev 4545) @@ -349,13 +349,13 @@ } private void resume() throws XATransactionException { - if (this.transactionState == TransactionState.ACTIVE && isSuspendable()) { + if (this.transactionState == TransactionState.ACTIVE) { this.transactionService.resume(this.transactionContext); } } private boolean isSuspendable() { - return !this.useCallingThread && this.transactionContext.getTransaction() != null; + return this.transactionContext.getTransaction() != null && !(this.useCallingThread && this.transactionContext.getTransactionType() == Scope.GLOBAL); } private void suspend() { Modified: branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java =================================================================== --- branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java 2013-01-15 16:56:56 UTC (rev 4544) +++ branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java 2013-01-17 18:36:23 UTC (rev 4545) @@ -60,6 +60,10 @@ import org.teiid.query.QueryPlugin; +/** + * Note that the begin methods do not leave the transaction associated with the + * calling thread. This is by design and requires explicit resumes for association. + */ public class TransactionServerImpl implements TransactionService { private static class TransactionMapping { @@ -425,8 +429,17 @@ } public void resume(TransactionContext context) throws XATransactionException { - try { - this.transactionManager.resume(context.getTransaction()); + try { + //if we're already associated, just return + if (this.transactionManager.getTransaction() == context.getTransaction()) { + return; + } + } catch (SystemException e) { + } + try { + this.transactionManager.resume(context.getTransaction()); + } catch (IllegalStateException e) { + throw new XATransactionException(e); } catch (InvalidTransactionException e) { throw new XATransactionException(e); } catch (SystemException e) { Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java =================================================================== --- branches/7.7.x/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java 2013-01-15 16:56:56 UTC (rev 4544) +++ branches/7.7.x/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java 2013-01-17 18:36:23 UTC (rev 4545) @@ -140,7 +140,6 @@ private boolean requiresTransaction = true; private TransactionContext blockContext; - private boolean inTxn; /** * Resources cannot be held open across the txn boundary. This list is a hack at ensuring the resources are closed. */ @@ -219,7 +218,6 @@ beginBatch = 1; batchRows = null; lastBatch = false; - inTxn = false; //reset program stack programs.clear(); LogManager.logTrace(org.teiid.logging.LogConstants.CTX_DQP, "ProcedurePlan reset"); //$NON-NLS-1$ @@ -277,15 +275,13 @@ @Override public TupleBatch nextBatch() throws BlockedException, TeiidComponentException, TeiidProcessingException { - if (blockContext != null && !this.inTxn) { + if (blockContext != null) { this.getContext().getTransactionServer().resume(blockContext); - this.inTxn = true; } try { return nextBatchDirect(); } finally { if (blockContext != null) { - this.inTxn = false; this.getContext().getTransactionServer().suspend(blockContext); } } @@ -606,9 +602,7 @@ TransactionContext tc = this.blockContext; this.blockContext = null; try { - if (!inTxn) { - this.getContext().getTransactionServer().resume(tc); - } + this.getContext().getTransactionServer().resume(tc); for (WeakReference<DataTierTupleSource> ref : txnTupleSources) { DataTierTupleSource dtts = ref.get(); if (dtts != null) { @@ -642,9 +636,8 @@ if (tc != null && tc.getTransactionType() == Scope.NONE) { //start a transaction this.getContext().getTransactionServer().begin(tc); - this.inTxn = true; this.blockContext = tc; - this.peek().setStartedTxn(true); + program.setStartedTxn(true); } } } Modified: branches/7.7.x/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.java =================================================================== --- branches/7.7.x/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.java 2013-01-15 16:56:56 UTC (rev 4544) +++ branches/7.7.x/engine/src/test/java/org/teiid/dqp/internal/process/TestRequest.java 2013-01-17 18:36:23 UTC (rev 4545) @@ -45,7 +45,6 @@ import org.teiid.query.tempdata.TempTableStore; import org.teiid.query.tempdata.TempTableStore.TransactionMode; import org.teiid.query.unittest.RealMetadataFactory; -import org.teiid.query.util.ContextProperties; @@ -126,6 +125,7 @@ Request request = helpProcessMessage(message, null, workContext); assertEquals("1", request.context.getConnectionID()); //$NON-NLS-1$ + assertNotNull(request.context.getTransactionContext()); } private Request helpProcessMessage(RequestMessage message, SessionAwareCache<PreparedPlan> cache, DQPWorkContext workContext) throws TeiidComponentException, Modified: branches/7.7.x/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java =================================================================== --- branches/7.7.x/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java 2013-01-15 16:56:56 UTC (rev 4544) +++ branches/7.7.x/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java 2013-01-17 18:36:23 UTC (rev 4545) @@ -2523,7 +2523,7 @@ } Mockito.verify(ts).begin(tc); - Mockito.verify(ts).resume(tc); + Mockito.verify(ts, Mockito.times(2)).resume(tc); Mockito.verify(ts, Mockito.times(0)).commit(tc); Mockito.verify(ts).rollback(tc); }

11 years, 11 months

1
0
0 / 0

[teiid/teiid] 3d9b5b: Adding the generated WAR as non-persistent deploym...

by Ramesh Reddy

Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: 3d9b5b88506c2290f47e03f775061367c2ddb4e4 https://github.com/teiid/teiid/commit/3d9b5b88506c2290f47e03f775061367c2d... Author: rareddy <rareddy(a)jboss.org> Date: 2013-01-16 (Wed, 16 Jan 2013) Changed paths: M admin/src/main/java/org/teiid/adminapi/AdminFactory.java M jboss-integration/src/main/java/org/teiid/jboss/rest/ResteasyEnabler.java M jboss-integration/src/main/java/org/teiid/jboss/rest/TeiidRSProvider.java Log Message: ----------- Adding the generated WAR as non-persistent deployment, so that it gets deployed every time VDB gets deployed Commit: 57321c43dcfd6da1c7b642dca826eccca39bdb12 https://github.com/teiid/teiid/commit/57321c43dcfd6da1c7b642dca826eccca39... Author: rareddy <rareddy(a)jboss.org> Date: 2013-01-17 (Thu, 17 Jan 2013) Changed paths: M jboss-integration/src/main/java/org/teiid/jboss/rest/ResteasyEnabler.java M jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties Log Message: ----------- rolling back non-persistent storage as during the shutdown scenario, the war file is not being cleaned from content directory Commit: 1b0bd75242a96df26e43f90694bbbd4964a623b5 https://github.com/teiid/teiid/commit/1b0bd75242a96df26e43f90694bbbd4964a... Author: Ramesh Reddy <rareddy(a)jboss.org> Date: 2013-01-17 (Thu, 17 Jan 2013) Changed paths: M admin/src/main/java/org/teiid/adminapi/AdminFactory.java M jboss-integration/src/main/java/org/teiid/jboss/rest/ResteasyEnabler.java M jboss-integration/src/main/java/org/teiid/jboss/rest/TeiidRSProvider.java M jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties Log Message: ----------- Merge pull request #36 from rareddy/TEIID-2350 Teiid 2350 Compare: https://github.com/teiid/teiid/compare/c4a62817b54a...1b0bd75242a9

11 years, 11 months

1
0
0 / 0

[teiid/teiid] c4a628: TEIID-2352 additional refinements to plans in the ...

by shawkins

Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: c4a62817b54a2389d50e750bca3db546b061ea60 https://github.com/teiid/teiid/commit/c4a62817b54a2389d50e750bca3db546b06... Author: shawkins <shawkins(a)redhat.com> Date: 2013-01-17 (Thu, 17 Jan 2013) Changed paths: M api/src/main/java/org/teiid/logging/CommandLogMessage.java M engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java Log Message: ----------- TEIID-2352 additional refinements to plans in the command log

11 years, 11 months

1
0
0 / 0

[teiid/teiid] de9100: TEIID-2352 correcting log entry check

by shawkins

Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: de9100ebf4f10d7f685fe8e750d82756a050f530 https://github.com/teiid/teiid/commit/de9100ebf4f10d7f685fe8e750d82756a05... Author: shawkins <shawkins(a)redhat.com> Date: 2013-01-17 (Thu, 17 Jan 2013) Changed paths: M engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java Log Message: ----------- TEIID-2352 correcting log entry check

11 years, 11 months

1
0
0 / 0

[teiid/teiid] 947a75: TEIID-2351 setting the update type on generated pr...

by shawkins

Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: 947a75ccaed3d840150ebb28da0995ad3876e2e6 https://github.com/teiid/teiid/commit/947a75ccaed3d840150ebb28da0995ad387... Author: shawkins <shawkins(a)redhat.com> Date: 2013-01-16 (Wed, 16 Jan 2013) Changed paths: M engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java M engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java Log Message: ----------- TEIID-2351 setting the update type on generated procedures

11 years, 11 months

1
0
0 / 0

[teiid/teiid] 439376: TEIID-1543 adding a tighter bound on how concurren...

by shawkins

Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: 439376ae465d1e81f184da24b6e2a87b885c5e6b https://github.com/teiid/teiid/commit/439376ae465d1e81f184da24b6e2a87b885... Author: shawkins <shawkins(a)redhat.com> Date: 2013-01-16 (Wed, 16 Jan 2013) Changed paths: M engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java M engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java Log Message: ----------- TEIID-1543 adding a tighter bound on how concurrency limited tasks are launched

11 years, 11 months

1
0
0 / 0

[teiid/teiid] c95775: Adding the VDB context to the events such that fur...

by Ramesh Reddy

Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: c957750548ff0c1d995f695013010672c9c2288d https://github.com/teiid/teiid/commit/c957750548ff0c1d995f695013010672c9c... Author: rareddy <rareddy(a)jboss.org> Date: 2013-01-16 (Wed, 16 Jan 2013) Changed paths: M api/src/main/java/org/teiid/events/EventListener.java M jboss-integration/src/main/java/org/teiid/jboss/VDBService.java M jboss-integration/src/main/java/org/teiid/jboss/rest/ResteasyEnabler.java M runtime/src/main/java/org/teiid/deployers/EventDistributorImpl.java M runtime/src/main/java/org/teiid/deployers/VDBRepository.java M runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java M test-integration/common/src/test/java/org/teiid/events/TestEventDistributor.java Log Message: ----------- Adding the VDB context to the events such that further calls are necessary to get to the VDB Commit: 45c29474bf1337f6ae8c9f20a48e5647cb1cc909 https://github.com/teiid/teiid/commit/45c29474bf1337f6ae8c9f20a48e5647cb1... Author: Ramesh Reddy <rareddy(a)jboss.org> Date: 2013-01-16 (Wed, 16 Jan 2013) Changed paths: M api/src/main/java/org/teiid/events/EventListener.java M jboss-integration/src/main/java/org/teiid/jboss/VDBService.java M jboss-integration/src/main/java/org/teiid/jboss/rest/ResteasyEnabler.java M runtime/src/main/java/org/teiid/deployers/EventDistributorImpl.java M runtime/src/main/java/org/teiid/deployers/VDBRepository.java M runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java M test-integration/common/src/test/java/org/teiid/events/TestEventDistributor.java Log Message: ----------- Merge pull request #35 from rareddy/TEIID-2182 Adding the VDB context to the events such that further calls are necessa... Compare: https://github.com/teiid/teiid/compare/c56d36c0e455...45c29474bf13

11 years, 11 months

1
0
0 / 0

[confluence] Teiid 8.3 (draft) > DML Commands

by Steven Hawkins (Confluence)

11 years, 11 months

1
0
0 / 0

[confluence] Teiid 8.3 (draft) > DML Commands

by Steven Hawkins (Confluence)

11 years, 11 months

1
0
0 / 0

[confluence] Teiid 8.3 (draft) > DDL Commands

by Steven Hawkins (Confluence)

11 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 January 2013