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/08/31 23:17:22 UTC

[1/2] incubator-trafodion git commit: [TRAFODION-2729] Fix bug reading region keys for hbase _ROW_ and _CELL_ access

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 4510c45da -> 3f9429f46


[TRAFODION-2729] Fix bug reading region keys for hbase _ROW_ and _CELL_ access


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/edbe1cce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/edbe1cce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/edbe1cce

Branch: refs/heads/master
Commit: edbe1cce9106efac40c0efa9cb2193baca1acf64
Parents: b882491
Author: Dave Birdsall <db...@apache.org>
Authored: Wed Aug 30 21:22:11 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed Aug 30 21:22:11 2017 +0000

----------------------------------------------------------------------
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/edbe1cce/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index 7b6e9eb..b5c2513 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -11692,8 +11692,13 @@ short CmpSeabaseDDL::genHbaseRegionDescs(TrafDesc * desc,
   if (ehi == NULL) 
     return -1;
   
-  const NAString extNameForHbase = genHBaseObjName
-    (catName, schName, objName);
+  NAString extNameForHbase;
+  if ((catName != HBASE_SYSTEM_CATALOG) ||
+      ((schName != HBASE_ROW_SCHEMA) && (schName != HBASE_CELL_SCHEMA)))
+    extNameForHbase = genHBaseObjName(catName, schName, objName);
+  else
+    // for HBASE._ROW_.objName or HBASE._CELL_.objName, just pass objName
+    extNameForHbase = objName;
 
   NAArray<HbaseStr>* endKeyArray  = 
     ehi->getRegionEndKeys(extNameForHbase);


[2/2] incubator-trafodion git commit: Merge [TRAFODION-2729] PR 1221 Fix region key read bug for _ROW_ etc access

Posted by db...@apache.org.
Merge [TRAFODION-2729] PR 1221 Fix region key read bug for _ROW_ etc access


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/3f9429f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/3f9429f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/3f9429f4

Branch: refs/heads/master
Commit: 3f9429f46994f3d69c8015da69680e9c9f8431df
Parents: 4510c45 edbe1cc
Author: Dave Birdsall <db...@apache.org>
Authored: Thu Aug 31 23:16:20 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Thu Aug 31 23:16:20 2017 +0000

----------------------------------------------------------------------
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3f9429f4/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------