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 2017/03/14 20:02:42 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-2529] Pass proper
table name to getRowCount for _CELL_ and _ROW_
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 03fd04081 -> 2ba737c55
[TRAFODION-2529] Pass proper table name to getRowCount for _CELL_ and _ROW_
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/1664d1ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/1664d1ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/1664d1ba
Branch: refs/heads/master
Commit: 1664d1bad2ac903daf215eee8fb300c840f6496d
Parents: 2aac3f7
Author: Dave Birdsall <db...@apache.org>
Authored: Mon Mar 13 20:16:06 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Mon Mar 13 20:16:06 2017 +0000
----------------------------------------------------------------------
core/sql/optimizer/NATable.cpp | 2 ++
core/sql/optimizer/ObjectNames.cpp | 37 ++++++++++++++++++++++++---------
core/sql/optimizer/ObjectNames.h | 4 ++++
3 files changed, 33 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1664d1ba/core/sql/optimizer/NATable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NATable.cpp b/core/sql/optimizer/NATable.cpp
index 496736a..136656f 100644
--- a/core/sql/optimizer/NATable.cpp
+++ b/core/sql/optimizer/NATable.cpp
@@ -7778,6 +7778,8 @@ Int64 NATable::estimateHBaseRowCount(Int32 retryLimitMilliSeconds, Int32& errorC
{
HbaseStr fqTblName;
NAString tblName = getTableName().getQualifiedNameAsString();
+ if (getTableName().isHbaseCellOrRow())
+ tblName = getTableName().getObjectName();
fqTblName.len = tblName.length();
fqTblName.val = new(STMTHEAP) char[fqTblName.len+1];
strncpy(fqTblName.val, tblName.data(), fqTblName.len);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1664d1ba/core/sql/optimizer/ObjectNames.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ObjectNames.cpp b/core/sql/optimizer/ObjectNames.cpp
index e271481..b50d795 100644
--- a/core/sql/optimizer/ObjectNames.cpp
+++ b/core/sql/optimizer/ObjectNames.cpp
@@ -676,6 +676,31 @@ NABoolean QualifiedName::isHbaseMappedName() const
(ComIsHbaseMappedSchemaName(getSchemaName())));
}
+NABoolean QualifiedName::isHbaseCell() const
+{
+ if (isHbase() && (getSchemaName() == "_CELL_"))
+ return TRUE;
+ else
+ return FALSE;
+}
+
+NABoolean QualifiedName::isHbaseRow() const
+{
+ if (isHbase() && (getSchemaName() == "_ROW_"))
+ return TRUE;
+ else
+ return FALSE;
+}
+
+NABoolean QualifiedName::isHbaseCellOrRow() const
+{
+ if (isHbase() &&
+ ((getSchemaName() == "_CELL_") || (getSchemaName() == "_ROW_")))
+ return TRUE;
+ else
+ return FALSE;
+}
+
// -----------------------------------------------------------------------
// Methods for class CorrName
// -----------------------------------------------------------------------
@@ -969,20 +994,12 @@ NABoolean CorrName::isHbase() const
NABoolean CorrName::isHbaseCell() const
{
- if ((getQualifiedNameObj().isHbase()) &&
- (getQualifiedNameObj().getSchemaName() == "_CELL_"))
- return TRUE;
- else
- return FALSE;
+ return getQualifiedNameObj().isHbaseCell();
}
NABoolean CorrName::isHbaseRow() const
{
- if ((getQualifiedNameObj().isHbase()) &&
- (getQualifiedNameObj().getSchemaName() == "_ROW_"))
- return TRUE;
- else
- return FALSE;
+ return getQualifiedNameObj().isHbaseRow();
}
NABoolean CorrName::isHbaseMap() const
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1664d1ba/core/sql/optimizer/ObjectNames.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ObjectNames.h b/core/sql/optimizer/ObjectNames.h
index 21ca61e..0bac50c 100644
--- a/core/sql/optimizer/ObjectNames.h
+++ b/core/sql/optimizer/ObjectNames.h
@@ -323,6 +323,10 @@ public:
NABoolean isSeabasePrivMgrMD() const;
NABoolean isHbaseMappedName() const;
+ NABoolean isHbaseCell() const;
+ NABoolean isHbaseRow() const;
+ NABoolean isHbaseCellOrRow() const;
+
NABoolean isHistograms() const;
NABoolean isHistogramIntervals() const;
[2/2] incubator-trafodion git commit: Merge [TRAFODION-2529] PR 1007
Fix name passed to estimateRowCount for CELL
Posted by db...@apache.org.
Merge [TRAFODION-2529] PR 1007 Fix name passed to estimateRowCount for CELL
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/2ba737c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/2ba737c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/2ba737c5
Branch: refs/heads/master
Commit: 2ba737c55be680eb1a1bbfc7d9e1cc54f9a45029
Parents: 03fd040 1664d1b
Author: Dave Birdsall <db...@apache.org>
Authored: Tue Mar 14 20:01:41 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue Mar 14 20:01:41 2017 +0000
----------------------------------------------------------------------
core/sql/optimizer/NATable.cpp | 2 ++
core/sql/optimizer/ObjectNames.cpp | 37 ++++++++++++++++++++++++---------
core/sql/optimizer/ObjectNames.h | 4 ++++
3 files changed, 33 insertions(+), 10 deletions(-)
----------------------------------------------------------------------