You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2018/03/15 16:46:03 UTC
[1/3] trafodion git commit: fix [trafodion-2988] prepare query
returns 2006 internal error
Repository: trafodion
Updated Branches:
refs/heads/master 7b5902fbe -> 7eb3ea39b
fix [trafodion-2988] prepare query returns 2006 internal error
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/7f7ba504
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/7f7ba504
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/7f7ba504
Branch: refs/heads/master
Commit: 7f7ba504b8c1bac741642fe42d37ba3754adf896
Parents: dd301dc
Author: kakaxi3019 <ju...@163.com>
Authored: Wed Mar 14 01:44:29 2018 +0000
Committer: kakaxi3019 <ju...@163.com>
Committed: Wed Mar 14 01:44:29 2018 +0000
----------------------------------------------------------------------
core/sql/optimizer/mdam.cpp | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/7f7ba504/core/sql/optimizer/mdam.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/mdam.cpp b/core/sql/optimizer/mdam.cpp
index 4570fc9..b33f00a 100644
--- a/core/sql/optimizer/mdam.cpp
+++ b/core/sql/optimizer/mdam.cpp
@@ -2002,7 +2002,8 @@ void Disjuncts::computeCommonPredicates()
inVidset.next(predId);
inVidset.advance(predId) )
{
- if(predId.getItemExpr()->getOperatorType() == ITM_RANGE_SPEC_FUNC )
+ //TRAFODION-2988
+ /*if(predId.getItemExpr()->getOperatorType() == ITM_RANGE_SPEC_FUNC )
{
if(predId.getItemExpr()->child(1)->getOperatorType() == ITM_AND ){
predId.getItemExpr()->child(1)->convertToValueIdSet(parsedVs, NULL, ITM_AND, FALSE);
@@ -2013,7 +2014,26 @@ void Disjuncts::computeCommonPredicates()
outVidset += predId.getItemExpr()->child(1)->castToItemExpr()->getValueId();
}
else
- outVidset +=predId;
+ outVidset +=predId;*/
+ if( ITM_RANGE_SPEC_FUNC == predId.getItemExpr()->getOperatorType() )
+ {
+ if( ITM_AND == predId.getItemExpr()->child(1)->getOperatorType() )
+ {
+ predId.getItemExpr()->child(1)->convertToValueIdSet(parsedVs, NULL, ITM_AND, FALSE);
+ outVidset +=parsedVs;
+ }
+ else if( ITM_OR == predId.getItemExpr()->child(1)->getOperatorType() )
+ {
+ outVidset +=predId;
+ }
+ else
+ {
+ outVidset += predId.getItemExpr()->child(1)->castToItemExpr()->getValueId();
+ }
+ }
+ else
+ outVidset +=predId;
+ //TRAFODION-2988
parsedVs.clear();
}
[2/3] trafodion git commit: for cosmetic issue,delete commented code
Posted by db...@apache.org.
for cosmetic issue,delete commented code
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/6157771c
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/6157771c
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/6157771c
Branch: refs/heads/master
Commit: 6157771c0b260e6fe68e55f0c8c084a6edf1ea4b
Parents: 7f7ba50
Author: kakaxi3019 <ju...@163.com>
Authored: Thu Mar 15 01:47:40 2018 +0000
Committer: kakaxi3019 <ju...@163.com>
Committed: Thu Mar 15 01:47:40 2018 +0000
----------------------------------------------------------------------
core/sql/optimizer/mdam.cpp | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6157771c/core/sql/optimizer/mdam.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/mdam.cpp b/core/sql/optimizer/mdam.cpp
index b33f00a..0a26267 100644
--- a/core/sql/optimizer/mdam.cpp
+++ b/core/sql/optimizer/mdam.cpp
@@ -2002,19 +2002,7 @@ void Disjuncts::computeCommonPredicates()
inVidset.next(predId);
inVidset.advance(predId) )
{
- //TRAFODION-2988
- /*if(predId.getItemExpr()->getOperatorType() == ITM_RANGE_SPEC_FUNC )
- {
- if(predId.getItemExpr()->child(1)->getOperatorType() == ITM_AND ){
- predId.getItemExpr()->child(1)->convertToValueIdSet(parsedVs, NULL, ITM_AND, FALSE);
- outVidset +=parsedVs;
- }
- else if(predId.getItemExpr()->child(1)->getOperatorType() != ITM_AND
- && predId.getItemExpr()->child(1)->getOperatorType() != ITM_OR)
- outVidset += predId.getItemExpr()->child(1)->castToItemExpr()->getValueId();
- }
- else
- outVidset +=predId;*/
+ //TRAFODION-2988
if( ITM_RANGE_SPEC_FUNC == predId.getItemExpr()->getOperatorType() )
{
if( ITM_AND == predId.getItemExpr()->child(1)->getOperatorType() )
@@ -2023,7 +2011,7 @@ void Disjuncts::computeCommonPredicates()
outVidset +=parsedVs;
}
else if( ITM_OR == predId.getItemExpr()->child(1)->getOperatorType() )
- {
+ {//add deal with OR operator
outVidset +=predId;
}
else
@@ -2033,7 +2021,7 @@ void Disjuncts::computeCommonPredicates()
}
else
outVidset +=predId;
- //TRAFODION-2988
+ //TRAFODION-2988
parsedVs.clear();
}
[3/3] trafodion git commit: Merge [TRAFODION-2988] PR 1474 Fix bug
where prepare returns 2006 error
Posted by db...@apache.org.
Merge [TRAFODION-2988] PR 1474 Fix bug where prepare returns 2006 error
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/7eb3ea39
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/7eb3ea39
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/7eb3ea39
Branch: refs/heads/master
Commit: 7eb3ea39b78fc4d4630712e013d827b57678e630
Parents: 7b5902f 6157771
Author: Dave Birdsall <db...@apache.org>
Authored: Thu Mar 15 16:45:19 2018 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Thu Mar 15 16:45:19 2018 +0000
----------------------------------------------------------------------
core/sql/optimizer/mdam.cpp | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
----------------------------------------------------------------------