[1/2] incubator-trafodion git commit: [TRAFODION-1077] AQR info missing from GET STATISTICS

2016-11-01 Thread sureshs
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 6ce6a8ea9 -> 59cbda3f8


[TRAFODION-1077] AQR info missing from GET STATISTICS

Automatic query retry info was populated, but it got reset as part
of successful retry prepare.


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

Branch: refs/heads/master
Commit: a74957a0fd090249c53db8bf2d1217f14cff0ffd
Parents: 07a77b8
Author: selvaganesang 
Authored: Mon Oct 31 22:29:02 2016 +
Committer: selvaganesang 
Committed: Mon Oct 31 22:29:02 2016 +

--
 core/sql/cli/Cli.cpp | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a74957a0/core/sql/cli/Cli.cpp
--
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index 9d79d90..038ab27 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -2270,14 +2270,17 @@ static Lng32 SQLCLI_RetryQuery(
flags
);
 
-  if (savedStmtStats)
-savedStmtStats->setAqrInProgress(FALSE);
-
-  if (isERROR(retcode))
+  if (isERROR(retcode)) {
+  if (savedStmtStats)
+  savedStmtStats->setAqrInProgress(FALSE);
   return retcode;
+  }
   
-  if (afterPrepare)
+  if (afterPrepare) {
+ if (savedStmtStats)
+savedStmtStats->setAqrInProgress(FALSE);
 return 0;
+  }
 
   // before executing this statement,
   // validate that the new prepare's input/output descriptors are the same



[2/2] incubator-trafodion git commit: Merge [TRAFODION-1077] PR-805 AQR info missing from GET STATISTICS

2016-11-01 Thread sureshs
Merge [TRAFODION-1077] PR-805 AQR info missing from GET STATISTICS


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

Branch: refs/heads/master
Commit: 59cbda3f82cbb3c23ee053da16ecb58c0b904e3b
Parents: 6ce6a8e a74957a
Author: Suresh Subbiah 
Authored: Tue Nov 1 14:03:06 2016 +
Committer: Suresh Subbiah 
Committed: Tue Nov 1 14:03:06 2016 +

--
 core/sql/cli/Cli.cpp | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/59cbda3f/core/sql/cli/Cli.cpp
--



[1/2] incubator-trafodion git commit: TRAFODION-2330 Using trafci, a select from a table succeeds even if the user does not have the priv

2016-11-01 Thread rmarton
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 59cbda3f8 -> 9c712a4aa


TRAFODION-2330 Using trafci, a select from a table succeeds even if the user
   does not have the priv

There is a problem when the session user changes in a mxosrvr process.  The
existing compiler caches are not getting cleared so the new user will be
accessing the previous users' caches.  This could lead to allowing someone
that does not have privileges to gain access to an object.

The change is to clear all caches during a session user change operation.


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

Branch: refs/heads/master
Commit: 6cd6be853fb1508e7b33d8e12c0fea0a0a8ef044
Parents: 1c8f25b
Author: Roberta Marton 
Authored: Tue Nov 1 05:22:44 2016 +
Committer: Roberta Marton 
Committed: Tue Nov 1 05:22:44 2016 +

--
 core/sql/arkcmp/CmpContext.cpp | 12 
 core/sql/arkcmp/CmpContext.h   |  2 ++
 core/sql/cli/Context.cpp   | 14 ++
 3 files changed, 28 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6cd6be85/core/sql/arkcmp/CmpContext.cpp
--
diff --git a/core/sql/arkcmp/CmpContext.cpp b/core/sql/arkcmp/CmpContext.cpp
index a256db0..c0ab3a4 100644
--- a/core/sql/arkcmp/CmpContext.cpp
+++ b/core/sql/arkcmp/CmpContext.cpp
@@ -1157,4 +1157,16 @@ void CmpContext::resetLogmxEventSqlText()
delete sqlTextBuf_ ;
sqlTextBuf_ = NULL ;
 }
+
+void CmpContext::clearAllCaches()
+{
+   qcache_->makeEmpty();
+   schemaDB_->getNATableDB()->setCachingOFF();
+   schemaDB_->getNATableDB()->setCachingON();
+   schemaDB_->getNARoutineDB()->setCachingOFF();
+   schemaDB_->getNARoutineDB()->setCachingON();
+   if(histogramCache_)
+  histogramCache_->invalidateCache();
+}
+
 #endif // NA_CMPDLL

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6cd6be85/core/sql/arkcmp/CmpContext.h
--
diff --git a/core/sql/arkcmp/CmpContext.h b/core/sql/arkcmp/CmpContext.h
index 37d2df7..8268639 100644
--- a/core/sql/arkcmp/CmpContext.h
+++ b/core/sql/arkcmp/CmpContext.h
@@ -479,6 +479,8 @@ public :
 
   NAList& ddlObjsList() { return ddlObjs_; }
 
+  void clearAllCaches();
+
 // MV
 private:
 // Adding support for multi threaded requestor (multi transactions) handling

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6cd6be85/core/sql/cli/Context.cpp
--
diff --git a/core/sql/cli/Context.cpp b/core/sql/cli/Context.cpp
index b454a3a..33b935c 100644
--- a/core/sql/cli/Context.cpp
+++ b/core/sql/cli/Context.cpp
@@ -2864,7 +2864,21 @@ void ContextCli::completeSetAuthID(
 // Recreate MXCMP if previously connected and currently connected user id's 
 // are different.
if ( recreateMXCMP )
+   {
+  // reset rolelist in anticipation of the new user
+  resetRoleList();
+
+  // create all the caches
+  CmpContextInfo *cmpCntxtInfo;
+  for (int i = 0; i < cmpContextInfo_.entries(); i++)
+  {
+ cmpCntxtInfo = cmpContextInfo_[i];
+ cmpCntxtInfo->getCmpContext()->clearAllCaches();
+  }
+
+  // clear caches in secondary arkcmps
   killAndRecreateMxcmp();
+   }
  
if (eraseCQDs)
{



[2/2] incubator-trafodion git commit: Merge TRAFODION-2330 PR 806 a select from a table succeeds even if user has no priv

2016-11-01 Thread rmarton
Merge TRAFODION-2330 PR 806 a select from a table succeeds even if user has no 
priv


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

Branch: refs/heads/master
Commit: 9c712a4aa78e8dd2601ca4aeb803e3beefbc753f
Parents: 59cbda3 6cd6be8
Author: Roberta Marton 
Authored: Tue Nov 1 14:56:43 2016 +
Committer: Roberta Marton 
Committed: Tue Nov 1 14:56:43 2016 +

--
 core/sql/arkcmp/CmpContext.cpp | 12 
 core/sql/arkcmp/CmpContext.h   |  2 ++
 core/sql/cli/Context.cpp   | 14 ++
 3 files changed, 28 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9c712a4a/core/sql/arkcmp/CmpContext.cpp
--

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9c712a4a/core/sql/arkcmp/CmpContext.h
--