You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by hz...@apache.org on 2016/01/22 02:08:30 UTC
[11/15] incubator-trafodion git commit: fix logical issue introduced
after the rework on isAddedColumnWithNonNullDefault (check for ITM_BASECOLUMN
or ITM_INDEXCOLUMN before checking if it is not an added column with non null
default).
fix logical issue introduced after the rework on isAddedColumnWithNonNullDefault (check for ITM_BASECOLUMN or ITM_INDEXCOLUMN before checking if it is not an added column with non null default).
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e1cdc430
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e1cdc430
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e1cdc430
Branch: refs/heads/master
Commit: e1cdc43006b97b28813ec7658d8f7c80afea3fb5
Parents: 279e540
Author: Eric Owhadi <er...@esgyn.com>
Authored: Tue Jan 19 14:25:14 2016 +0000
Committer: Eric Owhadi <er...@esgyn.com>
Committed: Tue Jan 19 14:25:14 2016 +0000
----------------------------------------------------------------------
core/sql/generator/GenPreCode.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1cdc430/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenPreCode.cpp b/core/sql/generator/GenPreCode.cpp
index fe012b8..b7c9ef2 100644
--- a/core/sql/generator/GenPreCode.cpp
+++ b/core/sql/generator/GenPreCode.cpp
@@ -11839,7 +11839,8 @@ RelExpr * HbaseAccess::preCodeGen(Generator * generator,
retColRefSet_.advance(vid))
{
if (originExePreds->isNotNullable(vid)){// it is non nullable
- if (!vid.isAddedColumnWithNonNullDefault()){//check if added and with default... notgood
+ OperatorTypeEnum operatorType = vid.getItemExpr()->getOperatorType();
+ if ((operatorType == ITM_BASECOLUMN || operatorType == ITM_INDEXCOLUMN) && !vid.isAddedColumnWithNonNullDefault()){//check if added and with default... notgood
needAddingNonNullableColumn = false; // we found one column meeting all criteria
break;
}