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/10/17 01:32:54 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-1535] Explain and
RMS statistics output are not in sync when the vsbb is chosen for
Insert/Upsert command
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 9a4e14f45 -> 876de2d7f
[TRAFODION-1535] Explain and RMS statistics output are not in sync
when the vsbb is chosen for Insert/Upsert command
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6b8fdb4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6b8fdb4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6b8fdb4c
Branch: refs/heads/master
Commit: 6b8fdb4c3212c7940549799416790244c52c66bc
Parents: e4b7b2b
Author: selvaganesang <se...@esgyn.com>
Authored: Fri Oct 16 18:14:09 2015 +0000
Committer: selvaganesang <se...@esgyn.com>
Committed: Fri Oct 16 18:14:09 2015 +0000
----------------------------------------------------------------------
core/sql/generator/GenPreCode.cpp | 2 +-
core/sql/generator/GenRelUpdate.cpp | 3 +++
core/sql/optimizer/RelExpr.cpp | 13 +++++++++----
core/sql/optimizer/RelUpdate.h | 8 ++++++--
core/sql/regress/compGeneral/EXPECTED013.SB | 2 +-
core/sql/regress/executor/EXPECTED122 | 4 ++--
6 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6b8fdb4c/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenPreCode.cpp b/core/sql/generator/GenPreCode.cpp
index 8a02e4c..cae42d2 100644
--- a/core/sql/generator/GenPreCode.cpp
+++ b/core/sql/generator/GenPreCode.cpp
@@ -10179,7 +10179,7 @@ RelExpr * PhysTranspose::preCodeGen(Generator * generator,
getGroupAttr()->resolveCharacteristicOutputs
(availableValues,
getGroupAttr()->getCharacteristicInputs());
-
+ generator->oltOptInfo()->setMultipleRowsReturned(TRUE);
markAsPreCodeGenned();
return this;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6b8fdb4c/core/sql/generator/GenRelUpdate.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelUpdate.cpp b/core/sql/generator/GenRelUpdate.cpp
index 7989de3..4454568 100644
--- a/core/sql/generator/GenRelUpdate.cpp
+++ b/core/sql/generator/GenRelUpdate.cpp
@@ -2814,6 +2814,9 @@ short HbaseInsert::codeGen(Generator *generator)
{
hbasescan_tdb->setVsbbInsert(TRUE);
hbasescan_tdb->setHbaseRowsetVsbbSize(getDefault(HBASE_ROWSET_VSBB_SIZE));
+ // Set the VSBB flag in the RelExpr to display in explain
+ if (! hbasescan_tdb->hbaseSqlIUD())
+ setVsbbInsert(TRUE);
}
if ((isUpsert()) &&
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6b8fdb4c/core/sql/optimizer/RelExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelExpr.cpp b/core/sql/optimizer/RelExpr.cpp
index d4d89f4..f6a2a4a 100644
--- a/core/sql/optimizer/RelExpr.cpp
+++ b/core/sql/optimizer/RelExpr.cpp
@@ -13003,20 +13003,25 @@ const NAString HbaseInsert::getText() const
if (isUpsert())
{
- if (getInsertType() == Insert::VSBB_INSERT_USER)
- text += "vsbb_upsert";
- else if (getInsertType() == Insert::UPSERT_LOAD)
+ if (getInsertType() == Insert::UPSERT_LOAD)
{
if (getIsTrafLoadPrep())
text += "load_preparation";
else
text += "load";
}
+ else if (vsbbInsert())
+ text += "vsbb_upsert";
else
text += "upsert";
}
else
- text += "insert";
+ {
+ if (vsbbInsert())
+ text += "vsbb_upsert";
+ else
+ text += "insert";
+ }
return (text + " " + getUpdTableNameText());
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6b8fdb4c/core/sql/optimizer/RelUpdate.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelUpdate.h b/core/sql/optimizer/RelUpdate.h
index 0e357e9..ccb00dd 100644
--- a/core/sql/optimizer/RelUpdate.h
+++ b/core/sql/optimizer/RelUpdate.h
@@ -1830,7 +1830,8 @@ public:
CollHeap *oHeap = CmpCommon::statementHeap(),
InsertType insertType = SIMPLE_INSERT)
: Insert(name,tabId,otype,child,NULL,NULL,oHeap, insertType),
- returnRow_(FALSE)
+ returnRow_(FALSE),
+ vsbbInsert_(FALSE)
{};
// copy ctor
@@ -1859,6 +1860,9 @@ public:
void setReturnRow(NABoolean val) {returnRow_ = val;}
NABoolean isReturnRow() {return returnRow_;}
+ void setVsbbInsert(NABoolean val) { vsbbInsert_ = val; }
+ NABoolean vsbbInsert() const { return vsbbInsert_; }
+
// method to do code generation
virtual RelExpr *preCodeGen(Generator * generator,
const ValueIdSet & externalInputs,
@@ -1872,7 +1876,7 @@ private:
// used when lob colums are being loaded. Set in GenPreCode.
ValueIdList lobLoadExpr_;
NABoolean returnRow_ ; // currently used only for bulk load incremental IM
-
+ NABoolean vsbbInsert_ ;
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6b8fdb4c/core/sql/regress/compGeneral/EXPECTED013.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/EXPECTED013.SB b/core/sql/regress/compGeneral/EXPECTED013.SB
index 9e8012e..740cff2 100644
--- a/core/sql/regress/compGeneral/EXPECTED013.SB
+++ b/core/sql/regress/compGeneral/EXPECTED013.SB
@@ -209,7 +209,7 @@ MERGE_UNION
SORT_SCALAR_AGGR
SCAN
BLOCKED_UNION
-TRAFODION_INSERT
+TRAFODION_VSBB_U
TRAFODION_DELETE
TRAFODION_UPDATE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6b8fdb4c/core/sql/regress/executor/EXPECTED122
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED122 b/core/sql/regress/executor/EXPECTED122
index 5e78146..f011381 100644
--- a/core/sql/regress/executor/EXPECTED122
+++ b/core/sql/regress/executor/EXPECTED122
@@ -555,7 +555,7 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
4 6 7 merge_union 2.00E+000
5 . 6 sort_scalar_aggr 1.00E+000
. . 5 trafodion_scan T122T3_RI 1.00E+002
-. . 4 trafodion_insert T122_FK 1.00E+000
+. . 4 trafodion_vsbb_upser T122_FK 1.00E+000
1 2 3 nested_join 7.00E+000
. . 2 trafodion_insert T122T4_FK 1.00E+000
. . 1 tuplelist 7.00E+000
@@ -576,7 +576,7 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
5 . 6 root x 7.00E+000
3 4 5 nested_join 7.00E+000
-. . 4 trafodion_insert T122T3_INDEX 1.00E+000
+. . 4 trafodion_vsbb_upser T122T3_INDEX 1.00E+000
1 2 3 nested_join 7.00E+000
. . 2 trafodion_insert T122T3 1.00E+000
. . 1 tuplelist 7.00E+000
[2/2] incubator-trafodion git commit: Merge remote branch
'origin/pr/129/head' into mrg_65
Posted by su...@apache.org.
Merge remote branch 'origin/pr/129/head' into mrg_65
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/876de2d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/876de2d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/876de2d7
Branch: refs/heads/master
Commit: 876de2d7fe99eaeed0cdcc928819cd03c52e6d6b
Parents: 9a4e14f 6b8fdb4
Author: Suresh Subbiah <su...@apache.org>
Authored: Fri Oct 16 23:32:31 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Fri Oct 16 23:32:31 2015 +0000
----------------------------------------------------------------------
core/sql/generator/GenPreCode.cpp | 2 +-
core/sql/generator/GenRelUpdate.cpp | 3 +++
core/sql/optimizer/RelExpr.cpp | 13 +++++++++----
core/sql/optimizer/RelUpdate.h | 8 ++++++--
core/sql/regress/compGeneral/EXPECTED013.SB | 2 +-
core/sql/regress/executor/EXPECTED122 | 4 ++--
6 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------