Github user sandhyasun commented on a diff in the pull request:
https://github.com/apache/incubator-trafodion/pull/946#discussion_r100155118
--- Diff: core/sql/optimizer/BindRelExpr.cpp ---
@@ -10600,34 +10600,45 @@ Upsert is also converted into merge when
TRAF_UPSERT_MODE is set to MERGE and
there are omitted cols with default values in case of aligned format table
or
omitted current timestamp cols in case of non-aligned row format
*/
-NABoolean Insert::isUpsertThatNeedsMerge(NABoolean isAlignedRowFormat,
NABoolean omittedDefaultCols,
- NABoolean
omittedCurrentDefaultClassCols) const
+NABoolean Insert::isUpsertThatNeedsTransformation(NABoolean
isAlignedRowFormat,
+ NABoolean
omittedDefaultCols,
+ NABoolean
omittedCurrentDefaultClassCols,
+ NABoolean &toMerge) const
{
- // The necessary conditions to convert upsert to merge and
+ // The necessary conditions to transform upsert
if (isUpsert() &&
(NOT getIsTrafLoadPrep()) &&
- (NOT (getTableDesc()->isIdentityColumnGeneratedAlways() &&
getTableDesc()->hasIdentityColumnInClusteringKey())) &&
+ (NOT (getTableDesc()->isIdentityColumnGeneratedAlways() &&
+ getTableDesc()->hasIdentityColumnInClusteringKey())) &&
(NOT
(getTableDesc()->getClusteringIndex()->getNAFileSet()->hasSyskey())) &&
- // table has secondary indexes or
- (getTableDesc()->hasSecondaryIndexes() ||
- // CQD is set to MERGE
- ((CmpCommon::getDefault(TRAF_UPSERT_MODE) == DF_MERGE) &&
+ // table has secondary indexes or
+ (getTableDesc()->hasSecondaryIndexes() ))
+ {
+ toMerge = FALSE;
+ return TRUE;
+ }
+ else if (isUpsert() && (NOT getIsTrafLoadPrep()) &&
+ (NOT (getTableDesc()->isIdentityColumnGeneratedAlways() &&
getTableDesc()->hasIdentityColumnInClusteringKey())) &&
+ (NOT
(getTableDesc()->getClusteringIndex()->getNAFileSet()->hasSyskey())) &&
+ // CQD is set to MERGE
--- End diff --
Good point...Let me rework this to be more readable and may have to add a
3rd check.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
