Github user zellerh commented on a diff in the pull request:
https://github.com/apache/incubator-trafodion/pull/380#discussion_r56237956
--- Diff: core/sql/optimizer/BindRelExpr.cpp ---
@@ -10171,17 +10164,26 @@ matched clause of merge). If the upsert caused a
row to be updated in the
base table then the old version of the row will have to be deleted from
indexes, and a new version inserted. Upsert is being transformed to merge
so that we can delete the old version of an updated row from the index.
+
+Upsert is also converted into merge when there are omitted cols with
default values and
+TRAF_UPSERT_WITH_INSERT_DEFAULT_SEMANTICS is set to OFF in case of
aligned format table or
+omitted current timestamp cols in case of non-aligned row format
*/
-NABoolean Insert::isUpsertThatNeedsMerge() const
+NABoolean Insert::isUpsertThatNeedsMerge(NABoolean isAlignedRowFormat,
NABoolean omittedDefaultCols,
+ NABoolean
omittedCurrentDefaultClassCols) const
{
- if (!isUpsert() || getIsTrafLoadPrep() ||
- (getTableDesc()->isIdentityColumnGeneratedAlways() &&
- getTableDesc()->hasIdentityColumnInClusteringKey()) ||
- getTableDesc()->getClusteringIndex()->getNAFileSet()->hasSyskey() ||
- !(getTableDesc()->hasSecondaryIndexes()))
- return FALSE;
-
- return TRUE;
+ if (isUpsert() &&
+ (NOT getIsTrafLoadPrep()) &&
+ (NOT (getTableDesc()->isIdentityColumnGeneratedAlways() &&
getTableDesc()->hasIdentityColumnInClusteringKey())) &&
+ (NOT
(getTableDesc()->getClusteringIndex()->getNAFileSet()->hasSyskey())) &&
+ ((getTableDesc()->hasSecondaryIndexes()) ||
--- End diff --
Only if you find it easier to read, otherwise please ignore.
---
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.
---
