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 2016/11/01 14:03:25 UTC

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

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 <se...@esgyn.com>
Authored: Mon Oct 31 22:29:02 2016 +0000
Committer: selvaganesang <se...@esgyn.com>
Committed: Mon Oct 31 22:29:02 2016 +0000

----------------------------------------------------------------------
 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

Posted by su...@apache.org.
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 <su...@apache.org>
Authored: Tue Nov 1 14:03:06 2016 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Tue Nov 1 14:03:06 2016 +0000

----------------------------------------------------------------------
 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
----------------------------------------------------------------------