You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by an...@apache.org on 2018/06/09 00:42:44 UTC
[09/10] trafodion git commit: review comment + fix to
executor/test020 from a different checkin.
review comment + fix to executor/test020 from a different checkin.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/699708f6
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/699708f6
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/699708f6
Branch: refs/heads/master
Commit: 699708f69ee86b495d260f390ed99573d7c1f3c7
Parents: c475d2d
Author: Anoop Sharma <an...@esgyn.com>
Authored: Fri Jun 8 19:10:54 2018 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Fri Jun 8 19:10:54 2018 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/install_local_hadoop | 2 +-
core/sql/cli/SessionDefaults.cpp | 5 +++--
core/sql/regress/executor/EXPECTED020 | 4 ++++
3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/699708f6/core/sqf/sql/scripts/install_local_hadoop
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_local_hadoop b/core/sqf/sql/scripts/install_local_hadoop
index 56ff179..ca7789a 100755
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@ -730,7 +730,7 @@ else
if [ $? -ne 0 ]; then
echo '**** ERROR:'
cat <<EOF
- Please make sure you are using the Java 1.6 or 1.7 SDK.
+ Please make sure you are using the Java 1.6, 1.7 or 1.8 SDK.
Otherwise, download it into ${MY_SW_ROOT}, extract it and
make a symbolic link ${MY_SW_ROOT}/java that points to it and
export JAVA_HOME=${MY_SW_ROOT}/java
http://git-wip-us.apache.org/repos/asf/trafodion/blob/699708f6/core/sql/cli/SessionDefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/SessionDefaults.cpp b/core/sql/cli/SessionDefaults.cpp
index 388e02f..59be23e 100644
--- a/core/sql/cli/SessionDefaults.cpp
+++ b/core/sql/cli/SessionDefaults.cpp
@@ -792,8 +792,6 @@ static const AQRInfo::AQRErrorMap aqrErrorMap[] =
// locked row timeout
AQREntry( 8550, 73, 2, 0, 0, 0, "", 0, 0),
AQREntry( 8550, 78, 1, 60, 0, 0, "", 0, 0),
- AQREntry( 8558, 0 , 2, 10, 0, 0, "", 0, 0),
-
AQREntry( 8551, 12, 1, 60, 0, 0, "", 0, 0),
// DP2/FS memory errors
@@ -818,6 +816,9 @@ static const AQRInfo::AQRErrorMap aqrErrorMap[] =
// out of server storage
AQREntry( 8551, 3502, 1, 60, 0, 0, "", 0, 0),
+ // locked row timeout
+ AQREntry( 8558, 0 , 2, 10, 0, 0, "", 0, 0),
+
// lost open
AQREntry( 8574, 0, 1, 0, 1, 0, "", 0, 0),
http://git-wip-us.apache.org/repos/asf/trafodion/blob/699708f6/core/sql/regress/executor/EXPECTED020
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED020 b/core/sql/regress/executor/EXPECTED020
index a8bdc64..b5c87c7 100644
--- a/core/sql/regress/executor/EXPECTED020
+++ b/core/sql/regress/executor/EXPECTED020
@@ -126,6 +126,7 @@ A B
8551 1054 1 60 0
8551 1187 1 60 0
8551 3502 1 60 0
+ 8558 0 2 10 0
8574 0 1 0 1
8575 0 1 0 1
8577 0 1 0 1
@@ -192,6 +193,7 @@ A B
8551 1054 1 60 0
8551 1187 1 60 0
8551 3502 1 60 0
+ 8558 0 2 10 0
8574 0 1 0 1
8575 0 1 0 1
8577 0 1 0 1
@@ -259,6 +261,7 @@ A B
8551 1054 1 60 0
8551 1187 1 60 0
8551 3502 1 60 0
+ 8558 0 2 10 0
8574 0 1 0 1
8575 0 1 0 1
8577 0 1 0 1
@@ -326,6 +329,7 @@ A B
8551 1054 1 60 0
8551 1187 1 60 0
8551 3502 1 60 0
+ 8558 0 2 10 0
8574 0 1 0 1
8575 0 1 0 1
8577 0 1 0 1