You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/11/17 17:58:55 UTC
[1/3] incubator-trafodion git commit: Fix for the core/TEST106
failure caused due to JIRA TRAFODION-1625
Repository: incubator-trafodion
Updated Branches:
refs/heads/master ed09cc1d9 -> b3d2eb4e1
Fix for the core/TEST106 failure caused due to JIRA TRAFODION-1625
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/adafbd5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/adafbd5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/adafbd5f
Branch: refs/heads/master
Commit: adafbd5f0159ef18fcbd052e1c11b231ee3a9099
Parents: cce8b85
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Sun Nov 15 01:01:44 2015 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Sun Nov 15 01:01:44 2015 +0000
----------------------------------------------------------------------
core/sql/generator/GenPreCode.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/adafbd5f/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenPreCode.cpp b/core/sql/generator/GenPreCode.cpp
index cae42d2..f4950af 100644
--- a/core/sql/generator/GenPreCode.cpp
+++ b/core/sql/generator/GenPreCode.cpp
@@ -4934,8 +4934,9 @@ RelExpr * HbaseDelete::preCodeGen(Generator * generator,
else
if (isUnique)
{
- // do not cancel unique queries.
- generator->setMayNotCancel(TRUE);
+ if (!generator->oltOptInfo()->multipleRowsReturned())
+ // do not cancel unique queries.
+ generator->setMayNotCancel(TRUE);
uniqueHbaseOper() = TRUE;
canDoCheckAndUpdel() = FALSE;
if ((NOT producesOutputs()) &&
[2/3] incubator-trafodion git commit: Adding a check for update
precodegen code as well.
Posted by su...@apache.org.
Adding a check for update precodegen code as well.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/38fff5b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/38fff5b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/38fff5b4
Branch: refs/heads/master
Commit: 38fff5b496b2dc921f7a5552f62555d4d34731e4
Parents: adafbd5
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Mon Nov 16 22:07:59 2015 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Mon Nov 16 22:07:59 2015 +0000
----------------------------------------------------------------------
core/sql/generator/GenPreCode.cpp | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/38fff5b4/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenPreCode.cpp b/core/sql/generator/GenPreCode.cpp
index f4950af..af69c10 100644
--- a/core/sql/generator/GenPreCode.cpp
+++ b/core/sql/generator/GenPreCode.cpp
@@ -4934,8 +4934,9 @@ RelExpr * HbaseDelete::preCodeGen(Generator * generator,
else
if (isUnique)
{
+ //If this unique delete is not part of a rowset operation ,
+ //don't allow it to be cancelled.
if (!generator->oltOptInfo()->multipleRowsReturned())
- // do not cancel unique queries.
generator->setMayNotCancel(TRUE);
uniqueHbaseOper() = TRUE;
canDoCheckAndUpdel() = FALSE;
@@ -5201,8 +5202,10 @@ RelExpr * HbaseUpdate::preCodeGen(Generator * generator,
else
if (isUnique)
{
- // do not cancel unique queries.
- generator->setMayNotCancel(TRUE);
+ //If this unique delete is not part of a rowset operation ,
+ //don't allow it to be cancelled.
+ if (!generator->oltOptInfo()->multipleRowsReturned())
+ generator->setMayNotCancel(TRUE);
uniqueHbaseOper() = TRUE;
canDoCheckAndUpdel() = FALSE;
@@ -11441,10 +11444,11 @@ RelExpr * HbaseAccess::preCodeGen(Generator * generator,
if (!isUnique)
generator->oltOptInfo()->setMultipleRowsReturned(TRUE) ;
+ // Do not allow cancel of unique queries but allow cancel of queries
+ // that are part of a rowset operation.
if ((isUnique) &&
(NOT generator->oltOptInfo()->multipleRowsReturned()))
{
- // do not cancel unique queries.
generator->setMayNotCancel(TRUE);
uniqueHbaseOper() = TRUE;
}
[3/3] incubator-trafodion git commit: Merge remote branch
'origin/pr/175/head' into mrg_84
Posted by su...@apache.org.
Merge remote branch 'origin/pr/175/head' into mrg_84
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b3d2eb4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b3d2eb4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b3d2eb4e
Branch: refs/heads/master
Commit: b3d2eb4e1c1d15a8f978d9bb3a3616eef6b62ae4
Parents: ed09cc1 38fff5b
Author: Suresh Subbiah <su...@apache.org>
Authored: Tue Nov 17 16:57:55 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Tue Nov 17 16:57:55 2015 +0000
----------------------------------------------------------------------
core/sql/generator/GenPreCode.cpp | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------