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/07 21:15:07 UTC
[1/3] incubator-trafodion git commit: [TRAFODION-1482]
[TRAFODION-1474] [TRAFODION-1279]
Repository: incubator-trafodion
Updated Branches:
refs/heads/master bd0f69ccc -> 87b28274e
[TRAFODION-1482] [TRAFODION-1474] [TRAFODION-1279]
Please see JIRA issues for information on each fix.
The files are
1482: HTableClient.java
1474: GenUdr.cpp
1279: NAColumn.h, NAColumn.cpp, CmpSeabaseDDLtable.cpp
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a1f99cb7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a1f99cb7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a1f99cb7
Branch: refs/heads/master
Commit: a1f99cb76183afb27a47a7517414d0f7ca7a2b3d
Parents: deb0130
Author: Suresh Subbiah <su...@apache.org>
Authored: Tue Oct 6 21:06:34 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Tue Oct 6 21:06:34 2015 +0000
----------------------------------------------------------------------
core/sql/generator/GenUdr.cpp | 5 ++++-
core/sql/optimizer/NAColumn.cpp | 21 ++++++++++++++++++++
core/sql/optimizer/NAColumn.h | 6 ++++++
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 6 ++++--
.../java/org/trafodion/sql/HTableClient.java | 3 ---
5 files changed, 35 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a1f99cb7/core/sql/generator/GenUdr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenUdr.cpp b/core/sql/generator/GenUdr.cpp
index 084366a..64f042e 100644
--- a/core/sql/generator/GenUdr.cpp
+++ b/core/sql/generator/GenUdr.cpp
@@ -357,8 +357,11 @@ ExplainTuple *PhysicalTableMappingUDF::addSpecificExplainInfo(ExplainTupleMaster
description += " external_name: ";
description += getNARoutine()->getExternalName();
+ description += " library: ";
+ description += getNARoutine()->getLibrarySqlName().getExternalName();
+
description += " external_file: ";
- description += getNARoutine()->getFile();
+ description += getNARoutine()->getExternalPath();
description += " ";
explainTuple->setDescription(description);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a1f99cb7/core/sql/optimizer/NAColumn.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NAColumn.cpp b/core/sql/optimizer/NAColumn.cpp
index bc03fb6..731ade0 100644
--- a/core/sql/optimizer/NAColumn.cpp
+++ b/core/sql/optimizer/NAColumn.cpp
@@ -749,6 +749,27 @@ Lng32 NAColumnArray::getOffset(Lng32 position) const
return result;
}
+
+Lng32 NAColumnArray::getMaxTrafHbaseColQualifier() const
+{
+ NAColumn *column;
+ char * colQualPtr;
+ Lng32 colQualLen;
+ Int64 colQVal;
+ Lng32 maxVal = 0;
+
+ for (CollIndex i = 0; i < entries(); i++)
+ {
+ column = (*this)[i];
+ colQualPtr = (char*)column->getHbaseColQual().data();
+ colQualLen = column->getHbaseColQual().length();
+ colQVal = str_atoi(colQualPtr, colQualLen);
+ if (colQVal > maxVal)
+ maxVal = colQVal ;
+ }
+ return colQVal;
+}
+
// LCOV_EXCL_STOP
//method to reset an NAColumn object after a statement
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a1f99cb7/core/sql/optimizer/NAColumn.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NAColumn.h b/core/sql/optimizer/NAColumn.h
index 6f0658a..46ab004 100644
--- a/core/sql/optimizer/NAColumn.h
+++ b/core/sql/optimizer/NAColumn.h
@@ -627,6 +627,12 @@ public:
// get total storage size (aggregated over each element)
Int32 getTotalStorageSize() const;
+ // For Trafodion tables column qualifier is an unsigned
+ // numeric > 0. This method is used during alter table add
+ // column to find the maximum value currently in use. Columns
+ // are deleted during alter table drop column.
+ Lng32 getMaxTrafHbaseColQualifier() const;
+
private:
ARRAY(NABoolean) ascending_; // ignore for non-key or hash key columns
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a1f99cb7/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index 1ac02db..6fe3fbc 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -4596,6 +4596,8 @@ void CmpSeabaseDDL::alterSeabaseTableAddColumn(
char * col_name = new(STMTHEAP) char[colName.length() + 1];
strcpy(col_name, (char*)colName.data());
+ Lng32 maxColQual = nacolArr.getMaxTrafHbaseColQualifier();
+
NAString quotedHeading;
if (NOT heading.isNull())
{
@@ -4609,7 +4611,7 @@ void CmpSeabaseDDL::alterSeabaseTableAddColumn(
}
Int64 objUID = naTable->objectUid().castToInt64();
- str_sprintf(query, "insert into %s.\"%s\".%s values (%Ld, '%s', %d, '%s', %d, '%s', %d, %d, %d, %d, %d, '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%d', '%s', '%s', %Ld )",
+ str_sprintf(query, "insert into %s.\"%s\".%s values (%Ld, '%s', %d, '%s', %d, '%s', %d, %d, %d, %d, %d, '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%u', '%s', '%s', %Ld )",
getSystemCatalog(), SEABASE_MD_SCHEMA, SEABASE_COLUMNS,
objUID,
col_name,
@@ -4630,7 +4632,7 @@ void CmpSeabaseDDL::alterSeabaseTableAddColumn(
(quotedDefVal.isNull() ? "" : quotedDefVal.data()),
(quotedHeading.isNull() ? "" : quotedHeading.data()),
trafColFam.data(),
- naTable->getColumnCount()+1,
+ maxColQual+1,
COM_UNKNOWN_PARAM_DIRECTION_LIT,
"N",
colFlags);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a1f99cb7/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/HTableClient.java b/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
index 3f3334e..12d448a 100644
--- a/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
@@ -405,9 +405,6 @@ public class HTableClient {
if (cacheBlocks == true) {
scan.setCacheBlocks(true);
- // Disable block cache for full table scan
- if (startRow == null && stopRow == null)
- scan.setCacheBlocks(false);
}
else
scan.setCacheBlocks(false);
[2/3] incubator-trafodion git commit: Rework for defect foundby Hans.
Posted by su...@apache.org.
Rework for defect foundby Hans.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/82a3a255
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/82a3a255
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/82a3a255
Branch: refs/heads/master
Commit: 82a3a25542e7295051bb2b5bc0bf09d543c1308f
Parents: a1f99cb
Author: Suresh Subbiah <su...@apache.org>
Authored: Tue Oct 6 21:55:23 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Tue Oct 6 21:55:23 2015 +0000
----------------------------------------------------------------------
core/sql/optimizer/NAColumn.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/82a3a255/core/sql/optimizer/NAColumn.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NAColumn.cpp b/core/sql/optimizer/NAColumn.cpp
index 731ade0..8814db8 100644
--- a/core/sql/optimizer/NAColumn.cpp
+++ b/core/sql/optimizer/NAColumn.cpp
@@ -767,7 +767,7 @@ Lng32 NAColumnArray::getMaxTrafHbaseColQualifier() const
if (colQVal > maxVal)
maxVal = colQVal ;
}
- return colQVal;
+ return maxVal;
}
// LCOV_EXCL_STOP
[3/3] incubator-trafodion git commit: Merge remote branch
'origin/pr/107/head' into mrg_59
Posted by su...@apache.org.
Merge remote branch 'origin/pr/107/head' into mrg_59
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/87b28274
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/87b28274
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/87b28274
Branch: refs/heads/master
Commit: 87b28274ecc8b6e6066570744ecbbfcfc9fb058e
Parents: bd0f69c 82a3a25
Author: Suresh Subbiah <su...@apache.org>
Authored: Wed Oct 7 19:14:20 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Wed Oct 7 19:14:20 2015 +0000
----------------------------------------------------------------------
core/sql/generator/GenUdr.cpp | 5 ++++-
core/sql/optimizer/NAColumn.cpp | 21 ++++++++++++++++++++
core/sql/optimizer/NAColumn.h | 6 ++++++
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 6 ++++--
.../java/org/trafodion/sql/HTableClient.java | 3 ---
5 files changed, 35 insertions(+), 6 deletions(-)
----------------------------------------------------------------------