svn commit: r39642 - in /release/trafodion: apache-trafodion-2.3.0/ apache-trafodion-2.4.0/ apache-trafodion-2.4.0/bin/ apache-trafodion-2.4.0/bin/RH6/ apache-trafodion-2.4.0/src/
Author: selva Date: Mon May 18 06:14:06 2020 New Revision: 39642 Log: Apache Trafodion Final Release 2.4.0 Added: release/trafodion/apache-trafodion-2.4.0/ release/trafodion/apache-trafodion-2.4.0/bin/ release/trafodion/apache-trafodion-2.4.0/bin/RH6/ release/trafodion/apache-trafodion-2.4.0/bin/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm (with props) release/trafodion/apache-trafodion-2.4.0/bin/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm.asc release/trafodion/apache-trafodion-2.4.0/bin/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm.sha512 release/trafodion/apache-trafodion-2.4.0/bin/apache-trafodion_clients-2.4.0-RH6-x86_64.tar.gz (with props) release/trafodion/apache-trafodion-2.4.0/bin/apache-trafodion_clients-2.4.0-RH6-x86_64.tar.gz.asc release/trafodion/apache-trafodion-2.4.0/bin/apache-trafodion_clients-2.4.0-RH6-x86_64.tar.gz.sha512 release/trafodion/apache-trafodion-2.4.0/bin/apache-trafodion_pyinstaller-2.4.0.tar.gz (with props) release/trafodion/apache-trafodion-2.4.0/bin/apache-trafodion_pyinstaller-2.4.0.tar.gz.asc release/trafodion/apache-trafodion-2.4.0/bin/apache-trafodion_pyinstaller-2.4.0.tar.gz.sha512 release/trafodion/apache-trafodion-2.4.0/bin/apache-trafodion_server-2.4.0-RH6-x86_64.tar.gz (with props) release/trafodion/apache-trafodion-2.4.0/bin/apache-trafodion_server-2.4.0-RH6-x86_64.tar.gz.asc release/trafodion/apache-trafodion-2.4.0/bin/apache-trafodion_server-2.4.0-RH6-x86_64.tar.gz.sha512 release/trafodion/apache-trafodion-2.4.0/bin/traf_ambari-2.4.0-1.noarch.rpm (with props) release/trafodion/apache-trafodion-2.4.0/bin/traf_ambari-2.4.0-1.noarch.rpm.asc release/trafodion/apache-trafodion-2.4.0/bin/traf_ambari-2.4.0-1.noarch.rpm.sha512 release/trafodion/apache-trafodion-2.4.0/src/ release/trafodion/apache-trafodion-2.4.0/src/apache-trafodion-2.4.0-src.tar.gz (with props) release/trafodion/apache-trafodion-2.4.0/src/apache-trafodion-2.4.0-src.tar.gz.asc release/trafodion/apache-trafodion-2.4.0/src/apache-trafodion-2.4.0-src.tar.gz.sha512 Removed: release/trafodion/apache-trafodion-2.3.0/ Added: release/trafodion/apache-trafodion-2.4.0/bin/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm == Binary file - no diff available. Propchange: release/trafodion/apache-trafodion-2.4.0/bin/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm -- svn:mime-type = application/octet-stream Added: release/trafodion/apache-trafodion-2.4.0/bin/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm.asc == --- release/trafodion/apache-trafodion-2.4.0/bin/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm.asc (added) +++ release/trafodion/apache-trafodion-2.4.0/bin/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm.asc Mon May 18 06:14:06 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.14 (GNU/Linux) + +iQIcBAABAgAGBQJewhywAAoJEBo03S3Y7vJ0on4P/0zEVCQVbqWZvwD+ziR/pz2f +zzLpZFftVZGbfbhrSaAAMV92N1rdSw0tGE5OY+6EbH1YHClsCc/4+CuM8UjwAZuh +yBoCGbl0nJGAOpz3+7Hf0kkt55XAtgXei2oIWVMDCOIXBiQ7H8nZj0MFLlvknobk +GkIr9RUyJj3xA/lNF86tGIHBE/BKHotesjIunGAXK8xANqp1VKBHFUQ0YsDSg/7u +CuiGxD6G/sVXtXrIx6CpHKwHd02sceup5u9R5zVM3ktUaTh+0atPvtIzZwbFcLzq +WjYBHtn/+Nm6S7cVRQa7A8QatxN29yRILf8tXHUXFPZpQ+o+o5e9uK4dvb/hhm7x +KVrxtkrnJCcTDwgKMJY5qXNrUHBLjnHZI4jBqcuSI26y6WSeaudPwSVbS7s4MDxE +eUOtnvas59yfsu7cd5vZH4nFjWOOSTx54xA4O+izWiPBvsShaUIDUmzA5JgvPafY +RcUJaJXquNGHhDhWzvJjcjvjV2hB05dPvC4S8Pz0SZZP2ZNcIkhrIFRAQOBil5Lh +k8PT59bx00f2KttOAImfUIpr5FcrqJV2UEcxWacaisfLOruOimTsFeelstmgbUIe +ef84IwFbIVIW9wc6kvYrwO3aT9f4zHl8bjqp+234LEqD1oaRKCxRyPrgv5LA2Pfq +Dl7RMnHdCq/agKOApEfj +=4ZNU +-END PGP SIGNATURE- Added: release/trafodion/apache-trafodion-2.4.0/bin/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm.sha512 == --- release/trafodion/apache-trafodion-2.4.0/bin/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm.sha512 (added) +++ release/trafodion/apache-trafodion-2.4.0/bin/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm.sha512 Mon May 18 06:14:06 2020 @@ -0,0 +1 @@ +5073f7954f45dd2d0a09154c42126152cad791552de20cf8af5ad53854242676b06cb3919247005a7bf2a9ab5698fd43a7b52f1bf5061c6f8805abd8c98f71f0 apache-trafodion_server-2.4.0-1.x86_64.rpm Added: release/trafodion/apache-trafodion-2.4.0/bin/apache-trafodion_clients-2.4.0-RH6-x86_64.tar.gz == Binary file - no diff available. Propchange: release/trafodion/apache-trafodion-2.4.0/bin/apache-trafodion_clients-2.4.0-RH6-x86_64.tar.gz -- svn:mime-type = application/octet-stream Added
[trafodion] annotated tag rel/2.4.0 updated (af66cab -> 4454e01)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to annotated tag rel/2.4.0 in repository https://gitbox.apache.org/repos/asf/trafodion.git. *** WARNING: tag rel/2.4.0 was modified! *** from af66cab (commit) to 4454e01 (tag) tagging af66cabc4b029327e35520070fa39f48faca9e7a (commit) replaces 2.4.0rc1 by selvaganesang on Sun May 17 18:12:31 2020 -0700 - Log - Release 2.4.0 Final --- No new revisions were added by this update. Summary of changes:
[trafodion] 01/01: Merge pull request #1878 from apache/revert-1877-release2.4
This is an automated email from the ASF dual-hosted git repository. selva pushed a commit to branch release2.4 in repository https://gitbox.apache.org/repos/asf/trafodion.git commit af66cabc4b029327e35520070fa39f48faca9e7a Merge: 5faad05 4bb6e39 Author: Selvaganesan Govindarajan AuthorDate: Sun May 17 18:00:49 2020 -0700 Merge pull request #1878 from apache/revert-1877-release2.4 Revert "Changed the license year in Release 2.4.0 branch" core/sqf/sqenvcom.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[trafodion] branch release2.4 updated (5faad05 -> af66cab)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to branch release2.4 in repository https://gitbox.apache.org/repos/asf/trafodion.git. from 5faad05 Merge pull request #1877 from selvaganesang/release2.4 add 4bb6e39 Revert "Changed the license year in Release 2.4.0 branch" new af66cab Merge pull request #1878 from apache/revert-1877-release2.4 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: core/sqf/sqenvcom.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[trafodion] 01/01: Revert "Changed the license year in Release 2.4.0 branch"
This is an automated email from the ASF dual-hosted git repository.
selva pushed a commit to branch revert-1877-release2.4
in repository https://gitbox.apache.org/repos/asf/trafodion.git
commit 4bb6e39be43dd9101883b6e5f7f66673f4112c54
Author: Selvaganesan Govindarajan
AuthorDate: Sun May 17 18:00:19 2020 -0700
Revert "Changed the license year in Release 2.4.0 branch"
---
core/sqf/sqenvcom.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index ee65050..72e4c55 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -37,7 +37,7 @@ export TRAFODION_VER_UPDATE=0
export
TRAFODION_VER="${TRAFODION_VER_MAJOR}.${TRAFODION_VER_MINOR}.${TRAFODION_VER_UPDATE}"
# Product copyright header
-export PRODUCT_COPYRIGHT_HEADER="2015-2019 Apache Software Foundation"
+export PRODUCT_COPYRIGHT_HEADER="2015-2020 Apache Software Foundation"
##
# Trafodion authentication:
#Set TRAFODION_ENABLE_AUTHENTICATION to YES to enable
[trafodion] branch revert-1877-release2.4 created (now 4bb6e39)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to branch revert-1877-release2.4 in repository https://gitbox.apache.org/repos/asf/trafodion.git. at 4bb6e39 Revert "Changed the license year in Release 2.4.0 branch" This branch includes the following new commits: new 4bb6e39 Revert "Changed the license year in Release 2.4.0 branch" The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[trafodion] annotated tag rel/2.4.0 updated (5faad05 -> ec674fd)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to annotated tag rel/2.4.0 in repository https://gitbox.apache.org/repos/asf/trafodion.git. *** WARNING: tag rel/2.4.0 was modified! *** from 5faad05 (commit) to ec674fd (tag) tagging 5faad05ace44869c86d4b9ff0de500ec154c2159 (commit) replaces 2.4.0rc1 by selvaganesang on Sun May 17 17:51:30 2020 -0700 - Log - Release 2.4.0 Final --- No new revisions were added by this update. Summary of changes:
[trafodion] branch release2.4 updated: Changed the license year in Release 2.4.0 branch
This is an automated email from the ASF dual-hosted git repository.
selva pushed a commit to branch release2.4
in repository https://gitbox.apache.org/repos/asf/trafodion.git
The following commit(s) were added to refs/heads/release2.4 by this push:
new ff988d3 Changed the license year in Release 2.4.0 branch
new 5faad05 Merge pull request #1877 from selvaganesang/release2.4
ff988d3 is described below
commit ff988d3c38bf6a815614d79d5d758dae4cc846de
Author: selvaganesang
AuthorDate: Sun May 17 17:46:03 2020 -0700
Changed the license year in Release 2.4.0 branch
---
core/sqf/sqenvcom.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index 72e4c55..ee65050 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -37,7 +37,7 @@ export TRAFODION_VER_UPDATE=0
export
TRAFODION_VER="${TRAFODION_VER_MAJOR}.${TRAFODION_VER_MINOR}.${TRAFODION_VER_UPDATE}"
# Product copyright header
-export PRODUCT_COPYRIGHT_HEADER="2015-2020 Apache Software Foundation"
+export PRODUCT_COPYRIGHT_HEADER="2015-2019 Apache Software Foundation"
##
# Trafodion authentication:
#Set TRAFODION_ENABLE_AUTHENTICATION to YES to enable
[trafodion-site] branch asf-site updated: Changes to trigger refresh of the Apache Trafodion Website
This is an automated email from the ASF dual-hosted git repository. selva pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/trafodion-site.git The following commit(s) were added to refs/heads/asf-site by this push: new e08257f Changes to trigger refresh of the Apache Trafodion Website e08257f is described below commit e08257f6b40a6c1ae27ed235ca8389338210fe45 Author: selvaganesang AuthorDate: Sat May 2 19:16:53 2020 -0700 Changes to trigger refresh of the Apache Trafodion Website --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 769d892..a7c407e 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ Rendered using Reflow Maven Skin 1.1.1 (http://andriusvelykis.github.io/reflow-maven-skin) --> - + Apache Trafodion
[trafodion] 01/01: Merge pull request #1875 from selvaganesang/release2.4
This is an automated email from the ASF dual-hosted git repository. selva pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafodion.git commit 962d9f8cab74b910da77329d2b1e5ba03f89b456 Merge: fddbff7 c380eb5 Author: Selvaganesan Govindarajan AuthorDate: Sat May 2 08:59:50 2020 -0700 Merge pull request #1875 from selvaganesang/release2.4 Changed the License Year in sqenvcom.sh
[trafodion] branch master updated (fddbff7 -> 962d9f8)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafodion.git. from fddbff7 Merge pull request #1874 from selvaganesang/change_release_no add c380eb5 Changed the License Year in sqenvcom.sh new 962d9f8 Merge pull request #1875 from selvaganesang/release2.4 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes:
[trafodion] branch release2.4 updated: Changed the License Year in sqenvcom.sh
This is an automated email from the ASF dual-hosted git repository.
selva pushed a commit to branch release2.4
in repository https://gitbox.apache.org/repos/asf/trafodion.git
The following commit(s) were added to refs/heads/release2.4 by this push:
new c380eb5 Changed the License Year in sqenvcom.sh
new 361f9ec Merge pull request #1876 from selvaganesang/release2.4
c380eb5 is described below
commit c380eb5f703d27302005907c87c50cf849acc8c0
Author: selvaganesang
AuthorDate: Fri May 1 13:13:54 2020 -0700
Changed the License Year in sqenvcom.sh
---
core/sqf/sqenvcom.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index ee65050..72e4c55 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -37,7 +37,7 @@ export TRAFODION_VER_UPDATE=0
export
TRAFODION_VER="${TRAFODION_VER_MAJOR}.${TRAFODION_VER_MINOR}.${TRAFODION_VER_UPDATE}"
# Product copyright header
-export PRODUCT_COPYRIGHT_HEADER="2015-2019 Apache Software Foundation"
+export PRODUCT_COPYRIGHT_HEADER="2015-2020 Apache Software Foundation"
##
# Trafodion authentication:
#Set TRAFODION_ENABLE_AUTHENTICATION to YES to enable
svn commit: r39228 - in /dev/trafodion/trafodion-2.4.0-RC1: ./ RH6/
Author: selva Date: Fri May 1 17:18:08 2020 New Revision: 39228 Log: Created Apache Trafodion 2.4.0 RC1 download Added: dev/trafodion/trafodion-2.4.0-RC1/ dev/trafodion/trafodion-2.4.0-RC1/RH6/ dev/trafodion/trafodion-2.4.0-RC1/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm (with props) dev/trafodion/trafodion-2.4.0-RC1/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm.asc dev/trafodion/trafodion-2.4.0-RC1/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm.sha512 dev/trafodion/trafodion-2.4.0-RC1/apache-trafodion-2.4.0-src.tar.gz (with props) dev/trafodion/trafodion-2.4.0-RC1/apache-trafodion-2.4.0-src.tar.gz.asc dev/trafodion/trafodion-2.4.0-RC1/apache-trafodion-2.4.0-src.tar.gz.sha512 dev/trafodion/trafodion-2.4.0-RC1/apache-trafodion_clients-2.4.0-RH6-x86_64.tar.gz (with props) dev/trafodion/trafodion-2.4.0-RC1/apache-trafodion_clients-2.4.0-RH6-x86_64.tar.gz.asc dev/trafodion/trafodion-2.4.0-RC1/apache-trafodion_clients-2.4.0-RH6-x86_64.tar.gz.sha512 dev/trafodion/trafodion-2.4.0-RC1/apache-trafodion_pyinstaller-2.4.0.tar.gz (with props) dev/trafodion/trafodion-2.4.0-RC1/apache-trafodion_pyinstaller-2.4.0.tar.gz.asc dev/trafodion/trafodion-2.4.0-RC1/apache-trafodion_pyinstaller-2.4.0.tar.gz.sha512 dev/trafodion/trafodion-2.4.0-RC1/apache-trafodion_server-2.4.0-RH6-x86_64.tar.gz (with props) dev/trafodion/trafodion-2.4.0-RC1/apache-trafodion_server-2.4.0-RH6-x86_64.tar.gz.asc dev/trafodion/trafodion-2.4.0-RC1/apache-trafodion_server-2.4.0-RH6-x86_64.tar.gz.sha512 dev/trafodion/trafodion-2.4.0-RC1/traf_ambari-2.4.0-1.noarch.rpm (with props) dev/trafodion/trafodion-2.4.0-RC1/traf_ambari-2.4.0-1.noarch.rpm.asc dev/trafodion/trafodion-2.4.0-RC1/traf_ambari-2.4.0-1.noarch.rpm.sha512 Added: dev/trafodion/trafodion-2.4.0-RC1/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm == Binary file - no diff available. Propchange: dev/trafodion/trafodion-2.4.0-RC1/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm -- svn:mime-type = application/octet-stream Added: dev/trafodion/trafodion-2.4.0-RC1/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm.asc == --- dev/trafodion/trafodion-2.4.0-RC1/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm.asc (added) +++ dev/trafodion/trafodion-2.4.0-RC1/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm.asc Fri May 1 17:18:08 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.14 (GNU/Linux) + +iQIcBAABAgAGBQJerE1nAAoJEBo03S3Y7vJ0ScoP/2R3Ui/Jwmo5t6NzTuP5o159 +Xv9Lwa2Zc/Ql7X1W6FrRiLWmnvjkaLf3kKA9EYXEeiNIVAezA3p8D3V4oyGk3b6u +DK8pc0GX15Ha0sHwtDIAJ9hA4xqIHFOk0eEMJB7PeN0bKa+XV2Ow/jQZmT9cH8iq +HcmwtEFa7XrEHEAWU+5p0mlU0JT2U9Wylr4GQJtgQgH8DcoRxFQeN79i+HSZUG1L +u2FLri9kYGqc19/gK+p87l+645nm7beYep3SUG+Wg+Bu3UAEsKVj7om0bDa8c0Ns +h7MpV8ZdIC5Bg33QC+QL6P5iGPKCCHTan2SOrvCBi9LmxNUoc1BKRujejyydic7i +hdwTmWURPMyV892ZblwmeWd64z3kqCkJoIbLBYcs6t05SEQOSlYfmf0WAZJvkM21 +dLveKJciDDS67c9QaaDL3rdC3KD8b6RIVT6zYarngd5DZGe/ZJxLDuhi6OnZp4YF +55kEOGp4AzjOtf8BqWShrrEKLcvOHQJzdTd595yDtJBMChloLJBOIUhQciTNMkYw +YwMbxx51jDZtuHGPC9zo01qYLUdKqj+WgoQJfYxiJw4Axs/s4eFPiyuPLH2yfRHe +F7xiYziWNsR6dKSZGmpVjrvEWKmsjbONMFnHKYQMe7gjCUEW/8cSqMGnqTHIJiHx +/RhUy1OQYbM80mlQXHo1 +=DdmM +-END PGP SIGNATURE- Added: dev/trafodion/trafodion-2.4.0-RC1/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm.sha512 == --- dev/trafodion/trafodion-2.4.0-RC1/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm.sha512 (added) +++ dev/trafodion/trafodion-2.4.0-RC1/RH6/apache-trafodion_server-2.4.0-1.x86_64.rpm.sha512 Fri May 1 17:18:08 2020 @@ -0,0 +1 @@ +1e5556e43b5b4b645cd091879639f0c94fe521150db278d456b1ab03da955749b0f05d4821aa5ae7c7accc3ce222e05827ff5bb6f42fe549824ed9748f96eb70 apache-trafodion_server-2.4.0-1.x86_64.rpm Added: dev/trafodion/trafodion-2.4.0-RC1/apache-trafodion-2.4.0-src.tar.gz == Binary file - no diff available. Propchange: dev/trafodion/trafodion-2.4.0-RC1/apache-trafodion-2.4.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/trafodion/trafodion-2.4.0-RC1/apache-trafodion-2.4.0-src.tar.gz.asc == --- dev/trafodion/trafodion-2.4.0-RC1/apache-trafodion-2.4.0-src.tar.gz.asc (added) +++ dev/trafodion/trafodion-2.4.0-RC1/apache-trafodion-2.4.0-src.tar.gz.asc Fri May 1 17:18:08 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2.0.14 (GNU/Linux) + +iQIcBAABAgAGBQJerEodAAoJEBo03S3Y7vJ09lsP/ins77rgdItt3EhKMg/1DGmD
svn commit: r39227 - /dev/trafodion/KEYS
Author: selva Date: Fri May 1 17:03:05 2020 New Revision: 39227 Log: Added new public key to KEYS file Modified: dev/trafodion/KEYS Modified: dev/trafodion/KEYS == --- dev/trafodion/KEYS (original) +++ dev/trafodion/KEYS Fri May 1 17:03:05 2020 @@ -378,3 +378,61 @@ eWAgA7593E1IaDeMh5n/Oj4fFbAc48klxu7yDP6p beM3mfP77xUC+mrbMhTc9uiEoDy9QVU9DWw/Z25KyxL4sSTHwU3f =u581 -END PGP PUBLIC KEY BLOCK- +pub 4096R/D8EEF274 2020-04-21 +uid Selvaganesan Govindarajan (CODE SIGNING KEY) +sig 3D8EEF274 2020-04-23 Selvaganesan Govindarajan (CODE SIGNING KEY) +sub 4096R/812CDDEF 2020-04-21 +sig D8EEF274 2020-04-21 Selvaganesan Govindarajan (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v2.0.14 (GNU/Linux) + +mQINBF6fAAMBEACeaGrM0EZjmj9cUmaJaMEWxgK7wgOHGXHWw42SU5vaBtXTyMQJ +KRofoNfaPHVdKjfg4wXpECHDHzIjR0GeQzzKSzJBG04ohLEVNXZ+oyjf6rXBUrxg +aKHgowj0//NbfRU7jB02URYiIWRDo2iDeMny6SGPoAs9teoxgKgO07jddOR+0F57 +akZUuNAein5rsBhRucLz0a3X8+t75+HxhY1mt2VTGTJw78FS9ptoO+AL5ObJRmYq +4Jw4PQ4GnEaL0nYDe8MHTVR+81YlwQWTVUM7QSOLdMieHdSOH7bE8tSrlYl8BD+q +bwRhvfzvtXLDljByob6jIH0YfeYsgeI3YPf7l3OUBqcT/glG/A3fWoY+wztcSNae +Rf+MqNnInhfIYdPSHOAnqTE6I1eZjf1u2mR+cNqkLeAcBnKQSyLNx5a+lNqXjWnX +H53a8NNBTlhqdODspDnCjwHT699DjcfYduyk4L/J/tP02lWpXkyZ0BTNfEBn9jUr +MGvN3aznh8dORwnv7BcKYClHxet5so/MG6nRQQibwrxUnszKTLCz8cBeybCXpQSe +pVYHGRauF1Q64hXpTPqKUaNtOyoVC0KYgW50s6sCvaK2zemKfcg2ArT336nPIQSN +VkFUKXKniCZyNgsS/mmupzIIJ9rixQQTzeq+8vGpbsDsrQsFfWMg5m/f0wARAQAB +tD9TZWx2YWdhbmVzYW4gR292aW5kYXJhamFuIChDT0RFIFNJR05JTkcgS0VZKSA8 +c2VsdmFAYXBhY2hlLm9yZz6JAjgEEwECACICGwMCHgECF4AFAl6hFZUGCwkIBwMC +BhUIAgkKCwQWAgMBAAoJEBo03S3Y7vJ0iQEP/RTnsdrIkI5GADEav3rxJdZCjm56 +2mDh9zX2IQoCn532hoIv2VybbzH0iYASRxRe2pyGZQduEKrFlIelZt1+GHnQx6wv +Buni1XmBmFFESyS9GxHoMgcf2gdJwrNNIq/uF8sXulqRKVZkrLYxPxl2/XSiLNyr +i9k+XSQdvVoMna8GsMefQT/cFwknJFyjm9+aQlLDM3F/1SCRp4+6wp7Y2xl+hP4Q +XuXjwPyS+E0+QTYMNUTgyl+m/Kq8fVsoZkV6SX6e5LXEiAkZSfHl2+jY0IL0cman +63qlBtfwTQ9MUdCQCbgO7jQhTn6dnk8p/T6fnLq1X9FOHlR92BUYTyCNZySaAFae +iNkJWq5JEyU0GFd/TtzkRDLL3oDagvGYlPb1AfHd248MjrtMCEM5daE4pOby6I0H +TJEP6/Liw5ByWeXQ1ELoc6uIwHDgsUzX2PTvc9FFQ2Dbo1tZeJWTktbRoxf3aRSg +r1YMgjSvp/H26kqfd/snSmnZhmnhFXQ5QfoFlsRUmywxPS7r6QkMmxzvDzpYNmWA +ITVQAqF5CJr46PmPhMpwWFbcy7OpforSMw8HgP8YxlNl5XHCvhF/YDMDjq3ssUCj +4WkMTUF0rUmzVIz2X+fYrU+cHWjcEFH8xC6vCa0pdks9nIGKvnhtPXAXaUzvweLO +qIJYpsFJnSPFyTl7uQINBF6fAAMBEACijcKqLYebMHCGXA0JAjsQznMnl7ZLfo/8 +b2fMLzKLQqqPqyeZG1nbV1KVjW+FRKHDlW0HKXIPv6vRiCcgP9UCiWwbI2zN9Qjw +s4DPozMQcU+Lche74kMN8pdVgq70n4p3noqCDrFpu3Mswjb8euuaxZgpZ8SVMehb +QuxUQOR3hBz1tC3xHgAYtSLb/TGU2jWInGKsO3UK/Qqtais9zYuErugNCTaAHdSX +06hi1HR3qYeIlgGT3fGFzEflGcMsFP05QTChkHfJTgafgVWKZBcLQk23m10AxZCk +km8hKbMF/HUxPQ20hEqNaKds7Qny6DEYJtkBKqYJMRruI9fZ+KogtzNHPQKTsC8w +/OnQkpv09qb7kjO3z+W0W6Buzd2JdfDN2lYdGITua4tSmrmVxmypByhNTvTpvCnM +0NxKaf0ExD9YBk95t2erQQTIhdq5f2HUXtLkNFMAhAgdBW1b0yEGjaOxBhuIqgwC +b/SOtWoUL4X1MBJtlCVwb0mSAqfQuPEt+ht5gyUvZMjxUhl0dRkAE0hOH0CdkQEb +iEaJyCASp7nqlw9FTjHn9biiL+buVf5Sfu1tb5Ks+uFQA+31Do+Zjq0AFHRtaa7v +dm2vQfHlEHT+Mus9htT7uQE50tleWfKOCqbGiWx67Ps/2lQVjyFw44Pu1kVAsjYg +a+cbUKL9VQARAQABiQIfBBgBAgAJBQJenwADAhsMAAoJEBo03S3Y7vJ0fBgP/AkQ +y8bv8IsPahmhL7ajVPJotQkCPnWLaw+90Qd57RxQFGclxSChvBAXf+ZKK0J3q562 +aaVIpA2DW9cuJVhSTceOP9bo2pyh4/9T6Y93ChjimxfG1lVrL1EzI/HGbHAtiqIC +MJ7L0g6vlORrUyCAE/g2LesV0Ycl2nP0jW+yRQXe2sFIXXDoycO/JaEzhVe1Pack +OTYtHZz70OlwaZItSENW/8UxoPzhNNJZf/Ig7dObveihkhJUAGe05/e1afZblJVY +zL7IWdxOakKX2RH2nsrSGg55hs+4ByjWNltBls0PJCD8KmUubcBJFZCByWKCKB/L +SG8x3tMZmwqJ6MBppiSXiEU1S+rmaGmXtCDHjiVHggDOlXTSv+9C6nIR/hA4+lCl +nfjKIBxIw6i4ofHbIqdgK+vun/bp6jyaGv2InxztWlpdWIqahw01JaljyDC7pt/Y +EB/yM3qcxNkVC1KTcsxBP/NHGal3jss/kbpN7LU8cJtLAHGUmgq3/NjWcXWhg8Sx +cYCqrrKBXUBfxHOCabCmUwxtP7oSJby90P48Y6f7Lz63yNb2eaZLrrMZXCXCtjf0 +aFRvMas8w0YzhOdCi1rrs0JVsvC+FgstjZFCl3wXIlez8e2qYTNDEdsuA5YcGGml +QLS+cRcMm7FDBZAqJAtS3oLZv2kA/qWpUZa8x7V7 +=j18j +-END PGP PUBLIC KEY BLOCK-
svn commit: r39225 - /release/trafodion/KEYS
Author: selva Date: Fri May 1 15:54:30 2020 New Revision: 39225 Log: added new public key to KEYS file Modified: release/trafodion/KEYS Modified: release/trafodion/KEYS == --- release/trafodion/KEYS (original) +++ release/trafodion/KEYS Fri May 1 15:54:30 2020 @@ -458,3 +458,61 @@ eWAgA7593E1IaDeMh5n/Oj4fFbAc48klxu7yDP6p beM3mfP77xUC+mrbMhTc9uiEoDy9QVU9DWw/Z25KyxL4sSTHwU3f =u581 -END PGP PUBLIC KEY BLOCK- +pub 4096R/D8EEF274 2020-04-21 +uid Selvaganesan Govindarajan (CODE SIGNING KEY) +sig 3D8EEF274 2020-04-23 Selvaganesan Govindarajan (CODE SIGNING KEY) +sub 4096R/812CDDEF 2020-04-21 +sig D8EEF274 2020-04-21 Selvaganesan Govindarajan (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v2.0.14 (GNU/Linux) + +mQINBF6fAAMBEACeaGrM0EZjmj9cUmaJaMEWxgK7wgOHGXHWw42SU5vaBtXTyMQJ +KRofoNfaPHVdKjfg4wXpECHDHzIjR0GeQzzKSzJBG04ohLEVNXZ+oyjf6rXBUrxg +aKHgowj0//NbfRU7jB02URYiIWRDo2iDeMny6SGPoAs9teoxgKgO07jddOR+0F57 +akZUuNAein5rsBhRucLz0a3X8+t75+HxhY1mt2VTGTJw78FS9ptoO+AL5ObJRmYq +4Jw4PQ4GnEaL0nYDe8MHTVR+81YlwQWTVUM7QSOLdMieHdSOH7bE8tSrlYl8BD+q +bwRhvfzvtXLDljByob6jIH0YfeYsgeI3YPf7l3OUBqcT/glG/A3fWoY+wztcSNae +Rf+MqNnInhfIYdPSHOAnqTE6I1eZjf1u2mR+cNqkLeAcBnKQSyLNx5a+lNqXjWnX +H53a8NNBTlhqdODspDnCjwHT699DjcfYduyk4L/J/tP02lWpXkyZ0BTNfEBn9jUr +MGvN3aznh8dORwnv7BcKYClHxet5so/MG6nRQQibwrxUnszKTLCz8cBeybCXpQSe +pVYHGRauF1Q64hXpTPqKUaNtOyoVC0KYgW50s6sCvaK2zemKfcg2ArT336nPIQSN +VkFUKXKniCZyNgsS/mmupzIIJ9rixQQTzeq+8vGpbsDsrQsFfWMg5m/f0wARAQAB +tD9TZWx2YWdhbmVzYW4gR292aW5kYXJhamFuIChDT0RFIFNJR05JTkcgS0VZKSA8 +c2VsdmFAYXBhY2hlLm9yZz6JAjgEEwECACICGwMCHgECF4AFAl6hFZUGCwkIBwMC +BhUIAgkKCwQWAgMBAAoJEBo03S3Y7vJ0iQEP/RTnsdrIkI5GADEav3rxJdZCjm56 +2mDh9zX2IQoCn532hoIv2VybbzH0iYASRxRe2pyGZQduEKrFlIelZt1+GHnQx6wv +Buni1XmBmFFESyS9GxHoMgcf2gdJwrNNIq/uF8sXulqRKVZkrLYxPxl2/XSiLNyr +i9k+XSQdvVoMna8GsMefQT/cFwknJFyjm9+aQlLDM3F/1SCRp4+6wp7Y2xl+hP4Q +XuXjwPyS+E0+QTYMNUTgyl+m/Kq8fVsoZkV6SX6e5LXEiAkZSfHl2+jY0IL0cman +63qlBtfwTQ9MUdCQCbgO7jQhTn6dnk8p/T6fnLq1X9FOHlR92BUYTyCNZySaAFae +iNkJWq5JEyU0GFd/TtzkRDLL3oDagvGYlPb1AfHd248MjrtMCEM5daE4pOby6I0H +TJEP6/Liw5ByWeXQ1ELoc6uIwHDgsUzX2PTvc9FFQ2Dbo1tZeJWTktbRoxf3aRSg +r1YMgjSvp/H26kqfd/snSmnZhmnhFXQ5QfoFlsRUmywxPS7r6QkMmxzvDzpYNmWA +ITVQAqF5CJr46PmPhMpwWFbcy7OpforSMw8HgP8YxlNl5XHCvhF/YDMDjq3ssUCj +4WkMTUF0rUmzVIz2X+fYrU+cHWjcEFH8xC6vCa0pdks9nIGKvnhtPXAXaUzvweLO +qIJYpsFJnSPFyTl7uQINBF6fAAMBEACijcKqLYebMHCGXA0JAjsQznMnl7ZLfo/8 +b2fMLzKLQqqPqyeZG1nbV1KVjW+FRKHDlW0HKXIPv6vRiCcgP9UCiWwbI2zN9Qjw +s4DPozMQcU+Lche74kMN8pdVgq70n4p3noqCDrFpu3Mswjb8euuaxZgpZ8SVMehb +QuxUQOR3hBz1tC3xHgAYtSLb/TGU2jWInGKsO3UK/Qqtais9zYuErugNCTaAHdSX +06hi1HR3qYeIlgGT3fGFzEflGcMsFP05QTChkHfJTgafgVWKZBcLQk23m10AxZCk +km8hKbMF/HUxPQ20hEqNaKds7Qny6DEYJtkBKqYJMRruI9fZ+KogtzNHPQKTsC8w +/OnQkpv09qb7kjO3z+W0W6Buzd2JdfDN2lYdGITua4tSmrmVxmypByhNTvTpvCnM +0NxKaf0ExD9YBk95t2erQQTIhdq5f2HUXtLkNFMAhAgdBW1b0yEGjaOxBhuIqgwC +b/SOtWoUL4X1MBJtlCVwb0mSAqfQuPEt+ht5gyUvZMjxUhl0dRkAE0hOH0CdkQEb +iEaJyCASp7nqlw9FTjHn9biiL+buVf5Sfu1tb5Ks+uFQA+31Do+Zjq0AFHRtaa7v +dm2vQfHlEHT+Mus9htT7uQE50tleWfKOCqbGiWx67Ps/2lQVjyFw44Pu1kVAsjYg +a+cbUKL9VQARAQABiQIfBBgBAgAJBQJenwADAhsMAAoJEBo03S3Y7vJ0fBgP/AkQ +y8bv8IsPahmhL7ajVPJotQkCPnWLaw+90Qd57RxQFGclxSChvBAXf+ZKK0J3q562 +aaVIpA2DW9cuJVhSTceOP9bo2pyh4/9T6Y93ChjimxfG1lVrL1EzI/HGbHAtiqIC +MJ7L0g6vlORrUyCAE/g2LesV0Ycl2nP0jW+yRQXe2sFIXXDoycO/JaEzhVe1Pack +OTYtHZz70OlwaZItSENW/8UxoPzhNNJZf/Ig7dObveihkhJUAGe05/e1afZblJVY +zL7IWdxOakKX2RH2nsrSGg55hs+4ByjWNltBls0PJCD8KmUubcBJFZCByWKCKB/L +SG8x3tMZmwqJ6MBppiSXiEU1S+rmaGmXtCDHjiVHggDOlXTSv+9C6nIR/hA4+lCl +nfjKIBxIw6i4ofHbIqdgK+vun/bp6jyaGv2InxztWlpdWIqahw01JaljyDC7pt/Y +EB/yM3qcxNkVC1KTcsxBP/NHGal3jss/kbpN7LU8cJtLAHGUmgq3/NjWcXWhg8Sx +cYCqrrKBXUBfxHOCabCmUwxtP7oSJby90P48Y6f7Lz63yNb2eaZLrrMZXCXCtjf0 +aFRvMas8w0YzhOdCi1rrs0JVsvC+FgstjZFCl3wXIlez8e2qYTNDEdsuA5YcGGml +QLS+cRcMm7FDBZAqJAtS3oLZv2kA/qWpUZa8x7V7 +=j18j +-END PGP PUBLIC KEY BLOCK-
[trafodion] annotated tag 2.4.0rc1 created (now 886ae06)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to annotated tag 2.4.0rc1 in repository https://gitbox.apache.org/repos/asf/trafodion.git. at 886ae06 (tag) tagging a26452c1aef93ade2cf68010323517bf51529568 (commit) replaces 2.3.0rc1 by selvaganesang on Thu Apr 23 22:53:25 2020 -0700 - Log - Created 2.4.0rc1 tag --- No new revisions were added by this update.
[trafodion] branch master updated: Updated the version number to Release 2.5 in the main master thread
This is an automated email from the ASF dual-hosted git repository.
selva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git
The following commit(s) were added to refs/heads/master by this push:
new 54ddc40 Updated the version number to Release 2.5 in the main master
thread
new fddbff7 Merge pull request #1874 from selvaganesang/change_release_no
54ddc40 is described below
commit 54ddc401e0b05d1e45804d7b69e2ff45fa09805c
Author: selvaganesang
AuthorDate: Thu Apr 23 20:23:38 2020 -0700
Updated the version number to Release 2.5 in the main master thread
---
core/sqf/sqenvcom.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index ee65050..2005af2 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -32,12 +32,12 @@
#Product version (Trafodion or derivative product)
export TRAFODION_VER_PROD="Apache Trafodion"
export TRAFODION_VER_MAJOR=2
-export TRAFODION_VER_MINOR=4
+export TRAFODION_VER_MINOR=5
export TRAFODION_VER_UPDATE=0
export
TRAFODION_VER="${TRAFODION_VER_MAJOR}.${TRAFODION_VER_MINOR}.${TRAFODION_VER_UPDATE}"
# Product copyright header
-export PRODUCT_COPYRIGHT_HEADER="2015-2019 Apache Software Foundation"
+export PRODUCT_COPYRIGHT_HEADER="2015-2020 Apache Software Foundation"
##
# Trafodion authentication:
#Set TRAFODION_ENABLE_AUTHENTICATION to YES to enable
[trafodion] branch release2.4 created (now a26452c)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to branch release2.4 in repository https://gitbox.apache.org/repos/asf/trafodion.git. at a26452c Merge pull request #1873 from selvaganesang/master No new revisions were added by this update.
[trafodion] branch master updated: Update traf_tools_setup.sh
This is an automated email from the ASF dual-hosted git repository. selva pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafodion.git The following commit(s) were added to refs/heads/master by this push: new 627370c Update traf_tools_setup.sh new a26452c Merge pull request #1873 from selvaganesang/master 627370c is described below commit 627370c61974be023e48e0ebf0d7ff9d5d711d49 Author: Selvaganesan Govindarajan AuthorDate: Sat Apr 18 21:11:35 2020 -0700 Update traf_tools_setup.sh --- install/traf_tools_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/traf_tools_setup.sh b/install/traf_tools_setup.sh index 956cd59..de9388a 100755 --- a/install/traf_tools_setup.sh +++ b/install/traf_tools_setup.sh @@ -317,7 +317,7 @@ echo "INFO: Installing ICU on $(date)" | tee -a $LOGFILE if [ -d $TOOLSDIR/icu4c_4.4/linux64/bin ]; then echo "INFO: ICU is already installed, skipping to next tool" | tee -a $LOGFILE else - downloadSource http://download.icu-project.org/files/icu4c/4.4/icu4c-4_4-src.tgz icu4c-4_4-src + downloadSource https://sourceforge.net/projects/icu/files/ICU4C/4.4.2/icu4c-4_4_2-src.tgz icu4c-4_4-src cd icu/source ./configure --prefix=$TOOLSDIR/icu4c_4.4/linux64 >>$LOGFILE 2>&1 echo "INFO: configure complete" | tee -a $LOGFILE
[trafodion] branch master updated (63c9d37 -> 232dabc)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafodion.git. from 63c9d37 Merge pull request #1871 from selvaganesang/test131_failure new 4426d11 [TRAFODION-3334] Refactored and re-implemented monitor communication. All monitor communication channels managed by a specific object in a thread now use a common class inherited by the object managing a specific communication channel. This new class provides blocking and non-blocking IO methods. new 9f5b054 Code review fixes. new ea76900 Fix to correct stdout file location in persist process creation by PSD process on node up. new 0ae9329 Added display of trace configuration file location at process intialization. new 5f8755f Code review fixes. new 232dabc Merge pull request #1869 from zcorrea/TRAFODION-3334 The 7245 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../sqf/export/include/common/evl_sqlog_eventnum.h | 133 +- core/sqf/monitor/linux/cluster.cxx | 2241 +--- core/sqf/monitor/linux/cluster.h | 36 +- core/sqf/monitor/linux/comm.cxx| 1757 +++ core/sqf/monitor/linux/comm.h | 106 + core/sqf/monitor/linux/commaccept.cxx | 256 ++- core/sqf/monitor/linux/commaccept.h| 22 +- core/sqf/monitor/linux/config.cxx | 16 +- core/sqf/monitor/linux/healthcheck.cxx |5 + core/sqf/monitor/linux/makefile|7 +- core/sqf/monitor/linux/monitor.cxx | 85 +- core/sqf/monitor/linux/monlogging.cxx | 24 +- core/sqf/monitor/linux/msgdef.h| 11 + core/sqf/monitor/linux/nameserver.cxx | 542 ++--- core/sqf/monitor/linux/nameserver.h| 20 +- core/sqf/monitor/linux/nscluster.cxx | 11 - core/sqf/monitor/linux/nscommacceptmon.cxx | 160 +- core/sqf/monitor/linux/nscommacceptmon.h | 16 +- core/sqf/monitor/linux/nsreqqueue.cxx | 19 +- core/sqf/monitor/linux/pnode.cxx | 26 +- core/sqf/monitor/linux/pnode.h | 31 +- core/sqf/monitor/linux/pstartd.cxx | 37 +- core/sqf/monitor/linux/ptpclient.cxx | 197 +- core/sqf/monitor/linux/ptpclient.h | 11 +- core/sqf/monitor/linux/ptpcommaccept.cxx | 165 +- core/sqf/monitor/linux/ptpcommaccept.h | 24 +- core/sqf/monitor/linux/reqnodedown.cxx |3 +- core/sqf/monitor/linux/reqqueue.cxx| 122 +- core/sqf/monitor/linux/shell.cxx | 86 +- core/sqf/monitor/linux/watchdog.cxx| 27 + core/sqf/monitor/linux/zclient.cxx | 168 +- core/sqf/monitor/linux/zclient.h |9 +- core/sqf/sqenvcom.sh |9 +- 33 files changed, 3717 insertions(+), 2665 deletions(-) create mode 100644 core/sqf/monitor/linux/comm.cxx create mode 100644 core/sqf/monitor/linux/comm.h
[trafodion] branch master updated: Fix for core/TEST131 test failure
This is an automated email from the ASF dual-hosted git repository.
selva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git
The following commit(s) were added to refs/heads/master by this push:
new ca3dc2c Fix for core/TEST131 test failure
new 63c9d37 Merge pull request #1871 from selvaganesang/test131_failure
ca3dc2c is described below
commit ca3dc2c4cd56b31ddf0fe93dcd7dbd9667f942a8
Author: selvaganesang
AuthorDate: Fri Feb 21 20:18:01 2020 +
Fix for core/TEST131 test failure
The query compile timestamp was changed unnecessarily at times.
---
core/sql/cli/Statement.cpp | 56 --
1 file changed, 56 deletions(-)
diff --git a/core/sql/cli/Statement.cpp b/core/sql/cli/Statement.cpp
index b0319ec..ac133c5 100644
--- a/core/sql/cli/Statement.cpp
+++ b/core/sql/cli/Statement.cpp
@@ -3090,63 +3090,7 @@ RETCODE Statement::execute(CliGlobals * cliGlobals,
Descriptor * input_desc,
state_ = ERROR_;
break;
}
- SQL_QUERY_COST_INFO query_cost_info;
- SQL_QUERY_COMPILER_STATS_INFO query_comp_stats_info;
- query_cost_info.cpuTime = 0;
- query_cost_info.ioTime= 0;
- query_cost_info.msgTime = 0;
- query_cost_info.idleTime = 0;
- query_cost_info.totalTime = 0;
- query_cost_info.cardinality = 0;
- query_cost_info.estimatedTotalMem = 0;
- query_cost_info.resourceUsage = 0;
-query_cost_info.maxCpuUsage = 0;
- if (getRootTdb())
- {
- if (getRootTdb()->getQueryCostInfo())
- {
-
getRootTdb()->getQueryCostInfo()->translateToExternalFormat(_cost_info);
- }
-
- }
- else
- query_cost_info.totalTime = getRootTdb()->getCost();
-
-
- if (getRootTdb())
- {
- CompilerStatsInfo *cmpStatsInfo =
- getRootTdb()->getCompilerStatsInfo();
-
- if (cmpStatsInfo)
- {
- short xnNeeded = (transactionReqd() ? 1 : 0);
-
cmpStatsInfo->translateToExternalFormat(_comp_stats_info,xnNeeded);
- // CompilationStatsData.
- CompilationStatsData *cmpData =
- getRootTdb()->getCompilationStatsData();
-
-
- SQL_COMPILATION_STATS_DATA *query_cmp_data =
- _comp_stats_info.compilationStats;
-
- if( cmpData )
- {
- Int64 cmpStartTime = -1;
- Int64 cmpEndTime = NA_JulianTimestamp();
- if (masterStats != NULL)
- cmpStartTime = masterStats->getCompStartTime();
- cmpData->translateToExternalFormat(query_cmp_data,
-cmpStartTime, cmpEndTime);
-setCompileEndTime(cmpEndTime);
- }
- }
-
- }
-// done deciding if this query needs to be monitored and
-// registered with WMS.
-// now execute it.
if (masterStats != NULL)
{
masterStats->setIsBlocking();
[trafodion] branch master updated (9c8f971 -> 892939d)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafodion.git. from 9c8f971 Merge pull request #1868 from selvaganesang/code_cleanup1 new f5e7952 [TRAFODION-3335] DDL takes a longer time when there are many snapshots new 82e62af Changes to call HBaseAdmin.listSnaphots conditionally when CQD TRAF_TABLE_SNAPSHOT is set to 'LATEST' new e6d504d Changes to ensure that the tablename in set correctly in HBaseAccess::codeGen new ca338de Possible fix for pyodbc test failure new 892939d Merge pull request #1870 from selvaganesang/rpc_timeout The 7237 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: core/sql/comexe/ComTdbHbaseAccess.h| 5 + core/sql/executor/ExHbaseSelect.cpp| 2 +- core/sql/executor/HBaseClient_JNI.cpp | 2 +- core/sql/executor/HBaseClient_JNI.h| 2 +- core/sql/exp/ExpHbaseInterface.cpp | 11 -- core/sql/exp/ExpHbaseInterface.h | 2 - core/sql/generator/GenRelScan.cpp | 167 + core/sql/generator/Generator.cpp | 10 -- core/sql/generator/Generator.h | 1 - core/sql/optimizer/NATable.cpp | 15 -- core/sql/optimizer/NATable.h | 3 - core/sql/optimizer/RelScan.h | 8 + core/sql/regress/hive/DIFF018.KNOWN.SB | 10 -- core/sql/sqlcat/TrafDDLdesc.h | 2 +- core/sql/sqlcomp/CmpSeabaseDDL.h | 3 - core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 2 +- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp| 22 +-- .../main/java/org/trafodion/sql/HBaseClient.java | 75 ++--- .../java/org/trafodion/sql/HBulkLoadClient.java| 38 ++--- dcs/src/test/pytests/test-requirements.txt | 1 - 20 files changed, 221 insertions(+), 160 deletions(-) delete mode 100644 core/sql/regress/hive/DIFF018.KNOWN.SB
[trafodion] branch master updated (eaafc33 -> 9c8f971)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafodion.git. from eaafc33 Merge pull request #1867 from selvaganesang/hdfs_cleanup new eb24ed0 [TRAFODION-3328] Code cleanup in Trafodion new 753fa62 Fix for regression failure with the commit eb24ed0138756d74c6acf90adc7822317501f75f new 9c8f971 Merge pull request #1868 from selvaganesang/code_cleanup1 The 7232 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../jdbc_type2/native/ResStatisticsStatement.cpp | 36 ++--- core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp| 17 -- .../odbc/nsksrvrcore/ResStatisticsStatement.cpp| 36 ++--- core/sql/cli/Cli.cpp | 63 +--- core/sql/cli/ExSqlComp.cpp | 36 + core/sql/cli/ExSqlComp.h | 2 - core/sql/cli/Globals.cpp | 15 -- core/sql/cli/Globals.h | 12 -- core/sql/cli/SessionDefaults.cpp | 86 -- core/sql/cli/SessionDefaults.h | 130 --- core/sql/cli/Statement.cpp | 140 core/sql/cli/sqlcli.h | 3 - core/sql/comexe/ComTdbRoot.h | 16 -- core/sql/common/ComRtUtils.cpp | 18 --- core/sql/common/ComRtUtils.h | 6 - core/sql/common/Ipc.cpp| 10 -- core/sql/common/Ipc.h | 10 -- core/sql/common/IpcGuardian.cpp| 7 - core/sql/common/IpcMessageType.h | 7 - core/sql/executor/ExExeUtil.h | 1 - core/sql/executor/ExExeUtilCommon.cpp | 2 - core/sql/executor/ExExeUtilGetStats.cpp| 97 ++- core/sql/executor/ExStats.cpp | 28 +--- core/sql/executor/ExStats.h| 14 -- core/sql/executor/ExUdrServer.cpp | 1 - core/sql/executor/Ex_esp_msg.h | 25 --- core/sql/executor/ex_control.cpp | 179 + core/sql/executor/ex_ddl.cpp | 37 - core/sql/executor/ex_esp_frag_dir.cpp | 63 core/sql/executor/ex_esp_msg.cpp | 2 - core/sql/executor/ex_exe_stmt_globals.cpp | 1 - core/sql/executor/ex_exe_stmt_globals.h| 12 -- core/sql/executor/ex_frag_rt.cpp | 136 +--- core/sql/executor/ex_frag_rt.h | 12 -- core/sql/qmscommon/QueryRewriteServer.cpp | 2 +- core/sql/regress/executor/EXPECTED020 | 9 -- core/sql/runtimestats/SqlStats.cpp | 2 - core/sql/runtimestats/SqlStats.h | 2 - core/sql/runtimestats/sscpipc.cpp | 1 - core/sql/runtimestats/ssmpipc.cpp | 3 - core/sql/sqlcomp/DefaultConstants.h| 9 -- core/sql/sqlcomp/nadefaults.cpp| 13 -- 42 files changed, 89 insertions(+), 1212 deletions(-)
[trafodion] branch master updated: [TRAFODION-3328] Code cleanup in Trafodion
This is an automated email from the ASF dual-hosted git repository.
selva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git
The following commit(s) were added to refs/heads/master by this push:
new 3257118 [TRAFODION-3328] Code cleanup in Trafodion
new eaafc33 Merge pull request #1867 from selvaganesang/hdfs_cleanup
3257118 is described below
commit 3257118993556e44d5ebd077cea1ea3127c08a65
Author: selvaganesang
AuthorDate: Wed Jan 29 07:42:04 2020 +
[TRAFODION-3328] Code cleanup in Trafodion
Retired the HDFS text/sequence file scan using lib hdfs.
Fix for udr/TEST102 failure
---
core/sql/comexe/ComTdbHdfsScan.h | 7 +-
core/sql/executor/ExHdfsScan.cpp | 736 ++-
core/sql/executor/ExHdfsScan.h | 16 -
core/sql/generator/GenRelScan.cpp| 3 -
core/sql/generator/GenRelUpdate.cpp | 2 -
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 3 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 3 +-
core/sql/sqlcomp/nadefaults.cpp | 7 +-
8 files changed, 48 insertions(+), 729 deletions(-)
diff --git a/core/sql/comexe/ComTdbHdfsScan.h b/core/sql/comexe/ComTdbHdfsScan.h
index 80a0280..64f780f 100755
--- a/core/sql/comexe/ComTdbHdfsScan.h
+++ b/core/sql/comexe/ComTdbHdfsScan.h
@@ -55,7 +55,7 @@ class ComTdbHdfsScan : public ComTdb
LOG_ERROR_ROWS = 0x0040,
ASSIGN_RANGES_AT_RUNTIME= 0x0080,
TREAT_EMPTY_AS_NULL = 0x0100,
-USE_LIBHDFS_SCAN= 0x0200,
+UNUSED = 0x0200,
COMPRESSED_FILE = 0x0400
};
@@ -286,11 +286,6 @@ public:
NABoolean getAssignRangesAtRuntime() const
{ return (flags_ & ASSIGN_RANGES_AT_RUNTIME)
!= 0; }
- void setUseLibhdfsScan(NABoolean v)
- {(v ? flags_ |= USE_LIBHDFS_SCAN : flags_ &= ~USE_LIBHDFS_SCAN); }
- NABoolean getUseLibhdfsScan() const
-{ return (flags_ & USE_LIBHDFS_SCAN) != 0; }
-
void setCompressedFile(NABoolean v)
{(v ? flags_ |= COMPRESSED_FILE : flags_ &= ~COMPRESSED_FILE); }
NABoolean isCompressedFile() const
diff --git a/core/sql/executor/ExHdfsScan.cpp b/core/sql/executor/ExHdfsScan.cpp
index 9e73e2d..cb4e66c 100644
--- a/core/sql/executor/ExHdfsScan.cpp
+++ b/core/sql/executor/ExHdfsScan.cpp
@@ -128,30 +128,22 @@ ExHdfsScanTcb::ExHdfsScanTcb(
{
Space * space = (glob ? glob->getSpace() : 0);
CollHeap * heap = (glob ? glob->getDefaultHeap() : 0);
- useLibhdfsScan_ = hdfsScanTdb.getUseLibhdfsScan();
- lobGlob_ = NULL;
hdfsScanBufMaxSize_ = hdfsScanTdb.hdfsBufSize_;
headRoom_ = (Int32)hdfsScanTdb.rangeTailIOSize_;
-
- if (useLibhdfsScan_) {
- hdfsScanBuffer_ = new(heap) char[ hdfsScanBufMaxSize_ + 1 ];
- hdfsScanBuffer_[hdfsScanBufMaxSize_] = '\0';
- } else {
- hdfsScanBufBacking_[0] = new (heap) BYTE[hdfsScanBufMaxSize_ + 2 *
(headRoom_)];
- hdfsScanBufBacking_[1] = new (heap) BYTE[hdfsScanBufMaxSize_ + 2 *
(headRoom_)];
- for (int i=0; i < 2; i++) {
-BYTE *hdfsScanBufBacking = hdfsScanBufBacking_[i];
-hdfsScanBuf_[i].headRoom_ = hdfsScanBufBacking;
-hdfsScanBuf_[i].buf_ = hdfsScanBufBacking + headRoom_;
- }
- bufBegin_ = NULL;
- bufEnd_ = NULL;
- bufLogicalEnd_ = NULL;
- headRoomCopied_ = 0;
- prevRangeNum_ = -1;
- currRangeBytesRead_ = 0;
- recordSkip_ = FALSE;
+ hdfsScanBufBacking_[0] = new (heap) BYTE[hdfsScanBufMaxSize_ + 2 *
(headRoom_)];
+ hdfsScanBufBacking_[1] = new (heap) BYTE[hdfsScanBufMaxSize_ + 2 *
(headRoom_)];
+ for (int i=0; i < 2; i++) {
+ BYTE *hdfsScanBufBacking = hdfsScanBufBacking_[i];
+ hdfsScanBuf_[i].headRoom_ = hdfsScanBufBacking;
+ hdfsScanBuf_[i].buf_ = hdfsScanBufBacking + headRoom_;
}
+ bufBegin_ = NULL;
+ bufEnd_ = NULL;
+ bufLogicalEnd_ = NULL;
+ headRoomCopied_ = 0;
+ prevRangeNum_ = -1;
+ currRangeBytesRead_ = 0;
+ recordSkip_ = FALSE;
moveExprColsBuffer_ = new(space) ExSimpleSQLBuffer( 1, // one row
(Int32)hdfsScanTdb.moveExprColsRowLength_,
space);
@@ -307,10 +299,6 @@ void ExHdfsScanTcb::freeResources()
qparent_.down = NULL;
}
deallocateRuntimeRanges();
- if (lobGlob_) {
- ExpLOBinterfaceCleanup(lobGlob_);
- lobGlob_ = NULL;
- }
if (hdfsClient_ != NULL)
NADELETE(hdfsClient_, HdfsClient, getHeap());
if (logFileHdfsClient_ != NULL)
@@ -369,15 +357,6 @@ ex_tcb_private_state *ExHdfsScanTcb::allocatePstates(
return pa.allocatePstates(this, numElems, pstateLength);
}
-Int32 ExHdfsScanTcb::fixup()
-{
- lobGlob_ = NULL;
- lobGlob_ = ExpLOBoper::initLOBglobal((NAHeap
*)getGlobals()->getDefaultHeap(),
-
getGlobals()->ca
[trafodion] branch master updated (74e04fa -> 26f5a00)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafodion.git. from 74e04fa Merge pull request #1865 from hegdean/ahtraf240 new 6841491 Avoid reading VERSIONS and DEFAULTS table after it is done once in a process. This required following cleanup 1. cqd MODE_SEABASE is removed. 2. Removed the support to read CQD from a file. 3. NADefaults constructor now reads the defaults table once andsaves off the relevant information such as currentDefaults, currentTokens,provenances and currentFloats to be reused by the other NADefaults objects. 4. T2 driver doesn't use the defaultContext to compile any query [...] new fa5b902 Possible fix for the core files seen when 2 Contexts are involved. Introduced semaphore to initialize nadefaults from one context only. new 8e62d1b Changes to generate core when the error 2055 is seen to debug this issue seen with the PR 1858 new 43a54f2 Reverting the change made in commit 8e62d1b19b9bd618c0d0bb5f5dec5cc24c7c1ef4 because Jenkins VM becomes unstable with too many core dumps. new e2d9040 Possible fix for check-PR failures. new ec426b7 Changes to ensure NADefaults::updateSystemParameters is done correctly. new fee4d62 Fix for debug build failure with commit ec426b7afea5e new 26f5a00 Merge pull request #1858 from selvaganesang/nadefaults_changes The 7225 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../transactional/TransactionalScanner.java.tmpl |2 +- core/sql/arkcmp/CmpContext.cpp |8 +- core/sql/arkcmp/CmpContext.h |3 + core/sql/cli/SessionDefaults.cpp |1 - core/sql/cli/SessionDefaults.h |5 - core/sql/executor/ex_control.cpp |7 - core/sql/generator/GenRelExeUtil.cpp | 11 - core/sql/generator/GenRelUpdate.cpp|2 + core/sql/optimizer/IndexDesc.cpp |3 +- core/sql/optimizer/OptimizerSimulator.cpp |4 +- core/sql/parser/sqlparser.y| 31 - core/sql/regress/compGeneral/EXPECTED004.SB|9 - core/sql/regress/compGeneral/TEST004 |3 - core/sql/regress/executor/EXPECTED013.SB |1 - core/sql/regress/executor/EXPECTED140 | 11 - core/sql/regress/fullstack2/EXPECTED062| 30 +- core/sql/regress/fullstack2/EXPECTED062.RELEASE| 48 +- core/sql/regress/fullstack2/TEST062| 14 - core/sql/regress/hive/EXPECTED008 |1 - core/sql/regress/hive/EXPECTED009 |6 +- core/sql/regress/seabase/EXPECTED010 | 84 -- core/sql/regress/seabase/EXPECTED011 |1 - core/sql/regress/seabase/EXPECTED016 |7 - core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 25 +- core/sql/sqlcomp/DefaultConstants.h|2 +- core/sql/sqlcomp/NADefaults.h | 65 +- core/sql/sqlcomp/nadefaults.cpp| 1039 .../org/trafodion/phoenix/end2end/BaseTest.java|2 +- 28 files changed, 455 insertions(+), 970 deletions(-)
[trafodion] branch master updated (7ac4915 -> 5131bf5)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafodion.git. from 7ac4915 Merge pull request #1861 from selvaganesang/t4_query_timeout new 6b6d880 [TRAFODION-3329] Code cleanup in Type 2 driver new 29f07fa [TRAFODION-3329] Code cleanup in Type 2 driver new 5131bf5 Merge pull request #1862 from selvaganesang/t2_driver_cleanup_2 The 7211 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: core/conn/jdbc_type2/native/Debug.cpp | 32 -- .../jdbc_type2/native/SQLMXCallableStatement.cpp | 31 -- .../jdbc_type2/native/SQLMXCommonFunctions.cpp | 538 + core/conn/jdbc_type2/native/SQLMXCommonFunctions.h | 3 - core/conn/jdbc_type2/native/SQLMXConnection.cpp| 27 +- .../jdbc_type2/native/SQLMXPreparedStatement.cpp | 49 +- core/conn/jdbc_type2/native/SQLMXResultSet.cpp | 39 -- core/conn/jdbc_type2/native/SQLMXStatement.cpp | 114 + .../apache/trafodion/jdbc/t2/SQLMXConnection.java | 28 +- .../org/apache/trafodion/jdbc/t2/SQLMXLob.java | 53 +- .../trafodion/jdbc/t2/SQLMXPreparedStatement.java | 180 --- 11 files changed, 57 insertions(+), 1037 deletions(-)
[trafodion] branch master updated: [TRAFODION-3331] JDBC T4 driver to support login timeout and query timeout
This is an automated email from the ASF dual-hosted git repository.
selva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git
The following commit(s) were added to refs/heads/master by this push:
new 99cb1cd [TRAFODION-3331] JDBC T4 driver to support login timeout and
query timeout
new 7ac4915 Merge pull request #1861 from selvaganesang/t4_query_timeout
99cb1cd is described below
commit 99cb1cd29602983d1040c0df6f452fde5486216b
Author: selvaganesang
AuthorDate: Fri Oct 4 03:53:11 2019 +
[TRAFODION-3331] JDBC T4 driver to support login timeout and query timeout
1. Support to cancel the query when cqd CANCEL_QUERY_ALLOWED is set to OFF.
When this CQD is set to OFF, the query can't be canceled gracefully
because the query is not registered with cancel broker.
This change allows the master process to be stopped and abort the query
abruptly when the query is active for longer than the minimum required
time. To activate this feature.
a) A variable MIN_QUERY_ACTIVE_TIME_IN_SECS_BEFORE_CANCEL=n need to be set
where 'n' is duration in secs
b) control query cancel qid needs to issued after 'n' seconds.
2. Streamlined the query timeout concept in JDBC driver and Sync up JDBC
driver with this concept in the server side.
a) The 2 properties ignoreCancel and activeTimeBeforeCancelInSecs can be
used to enable query timeout
and cancel from JDBC driver. By default ignoreCancel is set to true,
activeTimeBeforeCancelInSecs is set to -1.
b) During socket read, timeout is set based on type of request.
If it is connection related, timeout is login timeout and it will be
query timeout otherwise.
c) By default network timeout is set to 1 secs. socket read times out every
1 sec and check if the timeout has elapsed.
d) If the timeout pertains to the login timeout, an error is returned.
e) If the timeout pertains to the query timeout, if ignoreCancel is false,
control query cancel qid is sent.
If ignoreCancel is true, it is checked if the query has been active
longer than activeTimeBeforeCancel. Then cancel is sent to server.
f) If Statement.cancel is issued by the application, then it is checked if
the connection is waiting in socket read.
If so, the above timeout mechanism can kick in to send cancel to the
server.
If not, an internal close is issued to the server to free up system
resources associated with the statement.
---
.../java/org/trafodion/jdbc/t4/InputOutput.java| 246 ++-
.../org/trafodion/jdbc/t4/InterfaceConnection.java | 79 +++---
.../org/trafodion/jdbc/t4/InterfaceStatement.java | 28 ++-
.../java/org/trafodion/jdbc/t4/T4Connection.java | 7 +-
.../java/org/trafodion/jdbc/t4/T4DSProperties.java | 93 ---
.../main/java/org/trafodion/jdbc/t4/T4Driver.java | 3 +-
.../java/org/trafodion/jdbc/t4/T4Properties.java | 268 ++---
.../java/org/trafodion/jdbc/t4/T4Statement.java| 6 +
.../java/org/trafodion/jdbc/t4/T4_Dcs_Cancel.java | 5 +-
.../java/org/trafodion/jdbc/t4/T4_Dcs_Connect.java | 13 +-
.../org/trafodion/jdbc/t4/TrafT4Connection.java| 37 +--
.../trafodion/jdbc/t4/TrafT4PreparedStatement.java | 4 -
.../org/trafodion/jdbc/t4/TrafT4Statement.java | 26 +-
.../org_apache_trafodion_jdbc_t2_SQLMXClobReader.h | 23 --
.../org_apache_trafodion_jdbc_t2_SQLMXClobWriter.h | 21 --
..._apache_trafodion_jdbc_t2_SQLMXLobInputStream.h | 23 --
...apache_trafodion_jdbc_t2_SQLMXLobOutputStream.h | 21 --
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp| 4 +
core/conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h | 10 +-
core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 4 +
core/sqf/conf/log4cxx.trafodion.sql.config | 2 +-
core/sql/bin/SqlciErrors.txt | 1 +
core/sql/runtimestats/ssmpipc.cpp | 100 ++--
core/sql/runtimestats/ssmpipc.h| 1 +
.../main/java/org/trafodion/sql/HTableClient.java | 3 +-
25 files changed, 381 insertions(+), 647 deletions(-)
diff --git
a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InputOutput.java
b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InputOutput.java
index e041e61..0e02ebf 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InputOutput.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InputOutput.java
@@ -25,6 +25,8 @@ package org.trafodion.jdbc.t4;
import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
+import java.io.IOException;
+import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
@@ -49,7 +51,7 @@ class InputOutput {
private OutputStream m_os;
private InputStream m_is;
private WritableByteChannel m_wbc;
- private T4Connection m_t4conn
[trafodion] branch master updated: [TRAFODION-3329] Code cleanup in Type 2 driver
This is an automated email from the ASF dual-hosted git repository.
selva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git
The following commit(s) were added to refs/heads/master by this push:
new 3de75b6 [TRAFODION-3329] Code cleanup in Type 2 driver
new 582d81a Merge pull request #1860 from
selvaganesang/t2_driver_cleanup_1
3de75b6 is described below
commit 3de75b6fb1796f679519f3089c44ee82c9bd5780
Author: selvaganesang
AuthorDate: Thu Oct 3 22:01:56 2019 +
[TRAFODION-3329] Code cleanup in Type 2 driver
Removed nowait and mploc related code in T2 driver. Both of these
concepts are not valid anymore.
---
core/conn/jdbc_type2/native/CSrvrStmt.cpp | 28 --
core/conn/jdbc_type2/native/CSrvrStmt.h| 2 -
core/conn/jdbc_type2/native/CoreCommon.h | 6 -
core/conn/jdbc_type2/native/GlobalInformation.h| 10 -
core/conn/jdbc_type2/native/SQLMXConnection.cpp| 114 +---
core/conn/jdbc_type2/native/SQLMXDriver.cpp| 70 +
core/conn/jdbc_type2/native/SqlInterface.cpp | 315 +
core/conn/jdbc_type2/native/SrvrCommon.cpp | 28 --
core/conn/jdbc_type2/native/pThreadsSync.h | 9 -
.../apache/trafodion/jdbc/t2/SQLMXConnection.java | 11 +-
.../org/apache/trafodion/jdbc/t2/T2Driver.java | 5 +-
.../org/apache/trafodion/jdbc/t2/T2Properties.java | 53
12 files changed, 15 insertions(+), 636 deletions(-)
diff --git a/core/conn/jdbc_type2/native/CSrvrStmt.cpp
b/core/conn/jdbc_type2/native/CSrvrStmt.cpp
index 8d1b6e0..1262f33 100644
--- a/core/conn/jdbc_type2/native/CSrvrStmt.cpp
+++ b/core/conn/jdbc_type2/native/CSrvrStmt.cpp
@@ -103,7 +103,6 @@ SRVR_STMT_HDL::SRVR_STMT_HDL(long inDialogueId)
IRD = NULL;
useDefaultDesc = FALSE;
dialogueId = inDialogueId;
-nowaitRetcode = SQL_SUCCESS;
holdability = CLOSE_CURSORS_AT_COMMIT;
fetchQuadEntries = 0;
fetchRowsetSize = 0;
@@ -113,7 +112,6 @@ SRVR_STMT_HDL::SRVR_STMT_HDL(long inDialogueId)
batchQuadField = NULL;
inputDescParamOffset = 0;
batchMaxRowsetSize = 0;
-stmtInitForNowait = FALSE;
// +++ T2_REPO
bLowCost = false; // May not need this
m_need_21036_end_msg = false;
@@ -148,9 +146,6 @@ SRVR_STMT_HDL::~SRVR_STMT_HDL()
int retcode;
cleanupAll();
inState = STMTSTAT_NONE;
-#ifndef DISABLE_NOWAIT
-if (stmtInitForNowait) mutexCondDestroy(, );
-#endif
FUNCTION_RETURN_VOID((NULL));
}
@@ -542,13 +537,6 @@ void SRVR_STMT_HDL::processThreadReturnCode(void)
// (-104) error.
threadReturnCode = SQL_RETRY_COMPILE_AGAIN;
break;
-case NOWAIT_ERROR:
-// Allocate Error Desc
-kdsCreateSQLErrorException(, 1);
-kdsCopySQLErrorException(, SQLSVC_EXCEPTION_NOWAIT_ERROR,
nowaitRetcode,
-"HY000");
-threadReturnCode = SQL_ERROR;
-break;
}
FUNCTION_RETURN_VOID((NULL));
}
@@ -582,14 +570,6 @@ SQLRETURN SRVR_STMT_HDL::allocSqlmxHdls(const char
*inStmtName, const char *inMo
sqlStmtType = inSqlStmtType;
useDefaultDesc = inUseDefaultDesc;
rc = ALLOCSQLMXHDLS(this);
-
-#ifndef DISABLE_NOWAIT
-if (rc >= 0)
-rc = initStmtForNowait(, );
-if (rc == 0)
-stmtInitForNowait = TRUE;
-#endif
-
CLI_DEBUG_RETURN_SQL(rc);
}
@@ -638,14 +618,6 @@ SQLRETURN SRVR_STMT_HDL::allocSqlmxHdls_spjrs(SQLSTMT_ID
*callpStmt, const char
isSPJRS = true;
rc = ALLOCSQLMXHDLS_SPJRS(this, callpStmt, RSstmtName);
-
-#ifndef DISABLE_NOWAIT
-if (rc >= 0)
-rc = initStmtForNowait(, );
-if (rc == 0)
-stmtInitForNowait = TRUE;
-#endif
-
CLI_DEBUG_RETURN_SQL(rc);
}
diff --git a/core/conn/jdbc_type2/native/CSrvrStmt.h
b/core/conn/jdbc_type2/native/CSrvrStmt.h
index f0aa3eb..93685fa 100644
--- a/core/conn/jdbc_type2/native/CSrvrStmt.h
+++ b/core/conn/jdbc_type2/native/CSrvrStmt.h
@@ -111,7 +111,6 @@ public:
SRVR_DESC_HDL *IRD;
BOOLuseDefaultDesc;
longdialogueId;
-longnowaitRetcode;
short holdability;
longfetchQuadEntries;
longfetchRowsetSize;
@@ -175,7 +174,6 @@ public:
// T2_REPO
bool isISUD;
-BOOLstmtInitForNowait;
inline void setSqlQueryStatementType (int Type) {
SqlQueryStatementType = Type;
};
diff --git a/core/conn/jdbc_type2/native/CoreCommon.h
b/core/conn/jdbc_type2/native/CoreCommon.h
index 7fb166c..992dbad 100644
--- a/core/conn/jdbc_type2/native/CoreCommon.h
+++ b/core/conn/jdbc_type2/native/CoreCommon.h
@@ -279,7 +279,6 @@ typedef enum _STOP_TYPE
#define SQLSVC_EXCEPTION_BUFFER_ALLOC_FAILED "Buffer Allocation Failed"
#define SQLSVC_EXCEPTION_INVALID_HANDLE "Error while allocating Handles in
SQL/MX"
#de
[trafodion] branch master updated (3a4da20 -> d055cd4)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafodion.git. from 3a4da20 Merge pull request #1856 from DaveBirdsall/Trafodion3325 new f0d73ac Lob support in T2 driver with streaming capability new 110f2cc Lob support in T2 driver with streaming capability - Part 2 new d055cd4 Merge pull request #1857 from selvaganesang/t2_lob_changes The 7202 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: core/conn/jdbc_type2/Makefile | 8 + core/conn/jdbc_type2/native/SQLMXClobReader.cpp| 68 ++ core/conn/jdbc_type2/native/SQLMXClobWriter.cpp| 68 ++ .../jdbc_type2/native/SQLMXCommonFunctions.cpp | 18 +- .../conn/jdbc_type2/native/SQLMXLobInputStream.cpp | 75 ++ .../jdbc_type2/native/SQLMXLobOutputStream.cpp | 68 ++ core/conn/jdbc_type2/native/SqlInterface.cpp | 20 + core/conn/jdbc_type2/native/SrvrCommon.cpp | 2 + core/conn/jdbc_type2/native/SrvrOthers.cpp | 128 ++- core/conn/jdbc_type2/native/SrvrOthers.h | 78 ++ .../org_apache_trafodion_jdbc_t2_SQLMXClobReader.h | 23 + .../org_apache_trafodion_jdbc_t2_SQLMXClobWriter.h | 21 + ..._apache_trafodion_jdbc_t2_SQLMXLobInputStream.h | 23 + ...apache_trafodion_jdbc_t2_SQLMXLobOutputStream.h | 21 + .../org/apache/trafodion/jdbc/t2/DataWrapper.java | 4 +- .../org/apache/trafodion/jdbc/t2/SQLMXBlob.java| 742 +++-- .../trafodion/jdbc/t2/SQLMXCallableStatement.java | 36 +- .../org/apache/trafodion/jdbc/t2/SQLMXClob.java| 782 -- .../apache/trafodion/jdbc/t2/SQLMXClobReader.java | 342 +++- .../apache/trafodion/jdbc/t2/SQLMXClobWriter.java | 239 ++ .../apache/trafodion/jdbc/t2/SQLMXConnection.java | 633 ++ .../apache/trafodion/jdbc/t2/SQLMXDataLocator.java | 368 - .../apache/trafodion/jdbc/t2/SQLMXDataSource.java | 2 +- .../trafodion/jdbc/t2/SQLMXDatabaseMetaData.java | 54 +- .../org/apache/trafodion/jdbc/t2/SQLMXLob.java | 281 ++- .../trafodion/jdbc/t2/SQLMXLobInputStream.java | 386 +++-- .../trafodion/jdbc/t2/SQLMXLobOutputStream.java| 239 ++ .../trafodion/jdbc/t2/SQLMXPooledConnection.java | 2 +- .../trafodion/jdbc/t2/SQLMXPreparedStatement.java | 913 ++--- .../apache/trafodion/jdbc/t2/SQLMXResultSet.java | 77 +- .../apache/trafodion/jdbc/t2/SQLMXStatement.java | 130 +-- .../org/apache/trafodion/jdbc/t2/T2Driver.java | 1 - .../org/apache/trafodion/jdbc/t2/T2Properties.java | 78 +- .../org/apache/trafodion/jdbc/t2/TConnection.java | 29 - core/sql/executor/ex_transaction.cpp | 4 +- 35 files changed, 1971 insertions(+), 3992 deletions(-) create mode 100644 core/conn/jdbc_type2/native/SQLMXClobReader.cpp create mode 100644 core/conn/jdbc_type2/native/SQLMXClobWriter.cpp create mode 100644 core/conn/jdbc_type2/native/SQLMXLobInputStream.cpp create mode 100644 core/conn/jdbc_type2/native/SQLMXLobOutputStream.cpp create mode 100644 core/conn/jdbc_type2/native/org_apache_trafodion_jdbc_t2_SQLMXClobReader.h create mode 100644 core/conn/jdbc_type2/native/org_apache_trafodion_jdbc_t2_SQLMXClobWriter.h create mode 100644 core/conn/jdbc_type2/native/org_apache_trafodion_jdbc_t2_SQLMXLobInputStream.h create mode 100644 core/conn/jdbc_type2/native/org_apache_trafodion_jdbc_t2_SQLMXLobOutputStream.h delete mode 100644 core/conn/jdbc_type2/src/main/java/org/apache/trafodion/jdbc/t2/SQLMXDataLocator.java
[trafodion] branch master updated: [TRAFODION-2311] Avoid logging error 8605 and 8609 during SQLEndTrans if no transaction active
This is an automated email from the ASF dual-hosted git repository.
selva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git
The following commit(s) were added to refs/heads/master by this push:
new 9b99df1 [TRAFODION-2311] Avoid logging error 8605 and 8609 during
SQLEndTrans if no transaction active
new f8c54fa Merge pull request #1844 from arvind-narain/TRAFODION-2311
9b99df1 is described below
commit 9b99df1c11babc87292f2a9c814d418e3bcc0538
Author: Arvind Narain
AuthorDate: Fri Jun 7 02:13:37 2019 +
[TRAFODION-2311] Avoid logging error 8605 and 8609 during SQLEndTrans
if no transaction active
Frequently , during performance test runs like OE and other regression
tests, following errors
are observed in master logs:
ERROR[8605] Committing a transaction which has not started.
ERROR[8609] Waited rollback performed without starting a transaction.
MXOSRVR does return success to the client for these errors but since
commit/rollback is executed, the error gets logged.
Some of these can be avoided if mxosrvr implements the following ODBC
standard and skips executing the commit/rollback statement.
"For drivers and data sources that support transactions, calling SQLEndTran
with either SQL_COMMIT or SQL_ROLLBACK when no transaction
is active returns SQL_SUCCESS (indicating that there is no work to be
committed or rolled back) and has no effect on the data source."
---
core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
b/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
index 1dc9d9d..a1edb85 100644
--- a/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
+++ b/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
@@ -3234,15 +3234,26 @@ odbc_SQLSvc_EndTransaction_sme_(
SRVRTRACE_ENTER(FILE_SME+5);
char stmtLabel[MAX_STMT_LABEL_LEN+1];
- Int32 rc = SQL_SUCCESS;
SRVR_STMT_HDL *pSrvrStmt = NULL;
+ bool isTransPending = (WSQL_EXEC_Xact(SQLTRANS_STATUS, 0) == 0);
+ Int32 rc = SQL_SUCCESS;
+
+ exception_->exception_nr = 0;
+ sqlWarning->_buffer = NULL;
+ sqlWarning->_length = 0;
switch (transactionOpt) {
case SQL_COMMIT:
- pSrvrStmt = getSrvrStmt("STMT_COMMIT_1", FALSE);
+ if (isTransPending)
+ pSrvrStmt = getSrvrStmt("STMT_COMMIT_1", FALSE);
+ else
+ return;
break;
case SQL_ROLLBACK:
- pSrvrStmt = getSrvrStmt("STMT_ROLLBACK_1", FALSE);
+ if (isTransPending)
+ pSrvrStmt = getSrvrStmt("STMT_ROLLBACK_1", FALSE);
+ else
+ return;
break;
default:
exception_->exception_nr =
odbc_SQLSvc_EndTransaction_ParamError_exn_;
[trafodion] branch master updated: [TRAFODION-3311] Trafodion to start transactions for select statements with FOR UPDATE
This is an automated email from the ASF dual-hosted git repository.
selva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git
The following commit(s) were added to refs/heads/master by this push:
new 243b618 [TRAFODION-3311] Trafodion to start transactions for select
statements with FOR UPDATE
new 4fe4d2f Merge pull request #1843 from selvaganesang/trafodion-3311
243b618 is described below
commit 243b6184719d9fa2195b854859c7d7589af7921f
Author: selvaganesang
AuthorDate: Thu May 23 17:55:03 2019 +
[TRAFODION-3311] Trafodion to start transactions for select statements with
FOR UPDATE
A CQD BEGIN_TRANSACTION_FOR_SELECT is introduced. This CQD can take a value
1,2 or any numeric value. Default is 1.
1 - means mark the statement as transaction required if it is SELECT ...
FOR UPDATE
2 - means mark the statement as transaction required if it is SELECT
statement with
isolation other than SKIP CONFLICT ACCESS or READ UNCOMMITTED ACCESS.
Any other value - SELECT statement is not marked to begin transaction.
Trafodion always change the isolation level to READ COMMITTED ACCESS when
it is
READ UNCOMMITTED ACCESS.
---
core/sql/generator/GenPreCode.cpp | 16 ++
core/sql/regress/core/EXPECTED116 | 298 ++--
core/sql/regress/core/TEST116 | 38 +
core/sql/sqlcomp/DefaultConstants.h | 6 +
core/sql/sqlcomp/nadefaults.cpp | 1 +
5 files changed, 311 insertions(+), 48 deletions(-)
diff --git a/core/sql/generator/GenPreCode.cpp
b/core/sql/generator/GenPreCode.cpp
index be80b05..0296d1d 100644
--- a/core/sql/generator/GenPreCode.cpp
+++ b/core/sql/generator/GenPreCode.cpp
@@ -4235,6 +4235,22 @@ RelExpr * FileScan::preCodeGen(Generator * generator,
getGroupAttr()->getCharacteristicInputs());
generator->oltOptInfo()->mayDisableOperStats(());
+ if (isHbaseTable() || isSeabaseTable()) {
+ int beginTransForSelect =
ActiveSchemaDB()->getDefaults().getAsLong(BEGIN_TRANSACTION_FOR_SELECT);
+ switch (beginTransForSelect) {
+case 2:
+ if (accessOptions().accessType() != TransMode::SKIP_CONFLICT_ACCESS_
+ && accessOptions().accessType() !=
TransMode::READ_UNCOMMITTED_ACCESS_)
+ generator->setTransactionFlag(TRUE);
+ // no break here because the transaction is required for updatable
select when it is 2
+case 1:
+ if (generator->updatableSelect())
+ generator->setTransactionFlag(TRUE);
+ break;
+default:
+ break;
+ }
+ }
markAsPreCodeGenned();
return this;
} // FileScan::preCodeGen()
diff --git a/core/sql/regress/core/EXPECTED116
b/core/sql/regress/core/EXPECTED116
index c423f1a..36c09c0 100644
--- a/core/sql/regress/core/EXPECTED116
+++ b/core/sql/regress/core/EXPECTED116
@@ -442,7 +442,7 @@ A1 C1 B1
>>invoke t116t1;
-- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current Wed May 16 06:17:20 2018
+-- Definition current Thu May 23 14:49:17 2019
(
SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -460,7 +460,7 @@ A1 C1 B1
>>invoke t116t1;
-- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current Wed May 16 06:17:20 2018
+-- Definition current Thu May 23 14:49:17 2019
(
SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -475,7 +475,7 @@ A1 C1 B1
>>invoke t116v1;
-- Definition of Trafodion view TRAFODION.SCH.T116V1
--- Definition current Wed May 16 06:17:22 2018
+-- Definition current Thu May 23 14:49:18 2019
(
AINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -492,7 +492,7 @@ A1 C1 B1
>>invoke t116t1;
-- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current Wed May 16 06:17:36 2018
+-- Definition current Thu May 23 14:49:22 2019
(
SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -507,7 +507,7 @@ A1 C1 B1
>>invoke t116v1;
-- Definition of Trafodion view TRAFODION.SCH.T116V1
--- Definition current Wed May 16 06:17:37 2018
+-- Definition current Thu May 23 14:49:22 2019
(
AINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -524,7 +524,7 @@ A1 C1 B1
>>invoke t116t1;
-- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current Wed May 16 06:17:42 2018
+-- Definition current Thu May 23 14:49:23 2019
(
SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -539,7 +539,7 @@ A1 C1 B1
>>invoke t116v1;
-- Definition of Trafodion view TRAFODION.SCH.T116V1
--- Definition current We
[trafodion] branch master updated (6b0cca1 -> 9838d0f)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafodion.git. from 6b0cca1 Merge pull request #1841 from DaveBirdsall/Trafodion3309 new 487c11f [TRAFODION-3310] Commit transaction needs to be complete before returning to the caller new ba2f69c [TRAFODION-3310] Commit transaction needs to be complete before returning to the caller new 16159a7 Fix for the check PR failures with commit ba2f69cc9fa7ca7e2264068fd2c39ecd0a128c94 new 9838d0f Merge pull request #1842 from selvaganesang/commit_nowait The 7156 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: core/sqf/src/tm/tminfo.cpp | 12 core/sqf/src/tm/tminfo.h | 3 - core/sqf/src/tm/tmtx.cpp | 6 -- core/sql/cli/Cli.cpp | 12 +--- core/sql/cli/Context.cpp | 4 +- core/sql/cli/Context.h | 2 +- core/sql/cli/Statement.cpp | 5 +- core/sql/cli/sqlcli.h| 2 - core/sql/common/ComTransInfo.h | 2 +- core/sql/executor/ExExeUtilCli.cpp | 2 +- core/sql/executor/ex_transaction.cpp | 103 ++- core/sql/executor/ex_transaction.h | 19 +-- core/sql/parser/sqlparser.y | 16 -- core/sql/qmscommon/QRQueries.cpp | 1 - core/sql/sqlci/SqlciCmd.cpp | 2 +- 15 files changed, 13 insertions(+), 178 deletions(-)
[trafodion] branch master updated (0eccea8 -> a750863)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafodion.git. from 0eccea8 Merge pull request #1838 from SuJinpei/t-3307 new f9679c9 [TRAFODION-3280] Reduce path length in Trafodion for improved performance and scalability new a6f4f8c [TRAFODION-3280] Reduce path length in Trafodion for improved performance and scalability new 6bbe513 [TRAFODION-3280] Reduce path length in Trafodion for improved performance and scalability RegionList is now collected per table on the client side using HashMap instead of Set. This allows client to register to TM the region only if it not already registered within a transaction. new fae7b13 [TRAFODION-3280] Reduce path length in Trafodion for improved performance and scalability new ed07817 Merge branch 'trafodion-3280_4' of github.com:selvaganesang/trafodion into trafodion-3280_5 new 0b5f43e Fix for build failure in PR 1839 new a750863 Merge pull request #1839 from selvaganesang/trafodion-3280_4 The 7148 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../hbase/client/transactional/JtaXAResource.java | 7 +- .../hbase/client/transactional/RMInterface.java| 282 ++--- .../transactional/SsccTransactionalTable.java | 4 +- .../transactional/TrafodionLocationList.java | 142 +++ .../client/transactional/TransactionManager.java | 115 + .../client/transactional/TransactionState.java | 81 -- .../transactional/TransactionalScanner.java.tmpl | 6 - .../client/transactional/TransactionalTable.java | 2 +- .../transactional/SsccTableClientUtils.java| 2 +- .../transactional/TrxTransactionState.java.tmpl| 1 + .../org/apache/hadoop/hbase/util/ByteArrayKey.java | 55 .../tm/hbasetmlib2/javaobjectinterfacetm.cpp | 26 +- .../main/java/org/trafodion/dtm/HBaseTxClient.java | 148 +-- .../main/java/org/trafodion/dtm/TmAuditTlog.java | 28 +- core/sqf/src/seatrans/tm/hbasetmlib2/testrun.cpp | 2 +- core/sql/executor/ExHbaseAccess.cpp| 10 + core/sql/executor/ExHbaseAccess.h | 2 + core/sql/executor/ExHbaseIUD.cpp | 10 + core/sql/executor/ExHbaseSelect.cpp| 17 +- core/sql/qmscommon/QRLogger.cpp| 6 +- 20 files changed, 631 insertions(+), 315 deletions(-) create mode 100644 core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TrafodionLocationList.java create mode 100644 core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/util/ByteArrayKey.java
[trafodion] branch master updated (89db1bb -> 869fbde)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafodion.git. from 89db1bb Merge pull request #1826 from DaveBirdsall/Trafodion3294 new bdbfcbe Optimizing and avoiding unnecessary function calls shown as hot spots in jprofile new 99c35ba Optimizing and avoiding unnecessary function calls shown as hot spots in jprofile - part-II new 3584aef Cleaned up and ensured that JDBC driver conforms to transaction handling via Connection.commit and Connection.rollback. The transaction is always started by the database engine when it needs the transaction. new 1b4e6bf Optimizing and avoiding unnecessary function calls shown as hot spots in jprofile - part-II new 2b14af5 Optimizing and avoiding unnecessary function calls shown as hot spots in jprofile - part-IIa new c8bcb9f Fix to ensure that trafci returns the correct status message of the recent sql command instead of returning "--- SQL operation complete" always. new 75a4e3f Fix to ensure infostats command from trafci works as expected. new c5c37f7 Fix for the failure of testLTrimFunction, testTrimFunction and testRTrimFunction of VariableLengthPKTest in phoenix T4 tests. new 7524606 Fix for phoenix T2 tests in FunkyNamesTest new 3db753f [TRAFODION-3280] Reduce path length in Trafodion for improved performance and scalability new 869fbde Merge pull request #1824 from selvaganesang/trafodion-3280_3 The 7108 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/org/trafodion/jdbc/t4/InputOutput.java| 56 +- .../org/trafodion/jdbc/t4/InterfaceConnection.java | 10 +- .../org/trafodion/jdbc/t4/InterfaceStatement.java | 202 +--- .../java/org/trafodion/jdbc/t4/T4Connection.java |7 +- .../java/org/trafodion/jdbc/t4/T4Properties.java |4 +- .../java/org/trafodion/jdbc/t4/T4ResultSet.java| 33 +- .../java/org/trafodion/jdbc/t4/T4Statement.java| 53 +- .../main/java/org/trafodion/jdbc/t4/TRANSPORT.java |7 + .../trafodion/jdbc/t4/TrafT4CallableStatement.java | 23 +- .../org/trafodion/jdbc/t4/TrafT4Connection.java| 23 +- .../trafodion/jdbc/t4/TrafT4PreparedStatement.java | 68 +- .../org/trafodion/jdbc/t4/TrafT4ResultSet.java | 30 +- .../org/trafodion/jdbc/t4/TrafT4Statement.java | 28 +- .../apache/trafodion/jdbc/t2/SQLMXResultSet.java | 17 +- core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp| 1059 +--- .../odbc/src/odbc/nsksrvrcore/sqlinterface.cpp | 22 +- core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp |4 +- core/sqf/sql/scripts/install_traf_components |5 +- core/sql/common/Ipc.cpp| 37 - core/sql/common/NAMemory.cpp |6 +- core/sql/common/arkcmp_proc.cpp|4 +- core/sql/exp/ExpPCodeOptsNativeExpr.cpp|4 +- core/sql/generator/GenExplain.cpp |2 +- core/sql/optimizer/CmpProcess.h|3 +- core/sql/optimizer/InliningInfo.cpp|1 - core/sql/optimizer/NATable.cpp |7 +- core/sql/optimizer/opt.cpp |2 +- core/sql/qmscommon/QRLogger.cpp|4 +- core/sql/runtimestats/SqlStats.cpp |2 +- core/sql/sqlcomp/CmpMain.cpp | 13 +- tests/phx/phoenix_test.py | 13 +- .../trafodion/phoenix/end2end/FunkyNamesTest.java |7 +- 32 files changed, 243 insertions(+), 1513 deletions(-)
[trafodion] branch master updated: Fix for cores seen with T2 JDBC applications caused by PR 1820
This is an automated email from the ASF dual-hosted git repository.
selva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git
The following commit(s) were added to refs/heads/master by this push:
new 5d4e9e6 Fix for cores seen with T2 JDBC applications caused by PR 1820
new 44a06db Merge pull request #1823 from selvaganesang/trafodio_3280_2
5d4e9e6 is described below
commit 5d4e9e68d8e5913db5eb579fea5ac76eb259da00
Author: selvaganesang
AuthorDate: Thu Apr 4 19:49:39 2019 +
Fix for cores seen with T2 JDBC applications caused by PR 1820
New member variables were not initialized in the CliGlobals constructor
---
core/sql/cli/Globals.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/core/sql/cli/Globals.cpp b/core/sql/cli/Globals.cpp
index 2d511c9..551fe3c 100644
--- a/core/sql/cli/Globals.cpp
+++ b/core/sql/cli/Globals.cpp
@@ -97,6 +97,7 @@ CliGlobals::CliGlobals(NABoolean espProcess)
langManJava_(NULL)
, myVerifier_(-1)
, espProcess_(espProcess)
+ , hbaseClientJNI_(NULL)
{
globalsAreInitialized_ = FALSE;
executorMemory_.setThreadSafe();
[trafodion] branch master updated (0ab8d50 -> 3ce5122)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafodion.git. from 0ab8d50 Merge pull request #1818 from SuJinpei/M-9933 new 316925d [TRAODION-3280] Reduce path length in Trafodion for improved performance and scalability new bb7f0a2 [TRAODION-3280] Reduce path length in Trafodion for improved performance and scalability new 4844b9d [TRAFODION-3280] Reduce path length in Trafodion for improved performance and scalability new 5355416 Merge branch 'master' of github.com:apache/trafodion into trafodio_3280_2 new b0f6807 Changes as per review comments of PR 1820 new 3ce5122 Merge pull request #1820 from selvaganesang/trafodio_3280_2 The 7088 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/trafodion/jdbc/t4/T4DatabaseMetaData.java | 1325 ++-- .../main/java/org/trafodion/jdbc/t4/T4Driver.java | 12 +- .../trafodion/jdbc/t4/TrafT4CallableStatement.java | 172 +-- .../org/trafodion/jdbc/t4/TrafT4Connection.java| 68 +- .../jdbc/t4/TrafT4ConnectionPoolDataSource.java| 14 +- .../org/trafodion/jdbc/t4/TrafT4DataSource.java|6 +- .../main/java/org/trafodion/jdbc/t4/TrafT4Lob.java |4 +- .../trafodion/jdbc/t4/TrafT4PooledConnection.java | 10 +- .../trafodion/jdbc/t4/TrafT4PreparedStatement.java | 100 +- .../org/trafodion/jdbc/t4/TrafT4Statement.java | 88 +- core/sql/cli/Context.cpp |8 +- core/sql/cli/Context.h |5 - core/sql/cli/Globals.cpp | 12 +- core/sql/cli/Globals.h |8 +- core/sql/executor/HBaseClient_JNI.cpp | 25 +- 15 files changed, 930 insertions(+), 927 deletions(-)
[trafodion] branch master updated (f4fa651 -> e988ab2)
This is an automated email from the ASF dual-hosted git repository. selva pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafodion.git. from f4fa651 Merge pull request #1798 from CoderSong2015/deleteNoUseCodeInMXOSRVR new 703f599 1. JULIANTIMESTAMP now uses clock_gettime with CLOCK_REALTIME by default. It can beswitched to earlier implementaion via setting env variable USE_LINUX_JULIANTIMESTAMP=0 2. Remove unwanted CQDs set by mxosrvr. GENERATE_EXPLAIN is not turned ON by mxosrvr. new 0da1062 A CQD CANCEL_QUERY_ALLOWED is introduced to complement the similar SSD for ease of setting in defaults table. new 09488f6 The new and delete operator without namespaces overrides all new and delete operations. This increases the pathlength of memory allocation and deallocation unnecessarily in release mode and the original intent of tracking new and delete not useful anymore. Hence this has been now enabled in debug mode only. new e988ab2 Merge pull request #1804 from selvaganesang/trafodion-3280 The 7041 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 7 ++--- core/sql/arkcmp/CmpConnection.cpp | 2 ++ core/sql/arkcmp/CmpConnection.h | 3 ++- core/sql/cli/SessionDefaults.cpp| 2 +- core/sql/comexe/ComTdbControl.cpp | 3 ++- core/sql/common/ComCextMisc.cpp | 34 +++-- core/sql/common/ComRtUtils.cpp | 20 --- core/sql/common/ComRtUtils.h| 21 ++- core/sql/executor/ex_control.cpp| 7 + core/sql/generator/Generator.cpp| 2 ++ core/sql/sqlcomp/DefaultConstants.h | 1 + core/sql/sqlcomp/NewDel.cpp | 3 ++- core/sql/sqlcomp/NewDel.h | 3 ++- core/sql/sqlcomp/nadefaults.cpp | 2 ++ 14 files changed, 77 insertions(+), 33 deletions(-)
[trafodion] branch master updated: [TRAFODION-3260] SSMP may wait 3 seconds before handling requests The commit 95c2712b131adc2ba06b4e620ad67f93c2658497 introduced a regression with ESPs acting as mas
This is an automated email from the ASF dual-hosted git repository.
selva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git
The following commit(s) were added to refs/heads/master by this push:
new a696be5 [TRAFODION-3260] SSMP may wait 3 seconds before handling
requests The commit 95c2712b131adc2ba06b4e620ad67f93c2658497 introduced a
regression with ESPs acting as master to run SQL queries. These SQL queries
were stuck at close.
new 8230c10 Merge pull request #1805 from selvaganesang/trafodion-3260
a696be5 is described below
commit a696be5753934326f7de11a249ee9a273900efa4
Author: selvaganesang
AuthorDate: Tue Feb 26 17:45:00 2019 +
[TRAFODION-3260] SSMP may wait 3 seconds before handling requests
The commit 95c2712b131adc2ba06b4e620ad67f93c2658497 introduced
a regression with ESPs acting as master to run SQL queries. These SQL
queries were stuck at close.
---
core/sql/common/Ipc.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/sql/common/Ipc.cpp b/core/sql/common/Ipc.cpp
index cfb737b..61f7908 100644
--- a/core/sql/common/Ipc.cpp
+++ b/core/sql/common/Ipc.cpp
@@ -1161,7 +1161,7 @@ WaitReturnStatus IpcAllConnections::waitOnAll(
if (timeout != IpcImmediately && timeout != IpcInfiniteTimeout) {
short mask;
- if (ipcEnv_->getControlConnection() != NULL) {
+ if (ipcEnv_->getControlConnection() != NULL && (!
GetCliGlobals()->isEspProcess())) {
mask = XWAIT(LREQ | LDONE, timeout);
if (mask & LREQ)
retcode =
ipcEnv_->getControlConnection()->castToGuaReceiveControlConnection()->wait(IpcImmediately);
[trafodion] branch master updated: remove unused code in mxosrvr --first step
This is an automated email from the ASF dual-hosted git repository.
selva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git
The following commit(s) were added to refs/heads/master by this push:
new 94a433e remove unused code in mxosrvr --first step
new f4fa651 Merge pull request #1798 from
CoderSong2015/deleteNoUseCodeInMXOSRVR
94a433e is described below
commit 94a433ef0586b9376d8b7c6189c605c9cbf608c2
Author: haolin.song
AuthorDate: Thu Feb 14 06:53:57 2019 +
remove unused code in mxosrvr --first step
---
core/conn/odbc/src/odbc/nsksrvrcore/srvrcommon.cpp | 308 -
core/conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h | 48
2 files changed, 356 deletions(-)
diff --git a/core/conn/odbc/src/odbc/nsksrvrcore/srvrcommon.cpp
b/core/conn/odbc/src/odbc/nsksrvrcore/srvrcommon.cpp
index 2ce5496..1ed101d 100644
--- a/core/conn/odbc/src/odbc/nsksrvrcore/srvrcommon.cpp
+++ b/core/conn/odbc/src/odbc/nsksrvrcore/srvrcommon.cpp
@@ -167,73 +167,6 @@ void SRVR::formatQueryStateMsg( char *queryStateMsg
}
}
-//LCOV_EXCL_START
-Int32 SRVR::getMXCS_SCHEMAversion(
-/* In*/ CEE_tag_def objtag_
- , /* In*/ const CEE_handle_def *call_id_
- , /* In*/ SMD_QUERY_TABLE *queryTable
- , /* Out */ ERROR_DESC_LIST_def *sqlWarning)
-{
- const char *inputParam[10];
- CEE_status sts;
- short retCode = 0;
- charstmtLabel[MAX_STMT_LABEL_LEN+1];
- chartempStr[MAX_ANSI_NAME_LEN+1];
- IDL_longrowsAffected;
- SQLValueList_def outputValueList;
- DIALOGUE_ID_def dialogueId = 0;
- ERROR_DESC_def *error_desc_def;
- const char *tempinputParam[10];
- odbc_SQLSvc_Prepare_exc_ prepareException={0,0,0};
- odbc_SQLSvc_ExecuteN_exc_ executeException={0,0,0};
- odbc_SQLSvc_FetchN_exc_ fetchException={0,0,0};
- odbc_SQLSvc_Close_exc_ CloseException={0,0,0};
- CloseException.exception_nr=0;
- IDL_longtemprowsAffected;
- SQLValueList_def tempoutputValueList;
- SQLValue_def *tempSQLValue;
-
- strcpy(stmtLabel, "SQL_MXCS_VERS_Q1"); //"SQL_MXCS_VERS_Q1",
CfgMXCSVerQ1: this must be executed before any smdQueryTable labels that use
DEF_SCH index
- retCode = executeAndFetchSQLQuery(objtag_, call_id_, dialogueId,
queryTable, stmtLabel,
- 1, (char
**)tempinputParam, ,
- ,
, sqlWarning, ,
- );
- if(retCode == FETCH_EXCEPTION &&
- fetchException.exception_nr ==
odbc_SQLSvc_FetchN_SQLError_exn_)
- {
- error_desc_def = fetchException.u.SQLError.errorList._buffer;
- if(error_desc_def->sqlcode == -8574 || error_desc_def->sqlcode
== -8551)
- {
- strcpy(stmtLabel, "SQL_MXCS_VERS_Q1");
- retCode = executeAndFetchSQLQuery(objtag_, call_id_,
dialogueId, queryTable, stmtLabel,
- 1,
(char **)tempinputParam, ,
-
, , sqlWarning, ,
-
);
-
- if( retCode != CEE_SUCCESS )
- return 0;
- }
- else
- return 0;
- }
- else if( retCode != CEE_SUCCESS && fetchException.exception_nr !=
odbc_SQLSvc_FetchN_SQLNoDataFound_exn_)
-// Freestatement done inside doExecSql()
- return 0;
- else if (retCode == CEE_SUCCESS)
- {
- tempSQLValue = (SQLValue_def *)tempoutputValueList._buffer;
- if (tempSQLValue->dataInd == -1)
- return 0;
- else
- srvrGlobal->MXCS_SCHEMA_Version = *(Int32
*)(tempSQLValue->dataValue._buffer);
- }
- odbc_SQLSvc_Close_sme_(objtag_, call_id_, , dialogueId,
stmtLabel,
- SQL_CLOSE, , sqlWarning);
-
- return srvrGlobal->MXCS_SCHEMA_Version;
-}
-//LCOV_EXCL_STOP
-
SRVR_STMT_HDL_LIST *SRVR::allocSrvrStmtHdlList()
{
SRVRTRACE_ENTER(FILE_COMMON+3);
@@ -803,134 +736,6 @@ void SRVR::releaseCachedObject(BOOL internalStmt,
NDCS_SUBSTATE mxsrvr_substate)
return;
}
-/* Common Function to execute Catalog SQL
- * Statements
-*/
-
-short SRVR::do_ExecSql(
-/* In*/ CEE_tag_def objtag_
- , /* In*/ const CEE_handle_def *call_id_
- , /* Out */ odbc_SQLSvc_Prepare_exc_ *prepareException
- , /* Out */ odbc_SQLSvc_ExecuteN_exc_ *executeException
- , /* Out */ ERROR_DESC_
[trafodion] branch master updated: [TRAFODION-3260] SSMP may wait 3 seconds before handling requests
This is an automated email from the ASF dual-hosted git repository.
selva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git
The following commit(s) were added to refs/heads/master by this push:
new 95c2712 [TRAFODION-3260] SSMP may wait 3 seconds before handling
requests
new 4f65a23 Merge pull request #1795 from selvaganesang/trafodion-3260
95c2712 is described below
commit 95c2712b131adc2ba06b4e620ad67f93c2658497
Author: selvaganesang
AuthorDate: Thu Feb 7 04:50:35 2019 +
[TRAFODION-3260] SSMP may wait 3 seconds before handling requests
Encapsulated the changes in the commit 2ee272b325d021 to Ipc layer.
[TRAFODION-3274] At times sqlci or any other SQL process fails to come up
and dumps core
It looks like there is a race condition in C++ main function prologue while
initializing the embedded global objects and the stdin, stdout and stderr
file
descriptors.
File descriptor of value 2 is returned for epoll_create(). But, the error
redirection
code possibly used this fd to redirect overriding the epoll fd.
This caused epoll_ctl to return EINVAL resulting in core dump of sql
process.
Changed the global object gv_sock_ctlr to a global object pointer.
---
core/sqf/src/seabed/src/sock.cpp | 58 ++---
core/sql/bin/ex_ssmp_main.cpp | 27 --
core/sql/common/Ipc.cpp | 69 ---
core/sql/common/Ipc.h | 31 +++-
core/sql/executor/ex_split_bottom.cpp | 4 --
core/sql/runtimestats/ssmpipc.cpp | 2 +-
6 files changed, 89 insertions(+), 102 deletions(-)
diff --git a/core/sqf/src/seabed/src/sock.cpp b/core/sqf/src/seabed/src/sock.cpp
index 65a4bfa..683225d 100644
--- a/core/sqf/src/seabed/src/sock.cpp
+++ b/core/sqf/src/seabed/src/sock.cpp
@@ -65,7 +65,7 @@ SB_Label_Map gv_sock_epoll_ctl_type_label_map = {
"", ga_sock_epoll_ctl_type_labels
};
-static SB_Trans::Sock_Controller gv_sock_ctlr;
+static SB_Trans::Sock_Controller *gv_sock_ctlr = NULL;
static const char *sock_get_label_epoll_ctl(int pv_value) {
return SB_get_label(_sock_epoll_ctl_type_label_map, pv_value);
@@ -78,6 +78,20 @@ static void *sock_comp_thread_fun(void *pp_arg) {
return NULL;
}
+SB_Trans::Sock_Controller *getGlobalSockCtrl() {
+ if (gv_sock_ctlr != NULL)
+ return gv_sock_ctlr;
+ SB_util_short_lock();
+ if (gv_sock_ctlr != NULL) {
+ SB_util_short_unlock();
+ return gv_sock_ctlr;
+ }
+ gv_sock_ctlr = new SB_Trans::Sock_Controller();
+ SB_util_short_unlock();
+ return gv_sock_ctlr;
+}
+
+
SB_Trans::Sock_Comp_Thread::Sock_Comp_Thread(const char *pp_name)
: Thread(sock_comp_thread_fun, pp_name),
iv_fin(false),
@@ -104,7 +118,7 @@ void SB_Trans::Sock_Comp_Thread::run() {
iv_running = true;
while (!iv_fin) {
-gv_sock_ctlr.epoll_wait(WHERE, -1);
+getGlobalSockCtrl()->epoll_wait(WHERE, -1);
}
if (gv_ms_trace_sock)
trace_where_printf(WHERE, "EXITING comp thread\n");
@@ -193,11 +207,11 @@ int SB_Trans::Sock_Client::connect(char *pp_host, int
pv_port) {
}
if (lv_sock == -1)
return lv_errno;
-lv_err = gv_sock_ctlr.set_nodelay(WHERE, lv_sock);
+lv_err = getGlobalSockCtrl()->set_nodelay(WHERE, lv_sock);
SB_util_assert_ieq(lv_err, 0);
-lv_err = gv_sock_ctlr.set_size_recv(WHERE, lv_sock, SIZE);
+lv_err = getGlobalSockCtrl()->set_size_recv(WHERE, lv_sock, SIZE);
SB_util_assert_ieq(lv_err, 0);
-lv_err = gv_sock_ctlr.set_size_send(WHERE, lv_sock, SIZE);
+lv_err = getGlobalSockCtrl()->set_size_send(WHERE, lv_sock, SIZE);
SB_util_assert_ieq(lv_err, 0);
memset(_addr, 0, sizeof(lv_addr));
lv_addr.sin_family = AF_INET;
@@ -462,7 +476,7 @@ int SB_Trans::Sock_Controller::set_size_send(const char
*pp_where,
}
void SB_Trans::Sock_Controller::shutdown(const char *pp_where) {
-gv_sock_ctlr.shutdown_this(pp_where);
+getGlobalSockCtrl()->shutdown_this(pp_where);
}
void SB_Trans::Sock_Controller::shutdown_this(const char *pp_where) {
@@ -511,16 +525,16 @@ void SB_Trans::Sock_Controller::sock_add(const char
*pp_where,
if (gv_ms_trace_sock)
trace_where_printf(WHERE, "%s-add fd=%d, eh=%p\n",
pp_where, pv_sock, pfp(pp_eh));
-gv_sock_ctlr.epoll_ctl(pp_where,
+getGlobalSockCtrl()->epoll_ctl(pp_where,
EPOLL_CTL_ADD,
pv_sock,
EPOLLIN,
pp_eh);
// need lock - can only have one comp thread
-gv_sock_ctlr.lock();
+getGlobalSockCtrl()->lock();
if (ip_comp_thread == NULL) {
ip_shutdown_eh = new Sock_Shutdown_EH();
-gv_sock_ctlr.epoll_ctl(pp_where,
+getGlobalSockCtrl()->epoll_ctl(p
[trafodion] branch master updated: [TRAFODION-3260] SSMP may wait 3 seconds before handling requests
This is an automated email from the ASF dual-hosted git repository.
selva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git
The following commit(s) were added to refs/heads/master by this push:
new d7ca0aa [TRAFODION-3260] SSMP may wait 3 seconds before handling
requests
new dcacef0 Merge pull request #1786 from
zhenxingh/traf-3260-ssmp-wait-3-seconds
d7ca0aa is described below
commit d7ca0aabff11fa12901dd9ba1f6b234556295844
Author: He Zhenxing
AuthorDate: Wed Jan 30 16:55:00 2019 +0800
[TRAFODION-3260] SSMP may wait 3 seconds before handling requests
---
core/sql/bin/ex_ssmp_main.cpp | 9 +++--
core/sql/runtimestats/ssmpipc.cpp | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/core/sql/bin/ex_ssmp_main.cpp b/core/sql/bin/ex_ssmp_main.cpp
index cfbe07b..6797890 100755
--- a/core/sql/bin/ex_ssmp_main.cpp
+++ b/core/sql/bin/ex_ssmp_main.cpp
@@ -51,6 +51,7 @@
#include "PortProcessCalls.h"
#include "seabed/ms.h"
#include "seabed/fs.h"
+#include "seabed/pctl.h"
extern void my_mpi_fclose();
#include "SCMVersHelp.h"
DEFINE_DOVERS(mxssmp)
@@ -246,8 +247,12 @@ void runServer(Int32 argc, char **argv)
}
}
*/
-// wait for system messages only until ssmp starts receiving msgs.
-cc->wait(300);
+// Wait for messages, but we need ssmp to wake up periodically to
+// perform garbage collection.
+short mask = XWAIT(LREQ | LDONE, ssmpGlobals->getStatsMergeTimeout());
+if (mask & LREQ) {
+ cc->wait(0);
+}
// go do GC.
ssmpGlobals->work();
}
diff --git a/core/sql/runtimestats/ssmpipc.cpp
b/core/sql/runtimestats/ssmpipc.cpp
index e56c761..98fc04c 100755
--- a/core/sql/runtimestats/ssmpipc.cpp
+++ b/core/sql/runtimestats/ssmpipc.cpp
@@ -540,7 +540,7 @@ static Int64 SikGcInterval = -1;
void SsmpGlobals::work()
{
- getIpcEnv()->getAllConnections()->waitOnAll(getStatsMergeTimeout());
+ getIpcEnv()->getAllConnections()->waitOnAll(0);
finishPendingSscpMessages();
// Cleanup IpcEnvironment
[trafodion] branch master updated (a3a0e7e -> 2db4add)
This is an automated email from the ASF dual-hosted git repository.
selva pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git.
from a3a0e7e Merge pull request #1785 from
zhenxingh/traf-3265-insert-varchar-utf8-slow
new 734f6ba [TRAFODION-3259] When the length of the varchar exceeds
65536, insert into data will fail
new 957099a [TRAFODION-3259] Length of varchar exceeds 65536 insert data
will fail
new b2744ca Merge branch 'master' into traf-3259-varchar-length-64k-limit
new 2db4add Merge pull request #1783 from
zhenxingh/traf-3259-varchar-length-64k-limit
The 6988 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
core/sql/exp/exp_attrs.h | 19 -
core/sql/regress/charsets/EXPECTED316 | 22 ++
.../triggers/TEST_1_1_1_9 => charsets/TEST316} | 48 +++---
core/sql/regress/tools/runregr_charsets.ksh| 2 +-
4 files changed, 55 insertions(+), 36 deletions(-)
create mode 100644 core/sql/regress/charsets/EXPECTED316
copy core/sql/regress/{newregr/triggers/TEST_1_1_1_9 => charsets/TEST316} (57%)
[trafodion] branch master updated: [TRAFODION-3266] Change ustats base table accesses to SKIP CONFLICT ACCESS
This is an automated email from the ASF dual-hosted git repository.
selva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafodion.git
The following commit(s) were added to refs/heads/master by this push:
new 9fc66a6 [TRAFODION-3266] Change ustats base table accesses to SKIP
CONFLICT ACCESS
new d2d28d2 Merge pull request #1787 from DaveBirdsall/Trafodion3266
9fc66a6 is described below
commit 9fc66a6bbdcb2fa1e65d812de2e3c69ea0f01d5e
Author: Dave Birdsall
AuthorDate: Wed Jan 30 19:15:31 2019 +
[TRAFODION-3266] Change ustats base table accesses to SKIP CONFLICT ACCESS
---
core/sql/ustat/hs_globals.cpp | 14 +++---
core/sql/ustat/hs_la.cpp | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/sql/ustat/hs_globals.cpp b/core/sql/ustat/hs_globals.cpp
index b09acad..04220d9 100644
--- a/core/sql/ustat/hs_globals.cpp
+++ b/core/sql/ustat/hs_globals.cpp
@@ -3381,7 +3381,7 @@ Lng32 HSGlobalsClass::Initialize()
LM->StartTimer("Execute query to get row count");
query = "SELECT COUNT(*) FROM ";
query += getTableName(user_table->data(), nameSpace);
-query += " FOR READ UNCOMMITTED ACCESS";
+query += " FOR SKIP CONFLICT ACCESS";
retcode = cursor.fetchNumColumn(query, NULL, );
LM->StopTimer();
HSHandleError(retcode);
@@ -4285,7 +4285,7 @@ Lng32 HSSample::make(NABoolean rowCountIsEstimate, //
input
dml += cardHint;
dml += sampleOption;
-dml += " FOR READ UNCOMMITTED ACCESS";
+dml += " FOR SKIP CONFLICT ACCESS";
const Int32 hsALLOW_SPECIALTABLETYPE = 0x1;
if (objDef->getNameSpace() == COM_IUD_LOG_TABLE_NAME)
{
@@ -5884,7 +5884,7 @@ Lng32 HSGlobalsClass::CollectStatistics()
group->clistr->append(" GROUP BY ");
group->clistr->append(columnName.data());
-group->clistr->append(" FOR READ UNCOMMITTED ACCESS) T(");
+group->clistr->append(" FOR SKIP CONFLICT ACCESS) T(");
group->clistr->append(columnName.data());
if (isVarChar)
{
@@ -9397,7 +9397,7 @@ Lng32 HSGlobalsClass::ComputeMCStatistics(NABoolean
usingIS)
mgroup->clistr->append(" GROUP BY ");
mgroup->clistr->append(mgroupColNames);
-mgroup->clistr->append(" FOR READ UNCOMMITTED ACCESS) T(");
+mgroup->clistr->append(" FOR SKIP CONFLICT ACCESS) T(");
mgroup->clistr->append(mgroupColNames);
mgroup->clistr->append(", FMTVAL, SUMVAL)");
if(collectMCSkewedValues)
@@ -11729,7 +11729,7 @@ Lng32
HSGlobalsClass::prepareToReadColumnsIntoMem(HSCursor *cursor, Int64 rows)
if (samplingUsed && !sampleTableUsed)
internalSortQuery.append(sampleOption->data());
- internalSortQuery.append(" FOR READ UNCOMMITTED ACCESS");
+ internalSortQuery.append(" FOR SKIP CONFLICT ACCESS");
LM->Log("Preparing rowset...");
// Allocate descriptors and statements for CLI and prepare rowset by
@@ -16314,7 +16314,7 @@ void HSInMemoryTable::generateSelectDQuery(NAString&
smplTable, NAString& queryT
queryText.append(" WHERE ");
queryText.append(whereCondition_);
- queryText.append(" FOR READ UNCOMMITTED ACCESS");
+ queryText.append(" FOR SKIP CONFLICT ACCESS");
}
@@ -16413,7 +16413,7 @@ HSInMemoryTable::generateSelectIQuery(NAString&
smplTable,
queryText.append(" FROM ");
queryText.append(smplTable.data());
- queryText.append("_I FOR READ UNCOMMITTED ACCESS");
+ queryText.append("_I FOR SKIP CONFLICT ACCESS");
}
diff --git a/core/sql/ustat/hs_la.cpp b/core/sql/ustat/hs_la.cpp
index f945985..8c812c8 100644
--- a/core/sql/ustat/hs_la.cpp
+++ b/core/sql/ustat/hs_la.cpp
@@ -532,7 +532,7 @@ Int64 HSTableDef::getRowCountUsingSelect()
NAString query = "SELECT COUNT(*) FROM ";
query += getTableName(getObjectFullName(), getNameSpace());
- query += " FOR READ UNCOMMITTED ACCESS;";
+ query += " FOR SKIP CONFLICT ACCESS;";
if (cursor.fetchNumColumn(query, NULL, ) < 0)
rows = -1; // Error
[1/2] trafodion git commit: [TRAFODION-3234] Refactor hive meta calls
Repository: trafodion
Updated Branches:
refs/heads/master b3e9cb1eb -> c98af5444
[TRAFODION-3234] Refactor hive meta calls
Hive similarity check was detecting if there is a change in the hive
directory timestamp only. It has been changed to detect the DDL changes too.
Cleaned up code further and removed all the unwanted code.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/7d34d7c9
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/7d34d7c9
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/7d34d7c9
Branch: refs/heads/master
Commit: 7d34d7c9bab8504d5c45fa79ed2e3ee0649d254c
Parents: 923f0a9
Author: selvaganesang
Authored: Fri Dec 21 17:39:53 2018 +
Committer: selvaganesang
Committed: Fri Dec 21 17:40:31 2018 +
--
core/sql/cli/Statement.cpp | 135 ---
core/sql/cli/Statement.h| 2 -
core/sql/executor/ExExeUtilMisc.cpp | 59 +---
core/sql/executor/ExFastTransport.cpp | 22 ---
core/sql/executor/ExFastTransport.h | 6 -
core/sql/executor/ExHdfsScan.cpp| 2 -
core/sql/executor/ExHdfsScan.h | 1 -
core/sql/executor/HiveClient_JNI.cpp| 3 +-
core/sql/executor/hiveHook.cpp | 12 +-
core/sql/exp/ExpLOBinterface.cpp| 72 --
core/sql/exp/ExpLOBinterface.h | 18 ---
core/sql/generator/GenFastTransport.cpp | 14 +-
core/sql/optimizer/HDFSHook.cpp | 2 +-
core/sql/optimizer/hiveHook.h | 2 +-
core/sql/regress/hive/EXPECTED007 | 2 +-
core/sql/regress/tools/regress-filter-linux | 2 +
.../main/java/org/trafodion/sql/HiveClient.java | 7 +-
17 files changed, 91 insertions(+), 270 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/7d34d7c9/core/sql/cli/Statement.cpp
--
diff --git a/core/sql/cli/Statement.cpp b/core/sql/cli/Statement.cpp
index 4436e8c..020f1f6 100644
--- a/core/sql/cli/Statement.cpp
+++ b/core/sql/cli/Statement.cpp
@@ -84,6 +84,8 @@
#include "arkcmp_proc.h"
#include "CmpContext.h"
+#include "HiveClient_JNI.h"
+
// Printf-style tracing macros for the debug build. The macros are
// no-ops in the release build.
#ifdef _DEBUG
@@ -2020,76 +2022,68 @@ Statement * Statement::getCurrentOfCursorStatement(char
* cursorName)
}
RETCODE Statement::doHiveTableSimCheck(TrafSimilarityTableInfo *si,
- ExLobGlobals * lobGlob,
NABoolean ,
ComDiagsArea )
{
simCheckFailed = FALSE;
- Lng32 retcode = 0;
if ((si->hdfsRootDir() == NULL) || (si->modTS() == -1))
return SUCCESS;
-
- Int64 failedModTS = -1;
- Lng32 failedLocBufLen = 1000;
- char failedLocBuf[failedLocBufLen];
- retcode = ExpLOBinterfaceDataModCheck
-(lobGlob,
- si->hdfsRootDir(),
- si->hdfsHostName(),
- si->hdfsPort(),
- si->modTS(),
- si->numPartnLevels(),
- failedModTS,
- failedLocBuf, failedLocBufLen);
- if (retcode < 0)
-{
- Lng32 intParam1 = -retcode;
- diagsArea << DgSqlCode(-EXE_ERROR_FROM_LOB_INTERFACE)
-<< DgString0("HDFS")
-<< DgString1("ExpLOBInterfaceDataModCheck")
-<< DgString2(getLobErrStr(intParam1))
-<< DgInt0(intParam1)
-<< DgInt1(0);
- if (intParam1 == LOB_DATA_READ_ERROR)
-{
- if ((failedLocBufLen > 0) && (strlen(failedLocBuf) > 0))
-{
- char errBuf[strlen(si->tableName()) + 100 + failedLocBufLen];
- snprintf(errBuf,sizeof(errBuf), "%s (fileLoc: %s)",
si->tableName(), failedLocBuf);
- diagsArea << DgSqlCode(-EXE_TABLE_NOT_FOUND)
-<< DgString0(errBuf);
-}
- else
-{
- diagsArea << DgSqlCode(-EXE_TABLE_NOT_FOUND)
-<< DgString0(si->tableName());
-}
- simCheckFailed = TRUE;
-}
-
- return ERROR;
-}
-
- if (retcode == 1) // check failed
-{
- char errStr[2000];
- /* str_sprintf(errStr, "compiledModTS = %ld, failedModTS = %ld,
failedLoc = %s",
- si->modTS(), failedModTS,
- (failedLocBufLen > 0 ? failedLocBuf : si->hdfsRootDir()));*/
- snprintf(errStr,sizeof(errStr),
+
+ char *tmpBuf = new (_)
char[ComMAX_3_PART_EXTERNAL_UTF8_NAME_LEN_IN_BYTES+6];
+ Lng32 numParts = 0;
+ char *parts[4];
+ Int64 redefTime;
+
+ LateNameInfo::extractParts(si->tableName(), tmpBuf, numParts, parts, FALSE);
+
[2/2] trafodion git commit: Merge PR 1766[TRAFODION-3234] Refactor hive meta calls
Merge PR 1766[TRAFODION-3234] Refactor hive meta calls Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/c98af544 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/c98af544 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/c98af544 Branch: refs/heads/master Commit: c98af5444f7ae8fa01ba436995e3c420b8eb97f2 Parents: b3e9cb1 7d34d7c Author: selvaganesang Authored: Thu Jan 10 18:58:29 2019 + Committer: selvaganesang Committed: Thu Jan 10 18:58:29 2019 + -- core/sql/cli/Statement.cpp | 135 --- core/sql/cli/Statement.h| 2 - core/sql/executor/ExExeUtilMisc.cpp | 59 +--- core/sql/executor/ExFastTransport.cpp | 22 --- core/sql/executor/ExFastTransport.h | 6 - core/sql/executor/ExHdfsScan.cpp| 2 - core/sql/executor/ExHdfsScan.h | 1 - core/sql/executor/HiveClient_JNI.cpp| 3 +- core/sql/executor/hiveHook.cpp | 12 +- core/sql/exp/ExpLOBinterface.cpp| 72 -- core/sql/exp/ExpLOBinterface.h | 18 --- core/sql/generator/GenFastTransport.cpp | 14 +- core/sql/optimizer/HDFSHook.cpp | 2 +- core/sql/optimizer/hiveHook.h | 2 +- core/sql/regress/hive/EXPECTED007 | 2 +- core/sql/regress/tools/regress-filter-linux | 2 + .../main/java/org/trafodion/sql/HiveClient.java | 7 +- 17 files changed, 91 insertions(+), 270 deletions(-) --
[2/2] trafodion git commit: Merge PR 1764 optimize get/set schema
Merge PR 1764 optimize get/set schema Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/923f0a91 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/923f0a91 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/923f0a91 Branch: refs/heads/master Commit: 923f0a9197f545b5f7a8762ed9fd23430adcd9a2 Parents: dd184e0 018f5ef Author: selvaganesang Authored: Fri Dec 21 01:29:37 2018 + Committer: selvaganesang Committed: Fri Dec 21 01:29:37 2018 + -- .../jdbc/t4/CONNECTION_CONTEXT_def.java | 10 +- .../trafodion/jdbc/t4/InterfaceConnection.java | 38 +-- .../trafodion/jdbc/t4/InterfaceStatement.java | 29 - .../jdbc/t4/OUT_CONNECTION_CONTEXT_def.java | 10 +- .../org/trafodion/jdbc/t4/TrafT4Connection.java | 113 ++- 5 files changed, 110 insertions(+), 90 deletions(-) -- http://git-wip-us.apache.org/repos/asf/trafodion/blob/923f0a91/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java --
[1/2] trafodion git commit: [TRAFODION-3250] optimize get/set schema
Repository: trafodion
Updated Branches:
refs/heads/master dd184e01d -> 923f0a919
[TRAFODION-3250] optimize get/set schema
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/018f5efb
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/018f5efb
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/018f5efb
Branch: refs/heads/master
Commit: 018f5efbd234ca7b1fe1fadada21c58db1d64c3e
Parents: 7e94e79
Author: Aven
Authored: Fri Dec 21 01:02:16 2018 +0800
Committer: Aven
Committed: Fri Dec 21 01:02:16 2018 +0800
--
.../jdbc/t4/CONNECTION_CONTEXT_def.java | 10 +-
.../trafodion/jdbc/t4/InterfaceConnection.java | 38 +--
.../trafodion/jdbc/t4/InterfaceStatement.java | 29 -
.../jdbc/t4/OUT_CONNECTION_CONTEXT_def.java | 10 +-
.../org/trafodion/jdbc/t4/TrafT4Connection.java | 113 ++-
5 files changed, 110 insertions(+), 90 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/018f5efb/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/CONNECTION_CONTEXT_def.java
--
diff --git
a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/CONNECTION_CONTEXT_def.java
b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/CONNECTION_CONTEXT_def.java
index 9f5c0ed..f8e9701 100644
---
a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/CONNECTION_CONTEXT_def.java
+++
b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/CONNECTION_CONTEXT_def.java
@@ -27,7 +27,7 @@ import java.nio.charset.UnsupportedCharsetException;
class CONNECTION_CONTEXT_def {
String datasource = "";
String catalog = "";
- String schema = "";
+private String schema = "";
String location = "";
String userRole = "";
@@ -147,4 +147,12 @@ class CONNECTION_CONTEXT_def {
clientVersionList.insertIntoByteArray(buf);
}
+
+public String getSchema() {
+return schema;
+}
+
+public void setSchema(String schema) {
+this.schema = schema;
+}
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/018f5efb/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java
--
diff --git
a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java
b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java
index 6cd0601..d23d615 100644
---
a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java
+++
b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java
@@ -96,6 +96,7 @@ class InterfaceConnection {
static final short SQL_ATTR_ACCESS_MODE = 101;
static final short SQL_ATTR_AUTOCOMMIT = 102;
static final short SQL_TXN_ISOLATION = 108;
+ static final short SET_SCHEMA = 1001; // this value is follow server
side definition
// spj proxy syntax support
static final short SPJ_ENABLE_PROXY = 1040;
@@ -217,7 +218,7 @@ class InterfaceConnection {
private CONNECTION_CONTEXT_def getInContext(T4Properties t4props) {
inContext = new CONNECTION_CONTEXT_def();
inContext.catalog = t4props.getCatalog();
- inContext.schema = t4props.getSchema();
+inContext.setSchema(t4props.getSchema());
inContext.datasource = t4props.getServerDataSource();
inContext.userRole = t4props.getRoleName();
inContext.cpuToUse = t4props.getCpuToUse();
@@ -417,13 +418,34 @@ class InterfaceConnection {
return userDesc.userName;
}
- String getSchema() {
- if (outContext != null) {
- return outContext.schema;
- } else {
- return inContext.schema;
- }
- }
+String getSchema() {
+if (outContext != null) {
+return outContext.getSchema();
+} else {
+return inContext.getSchema();
+}
+}
+
+void setSchemaDirect(String schema) {
+outContext.setSchema(schema);
+}
+void setSchema(TrafT4Connection conn, String schema) throws SQLException {
+if (t4props_.t4Logger_.isLoggable(Level.FINEST) == true) {
+Object p[] = T4LoggingUtilities.makeParams(conn.props_, schema);
+String temp = "Setting connection schema = " + schema;
+t4props_.t4Logger_.logp(Level.FINEST, "InterfaceConnection",
"setSchema", temp, p);
+}
+if (schema == null || schema.length() == 0) {
+return;
+}
+setConnectionAttr(conn, SET_SCHEMA, 0, schema);
+setSchemaDirect(schema);
+if
[1/2] trafodion git commit: Fix for hive/TEST003 failure. Created a known failure to accommodate the costing change between Jenkins and contributor's work space environments.
Repository: trafodion Updated Branches: refs/heads/master 7714b3fde -> 6bc8a9208 Fix for hive/TEST003 failure. Created a known failure to accommodate the costing change between Jenkins and contributor's work space environments. Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/1173fafe Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/1173fafe Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/1173fafe Branch: refs/heads/master Commit: 1173fafec45f26218a691f3d2b0ce8b97fcf622a Parents: bb39775 Author: selvaganesang Authored: Fri Dec 14 16:51:25 2018 + Committer: selvaganesang Committed: Fri Dec 14 16:51:25 2018 + -- core/sql/regress/hive/DIFF003.KNOWN | 50 +++- 1 file changed, 4 insertions(+), 46 deletions(-) -- http://git-wip-us.apache.org/repos/asf/trafodion/blob/1173fafe/core/sql/regress/hive/DIFF003.KNOWN -- diff --git a/core/sql/regress/hive/DIFF003.KNOWN b/core/sql/regress/hive/DIFF003.KNOWN index 1b183ce..9cb22c1 100644 --- a/core/sql/regress/hive/DIFF003.KNOWN +++ b/core/sql/regress/hive/DIFF003.KNOWN @@ -1,50 +1,8 @@ -539,542d538 -< *** WARNING[6008] Statistics for column (SS_SOLD_DATE_SK) from table HIVE.HIVE.STORE_SALES were not available. As a result, the access path chosen might not be the best possible. -< -< *** WARNING[6008] Statistics for column (SS_STORE_SK) from table HIVE.HIVE.STORE_SALES were not available. As a result, the access path chosen might not be the best possible. -< -551,556c547,553 -< 6 . 7 root 2.92E+006 -< 5 . 6 esp_exchange 1:2(hash2) 2.92E+006 -< 3 . 5 hive_insert INS_STORE_SALES_SUMM 2.92E+006 -< 2 . 3 hash_groupby 2.92E+006 -< 1 . 2 esp_exchange 2(hash2):2(hash2) 2.92E+006 -< . . 1 hive_scan STORE_SALES 2.92E+006 +557c557 +< . . 1 hive_scan STORE_SALES 2.74E+006 --- -> 7 . 8 root 1.09E+004 -> 6 . 7 esp_exchange 1:2(hash2) 1.09E+004 -> 4 . 6 hive_insert INS_STORE_SALES_SUMM 1.09E+004 -> 3 . 4 hash_partial_groupby 1.09E+004 -> 2 . 3 esp_exchange 2(hash2):2(hash2) 1.09E+004 -> 1 . 2 hash_partial_groupby 1.09E+004 > . . 1 hive_scan STORE_SALES 2.75E+006 -593,597c590 -< 3,10c3,4 -< < *** WARNING[6008] Statistics for column (SS_SOLD_DATE_SK) from table HIVE.HIVE.STORE_SALES were not available. As a result, the access path chosen might not be the best possible. -< < -< < *** WARNING[6008] Statistics for column (SS_STORE_SK) from table HIVE.HIVE.STORE_SALES were not available. As a result, the access path chosen might not be the best possible. -< < +623c623 +< . . 2 hive_scan STORE_SALES 2.74E+006 --- -> 3,6c3,4 -611,614d603 -< *** WARNING[6008] Statistics for column (SS_SOLD_DATE_SK) from table HIVE.HIVE.STORE_SALES were not available. As a result, the access path chosen might not be the best possible. -< -< *** WARNING[6008] Statistics for column (SS_STORE_SK) from table HIVE.HIVE.STORE_SALES were not available. As a result, the access path chosen might not be the best possible. -< -623,629c612,619 -< 8 . 9 root 2.92E+006 -< 1 7 8 blocked_union 2.92E+006 -< 6 . 7 esp_exchange 1:2(hash2) 2.92E+006 -< 4 . 6 hive_insert INS_STORE_SALES_SUMM 2.92E+006 -< 3 . 4 hash_groupby 2.92E+006 -< 2 . 3 esp_exchange 2(hash2):2(hash2) 2.92E+006 -< . . 2 hive_scan STORE_SALES 2.92E+006 -> 9 . 10 root 1.09E+004 -> 1 8 9 blocked_union 1.09E+004 -> 7 . 8 esp_exchange 1:2(hash2) 1.09E+004 -> 5 . 7 hive_insert INS_STORE_SALES_SUMM 1.09E+004 -> 4 . 5 hash_partial_groupby 1.09E+004 -> 3 . 4 esp_exchange 2(hash2):2(hash2) 1.09E+004 -> 2 . 3 hash_partial_groupby 1.09E+004 > . . 2 hive_scan STORE_SALES 2.75E+006
[2/2] trafodion git commit: Merge PR 1762 Fix for hive/TEST003 failure
Merge PR 1762 Fix for hive/TEST003 failure Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/6bc8a920 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/6bc8a920 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/6bc8a920 Branch: refs/heads/master Commit: 6bc8a9208fd56d1c9927cc12ed2d99eda1dddbde Parents: 7714b3f 1173faf Author: selvaganesang Authored: Sat Dec 15 04:30:16 2018 + Committer: selvaganesang Committed: Sat Dec 15 04:30:16 2018 + -- core/sql/regress/hive/DIFF003.KNOWN | 50 +++- 1 file changed, 4 insertions(+), 46 deletions(-) --
[7/8] trafodion git commit: [TRAFODION-3234] Refactor hive meta calls to be less resource intensive to support hive partitions if needed
[TRAFODION-3234] Refactor hive meta calls to be less resource intensive to
support hive partitions if needed
Fixed a bug where createTime is not converted into millisecs before comparing
with directory timestamp in millisecs
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/d8388f80
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/d8388f80
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/d8388f80
Branch: refs/heads/master
Commit: d8388f8008c96bd11084343553254eaba75cc45d
Parents: 7dbd934
Author: selvaganesang
Authored: Wed Dec 5 06:10:56 2018 +
Committer: selvaganesang
Committed: Wed Dec 5 06:10:56 2018 +
--
core/sql/executor/hiveHook.cpp | 3 ---
core/sql/src/main/java/org/trafodion/sql/HiveClient.java | 3 +++
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/d8388f80/core/sql/executor/hiveHook.cpp
--
diff --git a/core/sql/executor/hiveHook.cpp b/core/sql/executor/hiveHook.cpp
index 234249a..ebc7cc0 100644
--- a/core/sql/executor/hiveHook.cpp
+++ b/core/sql/executor/hiveHook.cpp
@@ -380,9 +380,6 @@ NABoolean HiveMetaData::validate(hive_tbl_desc *hDesc)
if ((retCode == HVC_DONE) || (currentRedefTime != hDesc->redeftime()))
return FALSE;
- // object has been validated a short time ago
- hDesc->setRedeftime(currentRedefTime);
-
return TRUE;
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/d8388f80/core/sql/src/main/java/org/trafodion/sql/HiveClient.java
--
diff --git a/core/sql/src/main/java/org/trafodion/sql/HiveClient.java
b/core/sql/src/main/java/org/trafodion/sql/HiveClient.java
index 67a4142..846df71 100644
--- a/core/sql/src/main/java/org/trafodion/sql/HiveClient.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HiveClient.java
@@ -173,6 +173,9 @@ public class HiveClient {
if (rfTime != null)
redefTime = Long.parseLong(rfTime);
}
+// createTime is in seconds
+// Assuming DDL_TIME is also in seconds
+redefTime *= 1000;
// Get the lastest partition/file timestamp
int numPartKeys = table.getPartitionKeysSize();
String rootDir = table.getSd().getLocation();
[5/8] trafodion git commit: [TRAFODION-3234] Refactor hive meta calls to be less resource intensive to support hive partitions if needed
[TRAFODION-3234] Refactor hive meta calls to be less resource intensive to
support hive partitions if needed
Fixes for hive/TEST005 failure.
This also made some of the earlier failed test cases in this test suite to
return correct results.
Data modification check was unnecessarily done in the scan operator. This has
been removed.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/7be2672d
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/7be2672d
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/7be2672d
Branch: refs/heads/master
Commit: 7be2672d6fcad8e48d7508ff8a04b51bbde48441
Parents: 7633327
Author: selvaganesang
Authored: Tue Dec 4 15:09:25 2018 +
Committer: selvaganesang
Committed: Tue Dec 4 15:09:25 2018 +
--
core/sql/executor/ExHdfsScan.cpp | 99 +++--
core/sql/executor/hiveHook.cpp| 10 ++-
core/sql/optimizer/HDFSHook.cpp | 67 +++--
core/sql/regress/hive/EXPECTED005 | 128 +++--
core/sql/regress/hive/TEST005 | 4 --
5 files changed, 98 insertions(+), 210 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/7be2672d/core/sql/executor/ExHdfsScan.cpp
--
diff --git a/core/sql/executor/ExHdfsScan.cpp b/core/sql/executor/ExHdfsScan.cpp
index c49a6a0..c4318d6 100644
--- a/core/sql/executor/ExHdfsScan.cpp
+++ b/core/sql/executor/ExHdfsScan.cpp
@@ -446,11 +446,12 @@ ExWorkProcRetcode ExHdfsScanTcb::work()
step_ = ASSIGN_RANGES_AT_RUNTIME;
break;
}
- else if (getHdfsFileInfoListAsArray().isEmpty())
- {
-step_ = CHECK_FOR_DATA_MOD_AND_DONE;
- break;
- }
+ else {
+ if (useLibhdfsScan_)
+ step_ = INIT_HDFS_CURSOR;
+ else
+ step_ = SETUP_HDFS_SCAN;
+ }
beginRangeNum_ =
*(Lng32*)hdfsScanTdb().getHdfsFileRangeBeginList()->get(myInstNum_);
@@ -459,11 +460,8 @@ ExWorkProcRetcode ExHdfsScanTcb::work()
*(Lng32*)hdfsScanTdb().getHdfsFileRangeNumList()->get(myInstNum_);
currRangeNum_ = beginRangeNum_;
-
- if (numRanges_ > 0)
- step_ = CHECK_FOR_DATA_MOD;
-else
- step_ = CHECK_FOR_DATA_MOD_AND_DONE;
+if (numRanges_ <= 0)
+ step_ = DONE;
}
break;
@@ -479,85 +477,6 @@ ExWorkProcRetcode ExHdfsScanTcb::work()
else
step_ = DONE;
break;
-
-case CHECK_FOR_DATA_MOD:
-case CHECK_FOR_DATA_MOD_AND_DONE:
- {
-char * dirPath = hdfsScanTdb().hdfsRootDir_;
-Int64 modTS = hdfsScanTdb().modTSforDir_;
-if ((dirPath == NULL) || (modTS == -1))
- dataModCheckDone_ = TRUE;
-
-if (NOT dataModCheckDone_)
- {
-dataModCheckDone_ = TRUE;
-
-Lng32 numOfPartLevels = hdfsScanTdb().numOfPartCols_;
-
-if (hdfsScanTdb().hdfsDirsToCheck())
- {
-// TBD
- }
-
-Int64 failedModTS = -1;
-Lng32 failedLocBufLen = 1000;
-char failedLocBuf[failedLocBufLen];
-retcode = ExpLOBinterfaceDataModCheck
- (lobGlob_,
- dirPath,
- hdfsScanTdb().hostName_,
- hdfsScanTdb().port_,
- modTS,
- numOfPartLevels,
- failedModTS,
- failedLocBuf, failedLocBufLen);
-
-if (retcode < 0)
- {
-Lng32 cliError = 0;
-
-Lng32 intParam1 = -retcode;
-ComDiagsArea * diagsArea = NULL;
-ExRaiseSqlError(getHeap(), ,
-
(ExeErrorCode)(EXE_ERROR_FROM_LOB_INTERFACE),
-NULL, ,
-,
-NULL,
-"HDFS",
-(char*)"ExpLOBInterfaceDataModCheck",
-getLobErrStr(intParam1));
-pentry_down->setDiagsArea(diagsArea);
-step_ = HANDLE_ERROR_AND_DONE;
-break;
- }
-
-if (retcode == 1) // check failed
- {
-char errStr[200];
-str_sprintf(errStr, "genModTS = %ld,
[1/8] trafodion git commit: [TRAFODION-3234] Add support for hive partitioned tables
Repository: trafodion
Updated Branches:
refs/heads/master c21519bde -> d7aada4c9
http://git-wip-us.apache.org/repos/asf/trafodion/blob/923ca573/core/sql/optimizer/hiveHook.h
--
diff --git a/core/sql/optimizer/hiveHook.h b/core/sql/optimizer/hiveHook.h
index 0376e8a..9bcc7f9 100644
--- a/core/sql/optimizer/hiveHook.h
+++ b/core/sql/optimizer/hiveHook.h
@@ -52,17 +52,18 @@ struct hiveMetastoreStruct
struct hive_column_desc
{
+ NAHeap *heap_;
Int32 columnID_;
char* name_;
char* type_;
Int32 intIndex_;
struct hive_column_desc* next_;
- hive_column_desc(Int32 cdID, const char* name, const char* type, Int32
index)
- : columnID_(cdID), intIndex_(index), next_(0)
+ hive_column_desc(NAHeap *heap, Int32 cdID, const char* name, const char*
type, Int32 index)
+ : heap_(heap), columnID_(cdID), intIndex_(index), next_(0)
{
- name_ = strduph(name, CmpCommon::contextHeap());
- type_ = strduph(type, CmpCommon::contextHeap());
+ name_ = strduph(name, heap_);
+ type_ = strduph(type, heap_);
}
~hive_column_desc();
@@ -70,17 +71,18 @@ struct hive_column_desc
struct hive_pkey_desc
{
+ NAHeap *heap_;
char* name_;
char* type_;
Int32 idx_;
struct hive_pkey_desc* next_;
- hive_pkey_desc(const char* name, const char* type, Int32 idx) :
-idx_(idx), next_(0)
+ hive_pkey_desc(NAHeap *heap, const char* name, const char* type, Int32 idx)
:
+heap_(heap), idx_(idx), next_(0)
{
- name_ = strduph(name, CmpCommon::contextHeap());
- type_ = strduph(type, CmpCommon::contextHeap());
+ name_ = strduph(name, heap_);
+ type_ = strduph(type, heap_);
}
~hive_pkey_desc();
@@ -89,16 +91,17 @@ struct hive_pkey_desc
struct hive_skey_desc
{
+ NAHeap *heap_;
char* name_;
Int32 idx_;
Int32 orderInt_;
struct hive_skey_desc* next_;
- hive_skey_desc(const char* name, Int32 idx, Int32 order) :
-idx_(idx), next_(NULL), orderInt_(order)
+ hive_skey_desc(NAHeap *heap, const char* name, Int32 idx, Int32 order) :
+heap_(heap), idx_(idx), next_(NULL), orderInt_(order)
{
- name_ = strduph(name, CmpCommon::contextHeap());
+ name_ = strduph(name, heap_);
}
~hive_skey_desc();
@@ -107,15 +110,16 @@ struct hive_skey_desc
struct hive_bkey_desc
{
+ NAHeap *heap_;
char* name_;
Int32 idx_;
struct hive_bkey_desc* next_;
- hive_bkey_desc(const char* name, Int32 idx) :
-idx_(idx), next_(NULL)
+ hive_bkey_desc(NAHeap *heap, const char* name, Int32 idx) :
+heap_(heap), idx_(idx), next_(NULL)
{
- name_ = strduph(name, CmpCommon::contextHeap());
+ name_ = strduph(name, heap_);
}
~hive_bkey_desc();
@@ -123,6 +127,7 @@ struct hive_bkey_desc
struct hive_sd_desc
{
+ NAHeap *heap_;
enum sd_desc_kind { TABLE_SD = 'T', PARTN_SD = 'P' };
Int32 sdID_;
char* location_;
@@ -140,10 +145,11 @@ struct hive_sd_desc
char* nullFormat_;
NABoolean isCompressed_;
+ const char *partitionColValues_;
struct hive_sd_desc* next_;
- hive_sd_desc(Int32 sdID, const char* loc, Int64 creationTS, Int32 buckets,
+ hive_sd_desc(NAHeap *heap, Int32 sdID, const char* loc, Int64 creationTS,
Int32 buckets,
const char* ift, const char* of,
const char* nf,
char knd,
@@ -151,20 +157,30 @@ struct hive_sd_desc
struct hive_skey_desc* skey,
struct hive_bkey_desc* bkey,
char fieldTerminator, char recordTerminator,
-const NABoolean isCompressed
+const NABoolean isCompressed,
+const char *pColVals
)
-: sdID_(sdID), buckets_(buckets), kind_(knd), column_(column),
- skey_(skey), bkey_(bkey),
- fieldTerminator_(fieldTerminator),
- recordTerminator_(recordTerminator),
- isCompressed_(isCompressed),
- next_(NULL)
- {
-location_ = strduph(loc, CmpCommon::contextHeap());
-inputFormat_ = strduph(ift, CmpCommon::contextHeap());
-outputFormat_= strduph(of, CmpCommon::contextHeap());
-nullFormat_ = (nf ? strduph(nf, CmpCommon::contextHeap()) : NULL);
- }
+
+: heap_(heap), sdID_(sdID), creationTS_(creationTS),
+ buckets_(buckets), kind_(knd), column_(column),
+ skey_(skey), bkey_(bkey),
+ fieldTerminator_(fieldTerminator),
+ recordTerminator_(recordTerminator),
+ isCompressed_(isCompressed),
+ next_(NULL)
+ {
+ if (loc != NULL)
+location_ = strduph(loc, heap_);
+ else
+location_ = NULL;
+ inputFormat_ = strduph(ift, heap_);
+ outputFormat_= strduph(of, heap_);
+ nullFormat_ = (nf ? strduph(nf, heap_) : NULL);
+ if (pColVals)
+ partitionColValues_ = strduph(pColVals, heap_);
+ else
+ partitionColValues_ = NULL;
[6/8] trafodion git commit: [TRAFODION-3234] Refactor hive meta calls to be less resource intensive to support hive partitions if needed
[TRAFODION-3234] Refactor hive meta calls to be less resource intensive to
support hive partitions if needed
Removed some more unneeded data modification timestamp check code
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/7dbd9340
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/7dbd9340
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/7dbd9340
Branch: refs/heads/master
Commit: 7dbd9340cff33ce94a44c72db6547b924b45eba7
Parents: 7be2672
Author: selvaganesang
Authored: Tue Dec 4 21:50:19 2018 +
Committer: selvaganesang
Committed: Tue Dec 4 21:50:19 2018 +
--
core/sql/executor/ExFastTransport.cpp | 69 +-
core/sql/optimizer/HDFSHook.cpp | 7 +--
2 files changed, 5 insertions(+), 71 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/7dbd9340/core/sql/executor/ExFastTransport.cpp
--
diff --git a/core/sql/executor/ExFastTransport.cpp
b/core/sql/executor/ExFastTransport.cpp
index a2eaa94..3b97970 100644
--- a/core/sql/executor/ExFastTransport.cpp
+++ b/core/sql/executor/ExFastTransport.cpp
@@ -647,76 +647,9 @@ ExWorkProcRetcode ExHdfsFastExtractTcb::work()
{
case EXTRACT_NOT_STARTED:
{
- pstate.step_= EXTRACT_CHECK_MOD_TS;
+ pstate.step_ = EXTRACT_INITIALIZE;
}
break;
-
-case EXTRACT_CHECK_MOD_TS:
-{
- // if no tgt file or input timestamp is -1, skip data mod check.
- // Also, if this insert is being done with overwrite, then data mod
- // check has already been done during directory cleanup. Skip it here.
- if ((! myTdb().getTargetFile()) ||
- (myTdb().getModTSforDir() == -1) ||
- (myTdb().getOverwriteHiveTable()))
-{
- pstate.step_ = EXTRACT_INITIALIZE;
- break;
-}
-
- numBuffers_ = 0;
-
- memset (hdfsHost_, '\0', sizeof(hdfsHost_));
- strncpy(hdfsHost_, myTdb().getHdfsHostName(), sizeof(hdfsHost_));
- hdfsPort_ = myTdb().getHdfsPortNum();
- memset (fileName_, '\0', sizeof(fileName_));
- memset (targetLocation_, '\0', sizeof(targetLocation_));
- snprintf(targetLocation_,999, "%s", myTdb().getTargetName());
-
- Int64 failedModTS = -1;
- Lng32 failedLocBufLen = 1000;
- char failedLocBuf[failedLocBufLen];
- retcode =
-lobInterfaceDataModCheck(failedModTS, failedLocBuf, failedLocBufLen);
- if (retcode < 0)
- {
-Lng32 cliError = 0;
-
-Lng32 intParam1 = -retcode;
-ComDiagsArea * diagsArea = NULL;
-ExRaiseSqlError(getHeap(), ,
-(ExeErrorCode)(EXE_ERROR_FROM_LOB_INTERFACE),
-NULL, ,
-,
-NULL,
-"HDFS",
-(char*)"ExpLOBInterfaceDataModCheck",
-getLobErrStr(intParam1));
-pentry_down->setDiagsArea(diagsArea);
-pstate.step_ = EXTRACT_ERROR;
-break;
- }
-
- if (retcode == 1) // check failed
- {
-char errStr[200];
-str_sprintf(errStr, "genModTS = %ld, failedModTS = %ld",
-myTdb().getModTSforDir(), failedModTS);
-
-ComDiagsArea * diagsArea = NULL;
-ExRaiseSqlError(getHeap(), ,
-(ExeErrorCode)(EXE_HIVE_DATA_MOD_CHECK_ERROR), NULL,
-NULL, NULL, NULL,
-errStr);
-pentry_down->setDiagsArea(diagsArea);
-pstate.step_ = EXTRACT_ERROR;
-break;
- }
-
- pstate.step_= EXTRACT_INITIALIZE;
-}
-break;
-
case EXTRACT_INITIALIZE:
{
pstate.processingStarted_ = FALSE;
http://git-wip-us.apache.org/repos/asf/trafodion/blob/7dbd9340/core/sql/optimizer/HDFSHook.cpp
--
diff --git a/core/sql/optimizer/HDFSHook.cpp b/core/sql/optimizer/HDFSHook.cpp
index cc2bab5..786b8a1 100644
--- a/core/sql/optimizer/HDFSHook.cpp
+++ b/core/sql/optimizer/HDFSHook.cpp
@@ -903,10 +903,11 @@ NABoolean HHDFSTableStats::validateAndRefresh(Int64
expirationJTimestamp, NABool
diags_.reset();
- // check only once within a specified time interval
- if (expirationJTimestamp == -1 ||
+ // check if the stats needs to be fetched within a specified time interval
+ // when not requested to refresh
+ if (! refresh && (expirationJTimestamp == -1 ||
(expirationJTimestamp > 0 &&
- validationJTimestamp_ < expirationJTimestamp))
+ validationJTimestamp_ < expirationJTimestamp)))
return result; // consider the stats still valid
// if partitions get added or deleted, that
[8/8] trafodion git commit: Merge PR 1746 [TRAFODION-3234] Refactor hive meta calls to be less resource intensive to support hive partitions if needed
Merge PR 1746 [TRAFODION-3234] Refactor hive meta calls to be less resource intensive to support hive partitions if needed Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/d7aada4c Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/d7aada4c Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/d7aada4c Branch: refs/heads/master Commit: d7aada4c98b558077fc5d3ca80aac31099e78c30 Parents: c21519b d8388f8 Author: selvaganesang Authored: Wed Dec 5 21:53:15 2018 + Committer: selvaganesang Committed: Wed Dec 5 21:53:15 2018 + -- core/sql/common/ComSmallDefs.h | 15 + core/sql/executor/ExExeUtilGet.cpp | 9 +- core/sql/executor/ExFastTransport.cpp | 69 +- core/sql/executor/ExHdfsScan.cpp| 99 +- core/sql/executor/HiveClient_JNI.cpp| 900 --- core/sql/executor/HiveClient_JNI.h | 59 +- core/sql/executor/hiveHook.cpp | 666 +++--- .../sql/executor/org_trafodion_sql_HiveClient.h | 61 ++ core/sql/optimizer/HDFSHook.cpp | 74 +- core/sql/optimizer/NATable.cpp | 26 +- core/sql/optimizer/hiveHook.h | 137 ++- core/sql/regress/hive/EXPECTED003 | 46 +- core/sql/regress/hive/EXPECTED005 | 148 ++- core/sql/regress/hive/TEST005 | 4 - core/sql/sqlcomp/CmpDescribe.cpp| 125 ++- core/sql/sqlcomp/DefaultConstants.h | 4 + core/sql/sqlcomp/nadefaults.cpp | 1 + .../main/java/org/trafodion/sql/HiveClient.java | 252 +- core/sql/ustat/hs_la.cpp| 10 +- 19 files changed, 1608 insertions(+), 1097 deletions(-) --
[3/8] trafodion git commit: [TRAFODION-3234] Refactor hive meta calls to be less resource intensive to support hive partitions if needed
[TRAFODION-3234] Refactor hive meta calls to be less resource intensive to
support hive partitions if needed
There was yet another method that called HiveMetaStoreClient.listPartitions
API. This method is
called whenever the hive table entry is picked from the NATable cache.
Replaced listParitions call with Trafodion specific
HDFSClient.getHiveTableModificationTS call
that is less expensive.
HiveMetaStoreClient is now made as ThreadLocal variable to ensure that
HiveMetaStoreClient methods
can be invoked in a thread safe manner.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/bfd7a8f6
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/bfd7a8f6
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/bfd7a8f6
Branch: refs/heads/master
Commit: bfd7a8f6210bf27ed8c0b1ecd209971abf47f31b
Parents: 923ca57
Author: selvaganesang
Authored: Mon Nov 26 23:50:13 2018 +
Committer: selvaganesang
Committed: Fri Nov 30 00:20:22 2018 +
--
core/sql/executor/ExExeUtilGet.cpp | 2 +-
core/sql/executor/hiveHook.cpp | 41 +
core/sql/optimizer/NATable.cpp | 12 ++--
core/sql/optimizer/hiveHook.h | 10 ++--
core/sql/sqlcomp/CmpDescribe.cpp| 2 +-
.../main/java/org/trafodion/sql/HiveClient.java | 61 +++-
core/sql/ustat/hs_la.cpp| 2 +-
7 files changed, 74 insertions(+), 56 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bfd7a8f6/core/sql/executor/ExExeUtilGet.cpp
--
diff --git a/core/sql/executor/ExExeUtilGet.cpp
b/core/sql/executor/ExExeUtilGet.cpp
index 080072e..09a199a 100644
--- a/core/sql/executor/ExExeUtilGet.cpp
+++ b/core/sql/executor/ExExeUtilGet.cpp
@@ -6217,7 +6217,7 @@ short ExExeUtilHiveMDaccessTcb::work()
while (i < tblNames_.entries())
{
hiveMD_->getTableDesc(schForHive_, tblNames_[i]->c_str(),
- 0, FALSE, FALSE, FALSE /*dont read partn info*/);
+ FALSE, FALSE, FALSE /*dont read partn info*/);
i++;
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/bfd7a8f6/core/sql/executor/hiveHook.cpp
--
diff --git a/core/sql/executor/hiveHook.cpp b/core/sql/executor/hiveHook.cpp
index 5922599..284ba5c 100644
--- a/core/sql/executor/hiveHook.cpp
+++ b/core/sql/executor/hiveHook.cpp
@@ -299,7 +299,6 @@ struct hive_tbl_desc* HiveMetaData::getFakedTableDesc(const
char* tblName)
struct hive_tbl_desc* HiveMetaData::getTableDesc( const char* schemaName,
const char* tblName,
- Int64 expirationTS,
NABoolean validateOnly,
NABoolean rereadFromMD,
NABoolean readPartnInfo)
@@ -310,8 +309,8 @@ struct hive_tbl_desc* HiveMetaData::getTableDesc( const
char* schemaName,
if ( !(strcmp(ptr->tblName_, tblName)
||strcmp(ptr->schName_, schemaName))) {
-if (validate(ptr->tblID_, ptr->redeftime(), schemaName, tblName))
- return ptr;
+if ((NOT rereadFromMD) && (validate(ptr)))
+ return ptr;
else {
// table changed, delete it and re-read below
if (tbl_ == ptr)
@@ -367,25 +366,21 @@ struct hive_tbl_desc* HiveMetaData::getTableDesc( const
char* schemaName,
return hiveTableDesc;
}
-NABoolean HiveMetaData::validate(Int32 tableId, Int64 redefTS,
- const char* schName, const char* tblName)
+NABoolean HiveMetaData::validate(hive_tbl_desc *hDesc)
{
- NABoolean result = FALSE;
-
- // validate creation timestamp
-
Int64 currentRedefTime = 0;
- HVC_RetCode retCode = HiveClient_JNI::getRedefTime(schName, tblName,
+ HVC_RetCode retCode = HiveClient_JNI::getRedefTime(hDesc->schName_,
hDesc->tblName_,
currentRedefTime);
if ((retCode != HVC_OK) && (retCode != HVC_DONE)) {
return recordError((Int32)retCode, "HiveClient_JNI::getRedefTime()");
}
- if ((retCode == HVC_DONE) || (currentRedefTime != redefTS))
- return result;
- else
- return TRUE;
-
- return result;
+ if ((retCode == HVC_DONE) || (currentRedefTime != hDesc->redeftime()))
+ return FALSE;
+
+ // object has been validated a short time ago
+ hDesc->setRedeftime(currentRedefTime);
+
+ return TRUE;
}
hive_tbl_desc::hive_tbl_desc(NAHeap *heap, Int32 tblID, const char*
[4/8] trafodion git commit: [TRAFODION-3234] Refactor hive meta calls to be less resource intensive to support hive partitions if needed
[TRAFODION-3234] Refactor hive meta calls to be less resource intensive to
support hive partitions if needed
Possible fix for check-PR failures.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/7633327b
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/7633327b
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/7633327b
Branch: refs/heads/master
Commit: 7633327b43cc51d49c622e9854384bd553e435ab
Parents: bfd7a8f
Author: selvaganesang
Authored: Fri Nov 30 23:50:10 2018 +
Committer: selvaganesang
Committed: Fri Nov 30 23:50:10 2018 +
--
core/sql/executor/HiveClient_JNI.cpp| 34 +++-
core/sql/sqlcomp/CmpDescribe.cpp| 5 ++-
.../main/java/org/trafodion/sql/HiveClient.java | 1 -
3 files changed, 20 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/7633327b/core/sql/executor/HiveClient_JNI.cpp
--
diff --git a/core/sql/executor/HiveClient_JNI.cpp
b/core/sql/executor/HiveClient_JNI.cpp
index 26dfc87..1c67320 100644
--- a/core/sql/executor/HiveClient_JNI.cpp
+++ b/core/sql/executor/HiveClient_JNI.cpp
@@ -40,6 +40,7 @@ pthread_mutex_t HiveClient_JNI::javaMethodsInitMutex_ =
PTHREAD_MUTEX_INITIALIZE
static const char* const hvcErrorEnumStr[] =
{
"Preparing parameters for HiveClient."
+ ,"Java exception in init()."
,"Java exception in close()."
,"Preparing parameters for exists()."
,"Java exception in exists()."
@@ -53,6 +54,7 @@ static const char* const hvcErrorEnumStr[] =
,"Preparing parameters for getHiveTableInfo()."
,"Java exception in getHiveTableInfo()."
,"Error in getHiveTableInfoDetails()."
+ ,"Error during populdate SDs."
};
@@ -130,7 +132,7 @@ void HiveClient_JNI::deleteInstance()
HiveClient_JNI::~HiveClient_JNI()
{
cleanupTableInfo();
- if (isInitialized())
+ if (isConnected_)
close(); // error handling
}
@@ -189,7 +191,7 @@ HVC_RetCode HiveClient_JNI::init()
//
HVC_RetCode HiveClient_JNI::initConnection()
{
- QRLogger::log(CAT_SQL_HBASE, LL_DEBUG, "HiveClient_JNI::initConnection(%s)
called.");
+ QRLogger::log(CAT_SQL_HDFS, LL_DEBUG, "HiveClient_JNI::initConnection(%s)
called.");
if (initJNIEnv() != JOI_OK)
@@ -209,7 +211,7 @@ HVC_RetCode HiveClient_JNI::initConnection()
if (jresult == false)
{
-logError(CAT_SQL_HBASE, "HiveClient_JNI::initConnection()",
getLastError());
+logError(CAT_SQL_HDFS, "HiveClient_JNI::initConnection()", getLastError());
jenv_->PopLocalFrame(NULL);
return HVC_ERROR_INIT_EXCEPTION;
}
@@ -225,7 +227,7 @@ HVC_RetCode HiveClient_JNI::initConnection()
//
HVC_RetCode HiveClient_JNI::exists(const char* schName, const char* tabName)
{
- QRLogger::log(CAT_SQL_HBASE, LL_DEBUG, "HiveClient_JNI::exists(%s, %s)
called.", schName, tabName);
+ QRLogger::log(CAT_SQL_HDFS, LL_DEBUG, "HiveClient_JNI::exists(%s, %s)
called.", schName, tabName);
if (initJNIEnv() != JOI_OK)
return HVC_ERROR_INIT_PARAM;
if (getInstance() == NULL)
@@ -272,7 +274,7 @@ HVC_RetCode HiveClient_JNI::getRedefTime(const char*
schName,
const char* tabName,
Int64& redefTime)
{
- QRLogger::log(CAT_SQL_HBASE, LL_DEBUG, "Enter
HiveClient_JNI::getRedefTime(%s, %s, %lld).", schName, tabName, redefTime);
+ QRLogger::log(CAT_SQL_HDFS, LL_DEBUG, "Enter
HiveClient_JNI::getRedefTime(%s, %s, %lld).", schName, tabName, redefTime);
if (initJNIEnv() != JOI_OK)
return HVC_ERROR_INIT_PARAM;
if (getInstance() == NULL)
@@ -306,7 +308,7 @@ HVC_RetCode HiveClient_JNI::getRedefTime(const char*
schName,
return HVC_ERROR_GET_REDEFTIME_EXCEPTION;
}
- QRLogger::log(CAT_SQL_HBASE, LL_DEBUG, "Exit
HiveClient_JNI::getRedefTime(%s, %s, %lld).", schName, tabName, redefTime);
+ QRLogger::log(CAT_SQL_HDFS, LL_DEBUG, "Exit HiveClient_JNI::getRedefTime(%s,
%s, %lld).", schName, tabName, redefTime);
if (jresult < 0) {
jenv_->PopLocalFrame(NULL);
@@ -324,7 +326,7 @@ HVC_RetCode HiveClient_JNI::getRedefTime(const char*
schName,
//
HVC_RetCode HiveClient_JNI::getAllSchemas(NAHeap *heap, LIST(Text *)& schNames)
{
- QRLogger::log(CAT_SQL_HBASE, LL_DEBUG, "Enter
HiveClient_JNI::getAllSchemas(%p) called.", (void *) );
+ QRLogger::log(CAT_SQL_HDFS, LL_DEBUG, "Enter
HiveClient_JNI::getAllSchemas(%p) called.", (void *) );
if (initJNIEnv() != JOI_OK)
return HVC_ERROR_INIT_PARAM;
if
[2/8] trafodion git commit: [TRAFODION-3234] Add support for hive partitioned tables
[TRAFODION-3234] Add support for hive partitioned tables
Refactored the interaction with hive metastore to use the efficient APIs to
obtain the necessary
information to construct the hive table descriptors. This refactoring is
expected to reduce the
memory requirements, efficient and high performing even when there are
thousands of partitions.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/923ca573
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/923ca573
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/923ca573
Branch: refs/heads/master
Commit: 923ca5738a24ab2fc60f6afda69eef6ad9a480cb
Parents: 571611a
Author: selvaganesang
Authored: Tue Nov 13 16:42:37 2018 +
Committer: selvaganesang
Committed: Thu Nov 15 01:49:01 2018 +
--
core/sql/common/ComSmallDefs.h | 15 +
core/sql/executor/ExExeUtilGet.cpp | 9 +-
core/sql/executor/HiveClient_JNI.cpp| 876 ---
core/sql/executor/HiveClient_JNI.h | 59 +-
core/sql/executor/hiveHook.cpp | 626 +++--
.../sql/executor/org_trafodion_sql_HiveClient.h | 61 ++
core/sql/optimizer/NATable.cpp | 16 +-
core/sql/optimizer/hiveHook.h | 133 ++-
core/sql/regress/hive/EXPECTED003 | 46 +-
core/sql/regress/hive/EXPECTED005 | 126 +--
core/sql/sqlcomp/CmpDescribe.cpp| 126 ++-
core/sql/sqlcomp/DefaultConstants.h | 4 +
core/sql/sqlcomp/nadefaults.cpp | 1 +
.../main/java/org/trafodion/sql/HiveClient.java | 199 -
core/sql/ustat/hs_la.cpp| 10 +-
15 files changed, 1489 insertions(+), 818 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/923ca573/core/sql/common/ComSmallDefs.h
--
diff --git a/core/sql/common/ComSmallDefs.h b/core/sql/common/ComSmallDefs.h
index c18662d..b288e82 100644
--- a/core/sql/common/ComSmallDefs.h
+++ b/core/sql/common/ComSmallDefs.h
@@ -1957,6 +1957,21 @@ enum ComAuthenticationType{
#define COM_DBS_YES_LIT"Y"
#define COM_DBS_NO_LIT "N"
+// values used during ORC file writes if not specified as part
+// of table creation.
+#define ORC_DEFAULT_STRIPE_SIZE 67108864
+#define ORC_DEFAULT_ROW_INDEX_STRIDE1
+#define ORC_DEFAULT_COMPRESSION "ZLIB"
+#define ORC_DEFAULT_BLOOM_FILTER_FPP0.05
+
+// values used during Parquet file writes if not specified as part
+// of table creation.
+#define PARQUET_DEFAULT_BLOCK_SIZE 134217728
+#define PARQUET_DEFAULT_PAGE_SIZE 1048576
+#define PARQUET_DEFAULT_COMPRESSION "UNCOMPRESSED"
+#define PARQUET_DEFAULT_DICTIONARY_PAGE_SIZE 1048576
+
+
// used with removeNATable for QI support
enum ComQiScope
{
http://git-wip-us.apache.org/repos/asf/trafodion/blob/923ca573/core/sql/executor/ExExeUtilGet.cpp
--
diff --git a/core/sql/executor/ExExeUtilGet.cpp
b/core/sql/executor/ExExeUtilGet.cpp
index 86e6a7b..080072e 100644
--- a/core/sql/executor/ExExeUtilGet.cpp
+++ b/core/sql/executor/ExExeUtilGet.cpp
@@ -6097,7 +6097,7 @@ short ExExeUtilHiveMDaccessTcb::work()
if (hiveMD_)
NADELETEBASIC(hiveMD_, getHeap());
-hiveMD_ = new (getHeap()) HiveMetaData();
+hiveMD_ = new (getHeap()) HiveMetaData((NAHeap *)getHeap());
if (hiveMDtdb().getCatalog())
strcpy(hiveCat_, hiveMDtdb().getCatalog());
@@ -6216,7 +6216,8 @@ short ExExeUtilHiveMDaccessTcb::work()
int i = 0;
while (i < tblNames_.entries())
{
-hiveMD_->getTableDesc(schForHive_, tblNames_[i]->c_str());
+hiveMD_->getTableDesc(schForHive_, tblNames_[i]->c_str(),
+ 0, FALSE, FALSE, FALSE /*dont read partn info*/);
i++;
}
@@ -6341,8 +6342,8 @@ short ExExeUtilHiveMDaccessTcb::work()
memset(s->nullFormat, ' ', 8);
if (htd->getSDs()->nullFormat_)
str_cpy(s->nullFormat, htd->getSDs()->nullFormat_, 8, ' ');
-
-str_cpy(s->location, htd->getSDs()->location_, 1024, ' ');
+if (htd->getSDs()->location_ != NULL)
+ str_cpy(s->location, htd->getSDs()->location_, 1024, ' ');
str_cpy(s->hiveTableType, htd->tableType_, 128, ' ');
http://git-wip-us.apache.org/repos/asf/trafodion/blob/923ca573/core/sql/executor/HiveClient_JNI.cpp
--
diff --git a/core/sql/executor/HiveClient_JNI.cpp
b/core/sql/executor/HiveClient_JNI.cpp
index
[2/2] trafodion git commit: Merge PR 1735 [TRAFODION-3225] Obscure cores seen in RMS and logger related code when Trafodion is stressed
Merge PR 1735 [TRAFODION-3225] Obscure cores seen in RMS and logger related code when Trafodion is stressed Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/d83b97ef Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/d83b97ef Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/d83b97ef Branch: refs/heads/master Commit: d83b97efe015245f427255fe11bcec6edc304d87 Parents: 06b6486 6a25d5c Author: selvaganesang Authored: Wed Oct 31 16:36:08 2018 + Committer: selvaganesang Committed: Wed Oct 31 16:36:08 2018 + -- core/sql/bin/SqlciMain.cpp| 1 + core/sql/cli/Globals.cpp | 6 +- core/sql/executor/ex_esp_frag_dir.cpp | 6 +- core/sql/qmscommon/QRLogger.cpp | 6 +- core/sql/qmscommon/QRLogger.h | 2 + core/sql/runtimestats/SqlStats.cpp| 113 +++-- core/sql/runtimestats/SqlStats.h | 4 +- core/sql/runtimestats/sscpipc.cpp | 4 +- 8 files changed, 99 insertions(+), 43 deletions(-) --
[1/2] trafodion git commit: [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation
Repository: trafodion
Updated Branches:
refs/heads/master 6dbea7e87 -> 1650c784e
[TRAFODION-3171] Refactor Hive sequence file reading to use the new
implementation
Fix for hive/TEST006 failure in daily build
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/02ad26b8
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/02ad26b8
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/02ad26b8
Branch: refs/heads/master
Commit: 02ad26b8e1384c156ac1d877b28b52d0af6b8931
Parents: a9bbe12
Author: selvaganesang
Authored: Mon Aug 27 18:23:14 2018 +
Committer: selvaganesang
Committed: Mon Aug 27 18:23:14 2018 +
--
core/sql/src/main/java/org/trafodion/sql/HDFSClient.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/02ad26b8/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
--
diff --git a/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
b/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
index 39e4c9a..4f06e7b 100644
--- a/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
@@ -264,6 +264,7 @@ public class HDFSClient
int sequenceFileRead(int readLenRemain) throws IOException
{
boolean eof = false;
+ boolean nextValue;
byte[] byteArray;
int readLen;
int totalReadLen = 0;
@@ -273,7 +274,11 @@ public class HDFSClient
while (!eof && lenRemain > 0) {
try {
tempPos = reader_.getPosition();
-eof = reader_.next(key_, value_);
+nextValue = reader_.next(key_, value_);
+if (!nextValue) {
+ eof = true;
+ break;
+}
}
catch (java.io.EOFException e)
{
[2/2] trafodion git commit: Merge PR 1706 [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation
Merge PR 1706 [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/1650c784 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/1650c784 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/1650c784 Branch: refs/heads/master Commit: 1650c784e81b94c06f2e3334c270bf6e02d65071 Parents: 6dbea7e 02ad26b Author: selvaganesang Authored: Mon Aug 27 22:06:35 2018 + Committer: selvaganesang Committed: Mon Aug 27 22:06:35 2018 + -- core/sql/src/main/java/org/trafodion/sql/HDFSClient.java | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) --
[2/2] trafodion git commit: Merge PR 1702 [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation
Merge PR 1702 [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/a9bbe12a Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/a9bbe12a Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/a9bbe12a Branch: refs/heads/master Commit: a9bbe12aa92f1c5c6e239eb68103e5d20b0e6abb Parents: 08e0ab0 75dfb43 Author: selvaganesang Authored: Sat Aug 25 02:37:08 2018 + Committer: selvaganesang Committed: Sat Aug 25 02:37:08 2018 + -- core/sql/src/main/java/org/trafodion/sql/HDFSClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/trafodion/blob/a9bbe12a/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java --
[1/2] trafodion git commit: [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation
Repository: trafodion
Updated Branches:
refs/heads/master 08e0ab09e -> a9bbe12aa
[TRAFODION-3171] Refactor Hive sequence file reading to use the new
implementation
Fix for the following exception seen while accessing hive sequence file with
the new implementation
*** ERROR[8447] An error occurred during hdfs access. Error Detail:
SETUP_HDFS_SCAN java.util.concurrent.ExecutionException:
java.nio.BufferOverflowException
java.util.concurrent.FutureTask.report(FutureTask.java:122)
java.util.concurrent.FutureTask.get(FutureTask.java:192)
org.trafodion.sql.HDFSClient.trafHdfsReadBuffer(HDFSClient.java:424)
org.trafodion.sql.HdfsScan.trafHdfsRead(HdfsScan.java:215) Caused by
java.nio.BufferOverflowException
java.nio.DirectByteBuffer.put(DirectByteBuffer.java:363)
org.trafodion.sql.HDFSClient.sequenceFileRead(HDFSClient.java:301)
org.trafodion.sql.HDFSClient$HDFSRead.call(HDFSClient.java:217)
java.util.concurrent.FutureTask.run(FutureTask.java:266)
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
java.lang.Thread.run(Thread.java:748) [2018-08-21 15:56:00]
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/75dfb43c
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/75dfb43c
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/75dfb43c
Branch: refs/heads/master
Commit: 75dfb43cccb9562e20a23cd1ec38250f31759e5a
Parents: 31cab90
Author: selvaganesang
Authored: Fri Aug 24 19:58:47 2018 +
Committer: selvaganesang
Committed: Fri Aug 24 19:58:47 2018 +
--
core/sql/src/main/java/org/trafodion/sql/HDFSClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/75dfb43c/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
--
diff --git a/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
b/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
index 6b7f051..81b9129 100644
--- a/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
@@ -286,7 +286,7 @@ public class HDFSClient
buf_.put(byteArray, 0, readLen);
buf_.put(recDelimiter_);
- lenRemain_ -= (readLen+1);
+ lenRemain -= (readLen+1);
totalReadLen += (readLen+1);
} else {
// Reset the position because the row can't be copied to buffer
[2/4] trafodion git commit: Merge branch 'master' of github.com:apache/trafodion into trafodion-3110
Merge branch 'master' of github.com:apache/trafodion into trafodion-3110 Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/39e8791b Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/39e8791b Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/39e8791b Branch: refs/heads/master Commit: 39e8791beee87ada7f672c7f234bd1da59dbbbfd Parents: ba00576 bd3facc Author: selvaganesang Authored: Wed Aug 22 18:25:31 2018 + Committer: selvaganesang Committed: Wed Aug 22 18:25:31 2018 + -- core/sqf/monitor/linux/cluster.cxx | 4 +- core/sqf/monitor/linux/redirector.cxx | 2 +- core/sqf/src/seabed/src/sockstream.cpp | 1 + core/sqf/src/seabed/src/stream.cpp | 2 + core/sql/executor/ExExeUtilCli.cpp | 67 +++ core/sql/executor/ex_tuple_flow.cpp | 4 + core/sql/generator/Generator.cpp| 6 +- core/sql/generator/Generator.h | 1 + core/sql/optimizer/BindRI.cpp | 49 ++-- core/sql/regress/hive/DIFF006.KNOWN | 114 +++ core/sql/regress/hive/TEST006 | 6 + core/sql/regress/tools/regress-filter-linux | 2 +- core/sql/sqlcat/TrafDDLdesc.h | 12 +- .../main/java/org/trafodion/sql/HDFSClient.java | 45 +--- .../_chapters/sql_language_elements.adoc| 109 -- 15 files changed, 332 insertions(+), 92 deletions(-) -- http://git-wip-us.apache.org/repos/asf/trafodion/blob/39e8791b/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java --
[4/4] trafodion git commit: Merge PR 1696 [TRAFODION-3110] Refactor LOB access to use the new implementation of HdfsClient
Merge PR 1696 [TRAFODION-3110] Refactor LOB access to use the new implementation of HdfsClient Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/08e0ab09 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/08e0ab09 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/08e0ab09 Branch: refs/heads/master Commit: 08e0ab09ef1963658637b21b65638a336c2d4bdf Parents: 31cab90 82ef6c1 Author: selvaganesang Authored: Thu Aug 23 22:21:53 2018 + Committer: selvaganesang Committed: Thu Aug 23 22:21:53 2018 + -- core/sql/executor/ExHbaseAccess.cpp | 2 +- core/sql/executor/ExHdfsScan.cpp| 2 +- core/sql/executor/HdfsClient_JNI.cpp| 56 - core/sql/executor/HdfsClient_JNI.h | 6 +- core/sql/exp/ExpLOBaccess.cpp | 113 ++- core/sql/optimizer/HDFSHook.cpp | 64 +-- core/sql/regress/executor/EXPECTED130 | 43 --- core/sql/regress/executor/TEST130 | 9 +- .../main/java/org/trafodion/sql/HDFSClient.java | 41 ++- 9 files changed, 243 insertions(+), 93 deletions(-) --
[3/4] trafodion git commit: [TRAFODION-3110] LOB: Extract lobtofile() to a hdfs file returns 8442 error
[TRAFODION-3110] LOB: Extract lobtofile() to a hdfs file returns 8442 error
Fixes as per the review comments for the commit
ba00576e1f47a9f0e0b3f344da8742aeecbc3ce
Also took care of truncate option.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/82ef6c1c
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/82ef6c1c
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/82ef6c1c
Branch: refs/heads/master
Commit: 82ef6c1c9487404b5a2e95993e30ee7fefd1fcdc
Parents: 39e8791
Author: selvaganesang
Authored: Thu Aug 23 17:49:03 2018 +
Committer: selvaganesang
Committed: Thu Aug 23 17:49:03 2018 +
--
core/sql/exp/ExpLOBaccess.cpp | 122 +
1 file changed, 69 insertions(+), 53 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/82ef6c1c/core/sql/exp/ExpLOBaccess.cpp
--
diff --git a/core/sql/exp/ExpLOBaccess.cpp b/core/sql/exp/ExpLOBaccess.cpp
index e3c086a..ab592f4 100644
--- a/core/sql/exp/ExpLOBaccess.cpp
+++ b/core/sql/exp/ExpLOBaccess.cpp
@@ -2462,7 +2462,7 @@ Ex_Lob_Error ExLob::readDataToHdfsFile(char *tgtFileName,
Int64 offset, Int64 s
writeOperLen = 0;
HdfsClient *tgtHdfsClient;
HDFS_Client_RetCode hdfsClientRetcode;
- NABoolean overwrite = TRUE;
+ NABoolean overwrite = FALSE;
NABoolean append = FALSE;
Int64 remainLen = size;
Int64 pos = offset;
@@ -2471,41 +2471,17 @@ Ex_Lob_Error ExLob::readDataToHdfsFile(char
*tgtFileName, Int64 offset, Int64 s
// open and write to the target file
int openFlags = O_WRONLY;
if (! useLibHdfs_) {
- if (((LobTgtFileFlags)fileflags == Lob_Error_Or_Create) ||
-((LobTgtFileFlags)fileflags == Lob_Truncate_Or_Error))
-overwrite = FALSE;
- if ((LobTgtFileFlags)fileflags == Lob_Append_Or_Error)
+ if (((LobTgtFileFlags)fileflags == Lob_Truncate_Or_Error) ||
+ ((LobTgtFileFlags)fileflags == Lob_Truncate_Or_Create))
+overwrite = TRUE;
+ if (((LobTgtFileFlags)fileflags == Lob_Append_Or_Error) ||
+((LobTgtFileFlags)fileflags == Lob_Append_Or_Create))
append = TRUE;
tgtHdfsClient = HdfsClient::newInstance(getLobGlobalHeap(), NULL,
hdfsClientRetcode);
ex_assert(hdfsClientRetcode == HDFS_CLIENT_OK, "Internal error:
HdfsClient::newInstance returned an error");
if (tgtHdfsClient->hdfsCreate(tgtFileName, overwrite, append, FALSE) !=
HDFS_CLIENT_OK)
return LOB_TARGET_FILE_OPEN_ERROR;
- Int32 bytesRead;
- Int32 bytesWritten;
- while (remainLen > 0)
- {
-if (remainLen > lobMaxChunkMemLen)
- readLen = lobMaxChunkMemLen;
-else
- readLen = remainLen;
-if (lobData == NULL)
- lobData = new (lobGlobalHeap_) char[readLen];
-bytesRead = hdfsClient_->hdfsRead(pos, lobData, readLen,
hdfsClientRetcode);
-if (hdfsClientRetcode == HDFS_CLIENT_OK)
-bytesWritten = tgtHdfsClient->hdfsWrite(lobData, bytesRead,
hdfsClientRetcode, lobMaxChunkMemLen);
-if (hdfsClientRetcode == HDFS_CLIENT_OK) {
- pos += bytesRead;
- remainLen -= bytesRead;
- writeOperLen += bytesWritten;
-} else {
-NADELETEBASIC(lobData, lobGlobalHeap_);
-HdfsClient::deleteInstance(tgtHdfsClient);
-return LOB_DATA_READ_ERROR;
-}
- }
- HdfsClient::deleteInstance(tgtHdfsClient);
- return LOB_OPER_OK;
- }
+ } else {
if ((LobTgtFileFlags)fileflags == Lob_Append_Or_Error )
openFlags |= O_APPEND;
//hdfsFile fdTgtFile = hdfsOpenFile(fs_,tgtFileName, openFlags, 0,0,0);
@@ -2537,13 +2513,42 @@ Ex_Lob_Error ExLob::readDataToHdfsFile(char
*tgtFileName, Int64 offset, Int64 s
return LOB_TARGET_FILE_OPEN_ERROR;
}
}
+ }
+ if (!multipleChunks) {
+ if (! useLibHdfs_) {
+ Int32 bytesRead;
+ Int32 bytesWritten;
+ while (remainLen > 0)
+ {
+if (remainLen > lobMaxChunkMemLen)
+ readLen = lobMaxChunkMemLen;
+else
+ readLen = remainLen;
+if (lobData == NULL)
+ lobData = new (lobGlobalHeap_) char[readLen];
+bytesRead = hdfsClient_->hdfsRead(pos, lobData, readLen,
hdfsClientRetcode);
+if (hdfsClientRetcode == HDFS_CLIENT_OK)
+bytesWritten = tgtHdfsClient->hdfsWrite(lobData, bytesRead,
hdfsClientRetcode, lobMaxChunkMemLen);
+if (hdfsClientRetcode == HDFS_CLIENT_OK) {
+ pos += bytesRead;
+ remainLen -= bytesRead;
+ writeOperLen += bytesWritten;
+} else {
+NADELETEBASIC(lobData, lobGlobalHeap_);
+HdfsClient::deleteInstance(tgtHdfsClient);
+return
[1/4] trafodion git commit: [TRAFODION-3110] Refactor LOB access to use the new implementation of HdfsClient
Repository: trafodion
Updated Branches:
refs/heads/master 31cab907a -> 08e0ab09e
[TRAFODION-3110] Refactor LOB access to use the new implementation of HdfsClient
LOB: Extract lobtofile() to a hdfs file returns 8442 error
Implemented the missing code to support this functionality via the new
implementation.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/ba00576e
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/ba00576e
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/ba00576e
Branch: refs/heads/master
Commit: ba00576e1f47a9f0e0b3f344da8742aeecbc3ce4
Parents: 5e8bfc7
Author: selvaganesang
Authored: Tue Aug 14 03:13:32 2018 +
Committer: selvaganesang
Committed: Tue Aug 14 18:17:01 2018 +
--
core/sql/executor/ExHbaseAccess.cpp | 2 +-
core/sql/executor/ExHdfsScan.cpp| 2 +-
core/sql/executor/HdfsClient_JNI.cpp| 56 -
core/sql/executor/HdfsClient_JNI.h | 6 +-
core/sql/exp/ExpLOBaccess.cpp | 53 ++--
core/sql/optimizer/HDFSHook.cpp | 64 +---
core/sql/regress/executor/EXPECTED130 | 43 -
core/sql/regress/executor/TEST130 | 9 ++-
.../main/java/org/trafodion/sql/HDFSClient.java | 41 +++--
9 files changed, 205 insertions(+), 71 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/ba00576e/core/sql/executor/ExHbaseAccess.cpp
--
diff --git a/core/sql/executor/ExHbaseAccess.cpp
b/core/sql/executor/ExHbaseAccess.cpp
index 13146a6..461c5dc 100644
--- a/core/sql/executor/ExHbaseAccess.cpp
+++ b/core/sql/executor/ExHbaseAccess.cpp
@@ -3266,7 +3266,7 @@ void ExHbaseAccessTcb::handleException(NAHeap *heap,
if (!loggingFileCreated_) {
logFileHdfsClient_ = HdfsClient::newInstance((NAHeap *)getHeap(), NULL,
hdfsClientRetcode);
if (hdfsClientRetcode == HDFS_CLIENT_OK)
-hdfsClientRetcode = logFileHdfsClient_->hdfsCreate(loggingFileName_,
TRUE, FALSE);
+hdfsClientRetcode = logFileHdfsClient_->hdfsCreate(loggingFileName_,
TRUE, FALSE, FALSE);
if (hdfsClientRetcode == HDFS_CLIENT_OK)
loggingFileCreated_ = TRUE;
else
http://git-wip-us.apache.org/repos/asf/trafodion/blob/ba00576e/core/sql/executor/ExHdfsScan.cpp
--
diff --git a/core/sql/executor/ExHdfsScan.cpp b/core/sql/executor/ExHdfsScan.cpp
index d4cf717..c49a6a0 100644
--- a/core/sql/executor/ExHdfsScan.cpp
+++ b/core/sql/executor/ExHdfsScan.cpp
@@ -2167,7 +2167,7 @@ void ExHdfsScanTcb::handleException(NAHeap *heap,
if (!loggingFileCreated_) {
logFileHdfsClient_ = HdfsClient::newInstance((NAHeap *)getHeap(), NULL,
hdfsClientRetcode);
if (hdfsClientRetcode == HDFS_CLIENT_OK)
-hdfsClientRetcode = logFileHdfsClient_->hdfsCreate(loggingFileName_,
TRUE, FALSE);
+hdfsClientRetcode = logFileHdfsClient_->hdfsCreate(loggingFileName_,
TRUE, FALSE, FALSE);
if (hdfsClientRetcode == HDFS_CLIENT_OK)
loggingFileCreated_ = TRUE;
else
http://git-wip-us.apache.org/repos/asf/trafodion/blob/ba00576e/core/sql/executor/HdfsClient_JNI.cpp
--
diff --git a/core/sql/executor/HdfsClient_JNI.cpp
b/core/sql/executor/HdfsClient_JNI.cpp
index 5ae2805..51bc30e 100644
--- a/core/sql/executor/HdfsClient_JNI.cpp
+++ b/core/sql/executor/HdfsClient_JNI.cpp
@@ -349,6 +349,8 @@ static const char* const hdfsClientErrorEnumStr[] =
,"Java exception in HdfsClient::hdfsExists()."
,"JNI NewStringUTF() in HdfsClient::hdfsDeletePath()."
,"Java exception in HdfsClient::hdfsDeletePath()."
+ ,"JNI NewStringUTF() in HdfsClient::hdfsDeleteFiles()."
+ ,"Java exception in HdfsClient::hdfsDeleteFiles()."
,"Error in HdfsClient::setHdfsFileInfo()."
,"Error in HdfsClient::hdfsListDirectory()."
,"Java exception in HdfsClient::hdfsListDirectory()."
@@ -453,7 +455,7 @@ HDFS_Client_RetCode HdfsClient::init()
JavaMethods_[JM_CTOR ].jm_name = "";
JavaMethods_[JM_CTOR ].jm_signature = "()V";
JavaMethods_[JM_HDFS_CREATE ].jm_name = "hdfsCreate";
-JavaMethods_[JM_HDFS_CREATE ].jm_signature = "(Ljava/lang/String;ZZ)Z";
+JavaMethods_[JM_HDFS_CREATE ].jm_signature =
"(Ljava/lang/String;ZZZ)Z";
JavaMethods_[JM_HDFS_OPEN ].jm_name = "hdfsOpen";
JavaMethods_[JM_HDFS_OPEN ].jm_signature = "(Ljava/lang/String;Z)Z";
JavaMethods_[JM_HDFS_WRITE ].jm_name = "hdfsWrite";
@@ -472,6 +474,8 @@ HDFS_Client_RetCode HdfsClient::init()
JavaMethods_[JM_HDFS_EXISTS].jm_signature =
[1/2] trafodion git commit: [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation
Repository: trafodion Updated Branches: refs/heads/master 5c55e68f8 -> 0550932b4 [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation Added a known diff file till TRAFODION-3185 is taken care of/ Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/7fbee467 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/7fbee467 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/7fbee467 Branch: refs/heads/master Commit: 7fbee467beb280a62e65e96244c61458c17df3e9 Parents: 6151b59 Author: selvaganesang Authored: Tue Aug 21 17:49:16 2018 + Committer: selvaganesang Committed: Tue Aug 21 17:49:16 2018 + -- core/sql/regress/hive/DIFF006.KNOWN | 114 +++ 1 file changed, 114 insertions(+) -- http://git-wip-us.apache.org/repos/asf/trafodion/blob/7fbee467/core/sql/regress/hive/DIFF006.KNOWN -- diff --git a/core/sql/regress/hive/DIFF006.KNOWN b/core/sql/regress/hive/DIFF006.KNOWN new file mode 100644 index 000..c2f7977 --- /dev/null +++ b/core/sql/regress/hive/DIFF006.KNOWN @@ -0,0 +1,114 @@ +30a31,143 +> 3,4c3,7 +> < P_PROMO_SK P_PROMO_ID P_START_DATE_SK P_END_DATE_SK P_ITEM_SK P_COST P_RESPONSE_TARGET P_PROMO_NAME P_CHANNEL_DMAIL P_CHANNEL_EMAIL P_CHANNEL_CATALOG P_CHANNEL_TV P_CHANNEL_RADIO P_CHANNEL_PRESS P_CHANNEL_EVENT P_CHANNEL_DEMO P_CHANNEL_DETAILS P_PURPOSE P_DISCOUNT_ACTIVE +> < -- +> --- +> > *** ERROR[8447] An error occurred during hdfs access. Error Detail: SETUP_HDFS_SCAN java.io.IOException: Spliting of compressed sequence file is not supported +> > org.TRAFODION.sql.HDFSClient.initSequenceFileRead(HDFSClient.java:386) +> > org.TRAFODION.sql.HDFSClient.(HDFSClient.java:365) +> > org.TRAFODION.sql.HdfsScan.scheduleHdfsScanRange(HdfsScan.java:173) +> > org.TRAFODION.sql.HdfsScan.trafHdfsRead(HdfsScan.java:260) +> 6,106c9 +> < 1 BAAA 2450164 2450185 10022 1.000E+003 1 ought Y N N N N N N N Men will not say merely. Unknown N +> < 2 CAAA 2450118 2450150 2410 1.000E+003 1 able Y N N N N N N N So willing buildings coul Unknown N +> < 3 DAAA 2450675 2450712 10843 1.000E+003 1 pri Y N N N N N N N Companies shall not pr Unknown N +> < 4 EAAA 2450633 2450646 9794 1.000E+003 1 ese N N N N N N N N High, good shoulders can Unknown N +> < 5 FAAA 2450347 2450357 6655 1.000E+003 1 anti N N N N N N N N Huge, competent structure Unknown N +> < 6 GAAA 2450516 2450561 9464 1.000E+003 1 cally N N N N N N N N Boards might not reverse Unknown N +> < 7 HAAA 2450123 2450132 14527 1.000E+003 1 ation N N N N N N N N Effects used to prefer ho Unknown N +> < 8 IAAA 2450350 2450409 304 1.000E+003 1 eing Y N N N N N N N Offences feel only on a f Unknown N +> < 9 JAAA 2450192 2450248 3439 1.000E+003 1 n st Y N N N N N N N External forces shall com Unknown N +> < 10 KAAA 2450324 2450365 3314 1.000E+003 1 bar N N N N N N N N Only local achievements u Unknown N +> < 11 LAAA ? ? ? 1.000E+003 ? ought N N N Teachers shall not make u Unknown N +> < 12 MAAA 2450153 2450169 6688 1.000E+003 1 able N N N N N N N N Also only times would com Unknown N +> < 13 NAAA 2450316 2450365 11354 1.000E+003 1 pri N N N N N N N N Years shall not go later Unknown N +> < 14 OAAA 2450236 2450282 14480 1.000E+003 1 ese N N N N N N N N Adults would not delay ra Unknown N +> < 15 PAAA ? ? ? 1.000E+003 ? anti Y N N N N N Old elements would shake Unknown N +> < 16 ABAA 2450342 2450351 11899 1.000E+003 1 cally Y N N N N N N N Sudden, wooden theories w Unknown N +> < 17 BBAA 2450360 2450406 15529 1.000E+003 1 ation Y N N N N N N N Almost old churches ought Unknown N +> < 18 CBAA 2450581 2450592 8599 1.000E+003 1 eing Y N N N N N N N National communities use Unknown N +> < 19 DBAA 2450623 2450640 5185 1.000E+003 1 n st N N N N N N N N Young families act. Most Unknown N +> < 20 EBAA 2450531 2450545 17860 1.000E+003 1 bar Y N N N N N N N Usually common courses fi Unknown N +> < 21 FBAA 2450895 2450904 3632 1.000E+003 1 ought N N N N N N N N British tensions should n Unknown N +> < 22 GBAA 2450596 2450629 8044 1.000E+003 1 able Y N N N N N N N Powers ought to allow to Unknown N +> < 23 HBAA 2450478 2450493 4321 1.000E+003 1 pri N N N N N N N N As main privileges cannot Unknown N +> < 24 IBAA 2450719 2450773 12004 1.000E+003 1 ese Y N N N N N N N Words appear technical, c Unknown N +> < 25
[2/2] trafodion git commit: Merge PR 1701 [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation
Merge PR 1701 [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/0550932b Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/0550932b Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/0550932b Branch: refs/heads/master Commit: 0550932b486832088107c87f852c78e9ef35c5c5 Parents: 5c55e68 7fbee46 Author: selvaganesang Authored: Wed Aug 22 01:46:33 2018 + Committer: selvaganesang Committed: Wed Aug 22 01:46:33 2018 + -- core/sql/regress/hive/DIFF006.KNOWN | 114 +++ 1 file changed, 114 insertions(+) --
[2/3] trafodion git commit: Fix for failure with check-PR of commit 185ff850ac815d68712ee58ded493fff7f8ae8d3
Fix for failure with check-PR of commit 185ff850ac815d68712ee58ded493fff7f8ae8d3
SYSKEY can be 16 digits long
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/6151b593
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/6151b593
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/6151b593
Branch: refs/heads/master
Commit: 6151b59382f7442f46b549332f950c4c0af6f023
Parents: 185ff85
Author: selvaganesang
Authored: Wed Aug 15 21:48:30 2018 +
Committer: selvaganesang
Committed: Wed Aug 15 21:48:30 2018 +
--
core/sql/regress/tools/regress-filter-linux | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6151b593/core/sql/regress/tools/regress-filter-linux
--
diff --git a/core/sql/regress/tools/regress-filter-linux
b/core/sql/regress/tools/regress-filter-linux
index 58709ec..c32d3ea 100755
--- a/core/sql/regress/tools/regress-filter-linux
+++ b/core/sql/regress/tools/regress-filter-linux
@@ -38,7 +38,7 @@ SYSKEY=`grep '\' $fil | egrep -v '(--|^>>|^\*\*)'`
if [ "$SYSKEY" = "" ]; then
SYSKEY='@syskey@'
else
- SYSKEY='[0-9]\{17,20\}\>'
+ SYSKEY='[0-9]\{16,20\}\>'
fi
# 123456789 123456789
[3/3] trafodion git commit: Merge PR 1697 [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation
Merge PR 1697 [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/0edaaf41 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/0edaaf41 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/0edaaf41 Branch: refs/heads/master Commit: 0edaaf416746f8d8d3df4689da4874fd3df5cc51 Parents: 8f18e5a 6151b59 Author: selvaganesang Authored: Thu Aug 16 03:06:52 2018 + Committer: selvaganesang Committed: Thu Aug 16 03:06:52 2018 + -- core/sql/regress/hive/TEST006 | 6 ++ core/sql/regress/tools/regress-filter-linux | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) --
[1/3] trafodion git commit: [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation
Repository: trafodion Updated Branches: refs/heads/master 8f18e5a34 -> 0edaaf416 [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation Disabled parallel plan in hive/TEST006 that could cause spliting a compressed sequence file Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/185ff850 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/185ff850 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/185ff850 Branch: refs/heads/master Commit: 185ff850ac815d68712ee58ded493fff7f8ae8d3 Parents: 7fba1c6 Author: selvaganesang Authored: Wed Aug 15 18:16:48 2018 + Committer: selvaganesang Committed: Wed Aug 15 18:16:48 2018 + -- core/sql/regress/hive/TEST006 | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/trafodion/blob/185ff850/core/sql/regress/hive/TEST006 -- diff --git a/core/sql/regress/hive/TEST006 b/core/sql/regress/hive/TEST006 index 131ebff..95f13ab 100644 --- a/core/sql/regress/hive/TEST006 +++ b/core/sql/regress/hive/TEST006 @@ -42,11 +42,17 @@ log LOG006_seq_promotion.dat clear; select * from hive.promotion_seq where p_promo_sk < 100 order by P_PROMO_SK; log; +-- Jenkins might be choosing a parallel plan for compressed sequence file +-- Currently Trafodion doesn't support spliting a compressed sequence file +cqd attempt_esp_parallelism 'off' ; + -- Select from the compressed version of the promotion table log LOG006_comp_promotion.dat clear; select * from hive.promotion_comp where p_promo_sk < 100 order by P_PROMO_SK; log; +cqd attempt_esp_parallelism reset ; + -- Select from the text version of the promotion table log LOG006_orig_promotion.dat clear; select * from hive.promotion where p_promo_sk < 100 order by P_PROMO_SK;
[2/2] trafodion git commit: Merge PR 1693 [TRAFODION-3180] At times establishing a JDBC/ODBC connection takes observably long time
Merge PR 1693 [TRAFODION-3180] At times establishing a JDBC/ODBC connection takes observably long time Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/8f18e5a3 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/8f18e5a3 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/8f18e5a3 Branch: refs/heads/master Commit: 8f18e5a34bfc52f4b64fb0dc7175ae9c26535fad Parents: 7fba1c6 d51fe9e Author: selvaganesang Authored: Wed Aug 15 22:31:57 2018 + Committer: selvaganesang Committed: Wed Aug 15 22:31:57 2018 + -- core/sqf/src/seabed/src/sockstream.cpp | 1 + core/sqf/src/seabed/src/stream.cpp | 2 ++ 2 files changed, 3 insertions(+) --
[1/2] trafodion git commit: [TRAFODION-3180] At times establishing a JDBC/ODBC connection takes observably long time
Repository: trafodion
Updated Branches:
refs/heads/master 7fba1c662 -> 8f18e5a34
[TRAFODION-3180] At times establishing a JDBC/ODBC connection takes observably
long time
When the sock stream is in use, socket close is kept pending in a queue till it
can
be closed. But, the sockets from this queue is never closed. Added code
to close the sockets from this queue at the time of creating the socket stream
next
time.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/d51fe9e6
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/d51fe9e6
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/d51fe9e6
Branch: refs/heads/master
Commit: d51fe9e66f0b09809d803970a952496fdd122a48
Parents: 10986d3
Author: selvaganesang
Authored: Mon Aug 13 23:45:47 2018 +
Committer: selvaganesang
Committed: Mon Aug 13 23:45:47 2018 +
--
core/sqf/src/seabed/src/sockstream.cpp | 1 +
core/sqf/src/seabed/src/stream.cpp | 2 ++
2 files changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/d51fe9e6/core/sqf/src/seabed/src/sockstream.cpp
--
diff --git a/core/sqf/src/seabed/src/sockstream.cpp
b/core/sqf/src/seabed/src/sockstream.cpp
index 41fa7a5..83ba1aa 100644
--- a/core/sqf/src/seabed/src/sockstream.cpp
+++ b/core/sqf/src/seabed/src/sockstream.cpp
@@ -431,6 +431,7 @@ SB_Trans::Sock_Stream::create(const char *pp_name,
pp_sock->set_nonblock();
pp_sock->event_init(lp_stream->ip_sock_eh);
}
+SB_Trans::Trans_Stream::delete_streams(true);
return lp_stream;
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/d51fe9e6/core/sqf/src/seabed/src/stream.cpp
--
diff --git a/core/sqf/src/seabed/src/stream.cpp
b/core/sqf/src/seabed/src/stream.cpp
index fccbccd..9699e33 100644
--- a/core/sqf/src/seabed/src/stream.cpp
+++ b/core/sqf/src/seabed/src/stream.cpp
@@ -610,6 +610,7 @@ void SB_Trans::Trans_Stream::delete_streams(bool
pv_ref_zero) {
"Not deleting stream=%s,
stream-ref=%d\n",
lp_stream->get_name(),
lv_stream_ref);
+lv_del_q.add(_stream->iv_del_link);
}
} else {
if (gv_ms_trace_ref)
@@ -633,6 +634,7 @@ void SB_Trans::Trans_Stream::delete_streams(bool
pv_ref_zero) {
"Not deleting stream=%s,
stream-ref=%d\n",
lp_stream->get_name(),
lv_stream_ref);
+lv_del_q.add(_stream->iv_del_link);
}
}
}
[1/2] trafodion git commit: [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation
Repository: trafodion
Updated Branches:
refs/heads/master 5e8bfc70d -> 7fba1c662
[TRAFODION-3171] Refactor Hive sequence file reading to use the new
implementation
Ensured that split of non-compressed sequence file works. In case of compressed
sequence filee, an exception is thrown when the file is split.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/1c8c81d7
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/1c8c81d7
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/1c8c81d7
Branch: refs/heads/master
Commit: 1c8c81d708af0520e61b8c6a20ff69135a6b8f5c
Parents: 39d7110
Author: selvaganesang
Authored: Mon Aug 13 23:24:47 2018 +
Committer: selvaganesang
Committed: Mon Aug 13 23:24:47 2018 +
--
.../main/java/org/trafodion/sql/HDFSClient.java | 45 ++--
1 file changed, 32 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/1c8c81d7/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
--
diff --git a/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
b/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
index 1995851..6b7f051 100644
--- a/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
@@ -124,6 +124,8 @@ public class HDFSClient
private Writable key_;
private Writable value_;
private SequenceFile.Reader reader_;
+ private SequenceFile.CompressionType seqCompressionType_;
+
static {
String confFile = System.getProperty("trafodion.log4j.configFile");
System.setProperty("trafodion.root", System.getenv("TRAF_HOME"));
@@ -171,7 +173,8 @@ public class HDFSClient
int bytesRead;
int totalBytesRead = 0;
if (sequenceFile_) {
-reader_.sync(pos_);
+// do nothing
+;
} else if (compressed_) {
bufArray_ = new byte[ioByteArraySizeInKB_ * 1024];
}
@@ -196,11 +199,10 @@ public class HDFSClient
}
do
{
-if (compressed_) {
- bytesRead = compressedFileRead(lenRemain_);
-} else if (sequenceFile_) {
+if (sequenceFile_)
bytesRead = sequenceFileRead(lenRemain_);
-}
+else if (compressed_)
+ bytesRead = compressedFileRead(lenRemain_);
else {
if (buf_.hasArray())
bytesRead = fsdis_.read(pos_, buf_.array(), bufOffset_,
lenRemain_);
@@ -269,8 +271,8 @@ public class HDFSClient
int lenRemain = readLenRemain;
while (!eof && lenRemain > 0) {
- tempPos = reader_.getPosition();
try {
+tempPos = reader_.getPosition();
eof = reader_.next(key_, value_);
}
catch (java.io.EOFException e)
@@ -288,7 +290,11 @@ public class HDFSClient
totalReadLen += (readLen+1);
} else {
// Reset the position because the row can't be copied to buffer
- reader_.sync(tempPos);
+ try {
+reader_.sync(tempPos);
+ }
+ catch (java.io.EOFException e1)
+ {}
break;
}
}
@@ -323,8 +329,10 @@ public class HDFSClient
inStream_ = inStream;
sequenceFile_ = sequenceFile;
recDelimiter_ = recDelimiter;
- if (sequenceFile_)
- fsdis_ = fs_.open(filepath_);
+ if (sequenceFile_) {
+ fsdis_ = null;
+ inStream_ = null;
+ }
else {
codec_ = codecFactory_.getCodec(filepath_);
if (codec_ != null) {
@@ -366,10 +374,21 @@ public class HDFSClient
public void initSequenceFileRead() throws IOException, EOFException
{
- SequenceFile.Reader.Option seqPos = SequenceFile.Reader.start(pos_);
SequenceFile.Reader.Option seqLen =
SequenceFile.Reader.length(lenRemain_);
- SequenceFile.Reader.Option seqInputStream =
SequenceFile.Reader.stream(fsdis_);
- reader_ = new SequenceFile.Reader(config_, seqPos, seqLen,
seqInputStream);
+ SequenceFile.Reader.Option seqFileName =
SequenceFile.Reader.file(filepath_);
+ reader_ = new SequenceFile.Reader(config_, seqLen, seqFileName);
+ seqCompressionType_ = reader_.getCompressionType();
+ if (seqCompressionType_ == SequenceFile.CompressionType.NONE)
+ compressed_ = false;
+ else
+ compressed_ = true;
+ if (compressed_ && pos_ != 0)
+ throw new IOException("Spliting of compressed sequence file is not
supported");
+ try {
+reader_.sync(pos_);
+ } catch (EOFException e)
[2/2] trafodion git commit: Merge PR 1692 [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation
Merge PR 1692 [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/7fba1c66 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/7fba1c66 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/7fba1c66 Branch: refs/heads/master Commit: 7fba1c66220e7ac24bc7c5e5f542351e01a02839 Parents: 5e8bfc7 1c8c81d Author: selvaganesang Authored: Tue Aug 14 19:07:00 2018 + Committer: selvaganesang Committed: Tue Aug 14 19:07:00 2018 + -- .../main/java/org/trafodion/sql/HDFSClient.java | 45 ++-- 1 file changed, 32 insertions(+), 13 deletions(-) --
[1/2] trafodion git commit: [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation
Repository: trafodion
Updated Branches:
refs/heads/master f38a1006b -> c1aa0e6f4
[TRAFODION-3171] Refactor Hive sequence file reading to use the new
implementation
Changes possibly fix the hive/TEST006 failure in daily build.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/39d71103
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/39d71103
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/39d71103
Branch: refs/heads/master
Commit: 39d71103aaed3ce10a518533f296c35201cf3bea
Parents: affc9db
Author: selvaganesang
Authored: Wed Aug 8 23:06:58 2018 +
Committer: selvaganesang
Committed: Wed Aug 8 23:06:58 2018 +
--
core/sql/src/main/java/org/trafodion/sql/HdfsScan.java | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/39d71103/core/sql/src/main/java/org/trafodion/sql/HdfsScan.java
--
diff --git a/core/sql/src/main/java/org/trafodion/sql/HdfsScan.java
b/core/sql/src/main/java/org/trafodion/sql/HdfsScan.java
index 4d7b90d..7d813eb 100644
--- a/core/sql/src/main/java/org/trafodion/sql/HdfsScan.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HdfsScan.java
@@ -177,8 +177,12 @@ public class HdfsScan
} catch (EOFException e)
{
// Skip this range
-currRange_++;
-scheduleHdfsScanRange(bufNo, 0);
+if (currRange_ == (hdfsScanRanges_.length-1))
+scanCompleted_ = true;
+else {
+ currRange_++;
+ scheduleHdfsScanRange(bufNo, 0);
+}
}
}
}
[2/2] trafodion git commit: Merge PR 1687 [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation
Merge PR 1687 [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/c1aa0e6f Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/c1aa0e6f Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/c1aa0e6f Branch: refs/heads/master Commit: c1aa0e6f4aaf6f82d4b8bc2e29a40da62de8f93f Parents: f38a100 39d7110 Author: selvaganesang Authored: Thu Aug 9 17:55:15 2018 + Committer: selvaganesang Committed: Thu Aug 9 17:55:15 2018 + -- core/sql/src/main/java/org/trafodion/sql/HdfsScan.java | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) --
[2/3] trafodion git commit: [TRAFODION-3180] At times establishing a JDBC/ODBC connection takes observably long time
[TRAFODION-3180] At times establishing a JDBC/ODBC connection takes observably
long time
Fixes as per the review comments
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/10986d35
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/10986d35
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/10986d35
Branch: refs/heads/master
Commit: 10986d35082b5f267a8030f5f4d37fb96c73e5ec
Parents: 02b9a0e
Author: selvaganesang
Authored: Tue Aug 7 21:13:09 2018 +
Committer: selvaganesang
Committed: Tue Aug 7 21:13:09 2018 +
--
core/sql/common/IpcGuardian.cpp | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/10986d35/core/sql/common/IpcGuardian.cpp
--
diff --git a/core/sql/common/IpcGuardian.cpp b/core/sql/common/IpcGuardian.cpp
index f223d7b..710a58f 100644
--- a/core/sql/common/IpcGuardian.cpp
+++ b/core/sql/common/IpcGuardian.cpp
@@ -4107,11 +4107,10 @@ void IpcGuardianServer::useProcess(ComDiagsArea **diags,
CollHeap *diagsHeap)
{
SB_Phandle_Type procHandle;
- NSK_PORT_HANDLE procHandleCopy;
short usedlength;
char processName[50];
char *tmpProcessName;
- short rc;
+ int rc;
if (processName_ == NULL)
{
@@ -4131,8 +4130,7 @@ void IpcGuardianServer::useProcess(ComDiagsArea **diags,
short i = 0;
while (i < 3)
{
-int gprc = 0;
-gprc = get_phandle_with_retry(tmpProcessName, );
+rc = get_phandle_with_retry(tmpProcessName, );
if (rc != FEOK)
{
serverState_ = ERROR_STATE;
[3/3] trafodion git commit: Merge PR 1685[TRAFODION-3180] At times establishing a JDBC/ODBC connection takes observably long time
Merge PR 1685[TRAFODION-3180] At times establishing a JDBC/ODBC connection takes observably long time Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/f38ade8d Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/f38ade8d Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/f38ade8d Branch: refs/heads/master Commit: f38ade8de4565137dc60ef2f05b767e9129b8196 Parents: 45727da 10986d3 Author: selvaganesang Authored: Wed Aug 8 00:01:29 2018 + Committer: selvaganesang Committed: Wed Aug 8 00:01:29 2018 + -- core/sql/common/ComRtUtils.cpp | 11 ++- core/sql/common/ComRtUtils.h| 2 +- core/sql/common/IpcGuardian.cpp | 31 +--- .../main/java/org/trafodion/sql/HDFSClient.java | 5 ++-- .../main/java/org/trafodion/sql/HdfsScan.java | 11 +-- 5 files changed, 24 insertions(+), 36 deletions(-) --
[1/3] trafodion git commit: [TRAFODION-3180] At times establishing a JDBC/ODBC connection takes observably long time
Repository: trafodion
Updated Branches:
refs/heads/master 45727da59 -> f38ade8de
[TRAFODION-3180] At times establishing a JDBC/ODBC connection takes observably
long time
Analysis revealed that the mxosrvr process in connecting state was attempting
to open the
ssmp process on the node for a non-unique query as part of establishing
connection.
The ssmp process has many ports in CLOSE_WAIT state. It looks like the client
happens
to hit on a port that is in CLOSE_WAIT state. The port transitions to
ESTABLISHED state
after some time. Hence the connection was taking a longer time.
The mxssmp process keeps the port in CLOSE_WAIT because the socket wasn't
closed on the
server side when client exits gracefully as well as abruptly. The seabed layer
in
Trafodion doesn't handle more than one open to a process in a correct way. I
have changed
the IPC infrastructure in SQL to ensure that the ssmp process is opened only
once
in mxosrvr process.
The API msg_get_phandle opens the process with the given name to obtain the
handle. This API
is now replaced with XFILENAME_TO_PROCESSHANDLE_
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/02b9a0ea
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/02b9a0ea
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/02b9a0ea
Branch: refs/heads/master
Commit: 02b9a0eac55840325a869102c5bbf28aaa516a3a
Parents: 0d30493
Author: selvaganesang
Authored: Tue Aug 7 18:03:04 2018 +
Committer: selvaganesang
Committed: Tue Aug 7 18:03:04 2018 +
--
core/sql/common/ComRtUtils.cpp | 11 ++--
core/sql/common/ComRtUtils.h| 2 +-
core/sql/common/IpcGuardian.cpp | 29 ++--
.../main/java/org/trafodion/sql/HDFSClient.java | 5 ++--
.../main/java/org/trafodion/sql/HdfsScan.java | 11 ++--
5 files changed, 24 insertions(+), 34 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/02b9a0ea/core/sql/common/ComRtUtils.cpp
--
diff --git a/core/sql/common/ComRtUtils.cpp b/core/sql/common/ComRtUtils.cpp
index 764b8ee..4c11b00 100644
--- a/core/sql/common/ComRtUtils.cpp
+++ b/core/sql/common/ComRtUtils.cpp
@@ -1075,11 +1075,10 @@ Int16 getBDRClusterName(char *bdrClusterName)
return error;
}
-SB_Phandle_Type *get_phandle_with_retry(char *pname, short *fserr)
+int get_phandle_with_retry(char *pname, SB_Phandle_Type *phandle)
{
Int32 retrys = 0;
int lv_fserr = FEOK;
- SB_Phandle_Type *phandle = NULL;
const Int32 NumRetries = 10;
timespec retryintervals[NumRetries] = {
{ 0, 10*1000*1000 } // 10 ms
@@ -1096,7 +1095,7 @@ SB_Phandle_Type *get_phandle_with_retry(char *pname,
short *fserr)
for (;;)
{
-phandle = msg_get_phandle (pname, _fserr);
+lv_fserr = XFILENAME_TO_PROCESSHANDLE_(pname, strlen(pname), phandle);
if (retrys >= NumRetries)
break;
if ((lv_fserr == FEPATHDOWN) ||
@@ -1105,11 +1104,7 @@ SB_Phandle_Type *get_phandle_with_retry(char *pname,
short *fserr)
else
break;
}
-
- if (fserr)
-*fserr = (short) lv_fserr;
-
- return phandle;
+ return lv_fserr;
}
// A function to return the string "UNKNOWN ()" which can be
http://git-wip-us.apache.org/repos/asf/trafodion/blob/02b9a0ea/core/sql/common/ComRtUtils.h
--
diff --git a/core/sql/common/ComRtUtils.h b/core/sql/common/ComRtUtils.h
index d26e52e..a1bf2cf 100644
--- a/core/sql/common/ComRtUtils.h
+++ b/core/sql/common/ComRtUtils.h
@@ -286,7 +286,7 @@ void dumpTrafStack(LIST(TrafAddrStack *) *la, const char
*header, bool toFile =
Int16 getBDRClusterName(char *bdrClusterName);
-SB_Phandle_Type *get_phandle_with_retry(char *pname, short *fserr = NULL);
+int get_phandle_with_retry(char *pname, SB_Phandle_Type *phandle);
pid_t ComRtGetConfiguredPidMax();
http://git-wip-us.apache.org/repos/asf/trafodion/blob/02b9a0ea/core/sql/common/IpcGuardian.cpp
--
diff --git a/core/sql/common/IpcGuardian.cpp b/core/sql/common/IpcGuardian.cpp
index c8ebcf8..f223d7b 100644
--- a/core/sql/common/IpcGuardian.cpp
+++ b/core/sql/common/IpcGuardian.cpp
@@ -212,14 +212,10 @@ NABoolean GuaProcessHandle::compare(const
GuaProcessHandle ) const
NABoolean GuaProcessHandle::fromAscii(const char *ascii)
{
- SB_Phandle_Type *tempPhandle;
- tempPhandle = get_phandle_with_retry((char *)ascii);
-
- if (!tempPhandle)
+ int retcode = get_phandle_with_retry((char *)ascii, _);
+ if (retcode != FEOK)
return FALSE;
-
- memcpy ((void *)_, (void *)tempPhandle, sizeof(SB_Phandle_Type));
return TRUE;
}
@@ -4110,7
[2/3] trafodion git commit: [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation
[TRAFODION-3171] Refactor Hive sequence file reading to use the new
implementation
Fix to resolve the issue highlighted in the review comment
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/abbfe856
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/abbfe856
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/abbfe856
Branch: refs/heads/master
Commit: abbfe85683c299be35b79f64b90d90f7c253dc51
Parents: 6165e6b
Author: selvaganesang
Authored: Fri Aug 3 17:27:27 2018 +
Committer: selvaganesang
Committed: Fri Aug 3 17:27:27 2018 +
--
core/sql/src/main/java/org/trafodion/sql/HDFSClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/abbfe856/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
--
diff --git a/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
b/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
index 8a14b61..c04c256 100644
--- a/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
@@ -280,7 +280,7 @@ public class HDFSClient
}
byteArray = ((Text)value_).getBytes();
readLen = ((Text)value_).getLength();
- if (readLen <= lenRemain) {
+ if ((readLen+1) <= lenRemain) {
buf_.put(byteArray, 0, readLen);
buf_.put(recDelimiter_);
[1/3] trafodion git commit: [TRAFODION-3171] Refactor Hive sequence file reading to use the new implementation
Repository: trafodion
Updated Branches:
refs/heads/master 9c59d7803 -> c8ffae3b4
[TRAFODION-3171] Refactor Hive sequence file reading to use the new
implementation
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/6165e6b1
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/6165e6b1
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/6165e6b1
Branch: refs/heads/master
Commit: 6165e6b1017521abed062c55931d4555b886387d
Parents: 95eaa31
Author: selvaganesang
Authored: Wed Aug 1 20:08:46 2018 +
Committer: selvaganesang
Committed: Wed Aug 1 20:08:46 2018 +
--
core/sql/executor/ExHdfsScan.cpp| 3 +-
core/sql/executor/HdfsClient_JNI.cpp| 12 +-
core/sql/executor/HdfsClient_JNI.h | 6 +-
.../main/java/org/trafodion/sql/HDFSClient.java | 116 ---
.../main/java/org/trafodion/sql/HdfsScan.java | 24 ++--
5 files changed, 129 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6165e6b1/core/sql/executor/ExHdfsScan.cpp
--
diff --git a/core/sql/executor/ExHdfsScan.cpp b/core/sql/executor/ExHdfsScan.cpp
index b09cffd..d4cf717 100644
--- a/core/sql/executor/ExHdfsScan.cpp
+++ b/core/sql/executor/ExHdfsScan.cpp
@@ -130,8 +130,6 @@ ExHdfsScanTcb::ExHdfsScanTcb(
Space * space = (glob ? glob->getSpace() : 0);
CollHeap * heap = (glob ? glob->getDefaultHeap() : 0);
useLibhdfsScan_ = hdfsScanTdb.getUseLibhdfsScan();
- if (isSequenceFile())
- useLibhdfsScan_ = TRUE;
lobGlob_ = NULL;
hdfsScanBufMaxSize_ = hdfsScanTdb.hdfsBufSize_;
headRoom_ = (Int32)hdfsScanTdb.rangeTailIOSize_;
@@ -571,6 +569,7 @@ ExWorkProcRetcode ExHdfsScanTcb::work()
hdfsScan_ = HdfsScan::newInstance((NAHeap *)getHeap(),
hdfsScanBuf_, hdfsScanBufMaxSize_,
hdfsScanTdb().hdfsIoByteArraySizeInKB_,
_, beginRangeNum_,
numRanges_, hdfsScanTdb().rangeTailIOSize_,
+isSequenceFile(), hdfsScanTdb().recordDelimiter_,
hdfsStats_, hdfsScanRetCode);
if (hdfsScanRetCode != HDFS_SCAN_OK) {
setupError(EXE_ERROR_HDFS_SCAN, hdfsScanRetCode,
"SETUP_HDFS_SCAN",
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6165e6b1/core/sql/executor/HdfsClient_JNI.cpp
--
diff --git a/core/sql/executor/HdfsClient_JNI.cpp
b/core/sql/executor/HdfsClient_JNI.cpp
index 65c83cd..5ae2805 100644
--- a/core/sql/executor/HdfsClient_JNI.cpp
+++ b/core/sql/executor/HdfsClient_JNI.cpp
@@ -85,7 +85,7 @@ HDFS_Scan_RetCode HdfsScan::init()
JavaMethods_[JM_CTOR ].jm_name = "";
JavaMethods_[JM_CTOR ].jm_signature = "()V";
JavaMethods_[JM_SET_SCAN_RANGES].jm_name = "setScanRanges";
-JavaMethods_[JM_SET_SCAN_RANGES].jm_signature =
"(Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;I[Ljava/lang/String;[J[J[I[S)V";
+JavaMethods_[JM_SET_SCAN_RANGES].jm_signature =
"(Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;I[Ljava/lang/String;[J[J[I[SZB)V";
JavaMethods_[JM_TRAF_HDFS_READ].jm_name = "trafHdfsRead";
JavaMethods_[JM_TRAF_HDFS_READ].jm_signature = "()[I";
JavaMethods_[JM_STOP].jm_name = "stop";
@@ -109,7 +109,7 @@ char* HdfsScan::getErrorText(HDFS_Scan_RetCode errEnum)
/
HDFS_Scan_RetCode HdfsScan::setScanRanges(ExHdfsScanTcb::HDFS_SCAN_BUF
*hdfsScanBuf, int scanBufSize, int hdfsIoByteArraySizeInKB,
- HdfsFileInfoArray *hdfsFileInfoArray, Int32 beginRangeNum, Int32
numRanges, int rangeTailIOSize)
+ HdfsFileInfoArray *hdfsFileInfoArray, Int32 beginRangeNum, Int32
numRanges, int rangeTailIOSize, NABoolean sequenceFile, char recDelimiter)
{
QRLogger::log(CAT_SQL_HDFS, LL_DEBUG, "HdfsScan::setScanRanges() called.");
@@ -216,12 +216,13 @@ HDFS_Scan_RetCode
HdfsScan::setScanRanges(ExHdfsScanTcb::HDFS_SCAN_BUF *hdfsScan
ex_assert(compressionMethod >= 0 && compressionMethod <
ComCompressionInfo::SUPPORTED_COMPRESSIONS, "Illegal CompressionMethod Value");
jenv_->SetShortArrayRegion(j_compress, rangeCount, 1,
);
}
-
+ jboolean j_sequenceFile = sequenceFile;
+ jbyte j_recDelimiter = (BYTE)recDelimiter;
if (hdfsStats_ != NULL)
hdfsStats_->getHdfsTimer().start();
tsRecentJMFromJNI = JavaMethods_[JM_SET_SCAN_RANGES].jm_full_name;
jenv_->CallVoidMethod(javaObj_, JavaMethods_[JM_SET_SCAN_RANGES].methodID,
j_buf1, j_buf2, j_hdfsIoByteArraySizeInKB,
- j_filenames, j_offsets, j_lens, j_rangenums, j_compress);
+
[3/3] trafodion git commit: Merge PR 1674 [TRAFODION-3171] Refactor Hive sequence file reading to use the new implemenation
Merge PR 1674 [TRAFODION-3171] Refactor Hive sequence file reading to use the new implemenation Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/c8ffae3b Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/c8ffae3b Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/c8ffae3b Branch: refs/heads/master Commit: c8ffae3b450dcf2e40e33d02a3bea2d38e1a64a3 Parents: 9c59d78 abbfe85 Author: selvaganesang Authored: Mon Aug 6 18:26:53 2018 + Committer: selvaganesang Committed: Mon Aug 6 18:26:53 2018 + -- core/sql/executor/ExHdfsScan.cpp| 3 +- core/sql/executor/HdfsClient_JNI.cpp| 12 +- core/sql/executor/HdfsClient_JNI.h | 6 +- .../main/java/org/trafodion/sql/HDFSClient.java | 116 --- .../main/java/org/trafodion/sql/HdfsScan.java | 24 ++-- 5 files changed, 129 insertions(+), 32 deletions(-) --
[2/5] trafodion git commit: fix to address review comments.
fix to address review comments.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/0a1bb2a1
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/0a1bb2a1
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/0a1bb2a1
Branch: refs/heads/master
Commit: 0a1bb2a1a038d60fdeeb5405ca0d30f4705307f7
Parents: 5c51fa3
Author: Prashant Vasudev
Authored: Mon Jul 30 22:19:45 2018 +
Committer: Prashant Vasudev
Committed: Mon Jul 30 22:19:45 2018 +
--
core/sql/executor/ExSequence.cpp | 99 ---
core/sql/executor/ExSequence.h | 1 +
core/sql/executor/cluster.cpp| 87 ++
core/sql/executor/cluster.h | 8 +++
4 files changed, 141 insertions(+), 54 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0a1bb2a1/core/sql/executor/ExSequence.cpp
--
diff --git a/core/sql/executor/ExSequence.cpp b/core/sql/executor/ExSequence.cpp
index aa2d905..7ba414a 100644
--- a/core/sql/executor/ExSequence.cpp
+++ b/core/sql/executor/ExSequence.cpp
@@ -992,23 +992,24 @@ short ExSequenceTcb::work()
break;
}
ex_assert(isUnboundedFollowing(),"");
-
- if ( ! cluster_->flush(_) ) { // flush the buffers
+
+ ComDiagsArea *myDiags = NULL;
+ if (!cluster_->flush(myDiags, heap_)) { // flush the buffers
// if no errors this code path is not visited
- if ( rc_ )
+if (myDiags)
{ // some error
- updateDiagsArea( rc_);
+ updateDiagsArea(myDiags);
pstate->step_ = ExSeq_ERROR;
- break;
- }
- // not all the buffers are completely flushed. An I/O is pending
+ break;
+}
+// not all the buffers are completely flushed. An I/O is pending
// maybe we cane remove in the future
- return WORK_OK;
- }
+return WORK_OK;
+ }
- // At this point -- all the buffers were completely flushed
+ // At this point -- all the buffers were completely flushed
- OLAPBuffersFlushed_ = TRUE;
+ OLAPBuffersFlushed_ = TRUE;
if (getPartitionEnd())
{
@@ -1041,24 +1042,24 @@ short ExSequenceTcb::work()
// 2. ExSeq_ERROR - If an error occurs
case ExSeq_OVERFLOW_READ:
{
+ assert(firstOLAPBufferFromOF_ &&
+ isUnboundedFollowing() );
-assert(firstOLAPBufferFromOF_ &&
-isUnboundedFollowing() );
-
- if ( ! cluster_->read(_) ) {
- if ( rc_ ) { // some error
-updateDiagsArea( rc_);
- pstate->step_ = ExSeq_ERROR;
- break;
- }
- // not all the buffers are completely read. An I/O is pending
- return WORK_OK;
- }
+ ComDiagsArea *myDiags = NULL;
+ if (!cluster_->read(myDiags, heap_)) {
+if (myDiags) { // some error
+ updateDiagsArea(myDiags);
+ pstate->step_ = ExSeq_ERROR;
+ break;
+}
+// not all the buffers are completely read. An I/O is pending
+return WORK_OK;
+ }
numberOfRowsReturnedBeforeReadOF_ = 0;
pstate->step_ = ExSeq_WORKING_RETURN;
- }
- break;
+}
+break;
// ExSeq_DONE
//
@@ -1477,6 +1478,23 @@ void ExSequenceTcb::updateDiagsArea(ex_queue_entry *
centry)
}
}
}
+
+void ExSequenceTcb::updateDiagsArea(ComDiagsArea *da)
+{
+if (da)
+{
+ if (workAtp_->getDiagsArea())
+ {
+workAtp_->getDiagsArea()->mergeAfter(*da);
+ }
+ else
+ {
+workAtp_->setDiagsArea(da);
+da->incrRefCount();
+ }
+}
+}
+
void ExSequenceTcb::updateDiagsArea( ExeErrorCode rc_)
{
ComDiagsArea *da = workAtp_->getDiagsArea();
@@ -1487,35 +1505,8 @@ void ExSequenceTcb::updateDiagsArea( ExeErrorCode rc_)
}
if (!da->contains((Lng32) -rc_))
{
- char msg[512];
- if(rc_ == EXE_SORT_ERROR)
- {
-char errorMsg[100];
-Lng32 scratchError = 0;
-Lng32 scratchSysError = 0;
-Lng32 scratchSysErrorDetail = 0;
-
-if(clusterDb_)
-{
- clusterDb_->getScratchErrorDetail(scratchError,
- scratchSysError,
- scratchSysErrorDetail,
- errorMsg);
-
- str_sprintf(msg, "Sequence Scratch IO Error occurred. Scratch Error:
%d, System Error: %d, System Error Detail:
[5/5] trafodion git commit: Merge PR 1665 [TRAFODION-3166] enhance 8427 error detail when thrown by sequence operator
Merge PR 1665 [TRAFODION-3166] enhance 8427 error detail when thrown by sequence operator Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/96de4b4c Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/96de4b4c Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/96de4b4c Branch: refs/heads/master Commit: 96de4b4c12227fe212e36accb541bd03fe631bba Parents: d0431cb 6445a49 Author: selvaganesang Authored: Thu Aug 2 18:30:12 2018 + Committer: selvaganesang Committed: Thu Aug 2 18:30:12 2018 + -- core/sql/executor/ExSequence.cpp | 66 +++-- core/sql/executor/ExSequence.h | 1 + core/sql/executor/cluster.cpp| 91 +++ core/sql/executor/cluster.h | 8 +++ 4 files changed, 141 insertions(+), 25 deletions(-) --
[4/5] trafodion git commit: minor update.
minor update.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/6445a493
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/6445a493
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/6445a493
Branch: refs/heads/master
Commit: 6445a4934c3bdaa435a71d4b9e34dbbb5ca63c04
Parents: 3c7212e
Author: Prashant Vasudev
Authored: Wed Aug 1 19:29:35 2018 +
Committer: Prashant Vasudev
Committed: Wed Aug 1 19:29:35 2018 +
--
core/sql/executor/ExSequence.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6445a493/core/sql/executor/ExSequence.cpp
--
diff --git a/core/sql/executor/ExSequence.cpp b/core/sql/executor/ExSequence.cpp
index e66551c..327fb96 100644
--- a/core/sql/executor/ExSequence.cpp
+++ b/core/sql/executor/ExSequence.cpp
@@ -996,7 +996,7 @@ short ExSequenceTcb::work()
ComDiagsArea *myDiags = NULL;
if (!cluster_->flush(myDiags, heap_)) { // flush the buffers
// if no errors this code path is not visited
-if (myDiags)
+if (myDiags != NULL)
{ // some error
updateDiagsArea(myDiags);
pstate->step_ = ExSeq_ERROR;
@@ -1047,7 +1047,7 @@ short ExSequenceTcb::work()
ComDiagsArea *myDiags = NULL;
if (!cluster_->read(myDiags, heap_)) {
-if (myDiags) { // some error
+if (myDiags != NULL) { // some error
updateDiagsArea(myDiags);
pstate->step_ = ExSeq_ERROR;
break;
[3/5] trafodion git commit: changes to address additonal review comments.
changes to address additonal review comments.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/3c7212e9
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/3c7212e9
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/3c7212e9
Branch: refs/heads/master
Commit: 3c7212e9ed48d78c32a9323ab0749dbcf887c1cc
Parents: 0a1bb2a
Author: Prashant Vasudev
Authored: Wed Aug 1 19:25:45 2018 +
Committer: Prashant Vasudev
Committed: Wed Aug 1 19:25:45 2018 +
--
core/sql/executor/ExSequence.cpp | 17 +++--
core/sql/executor/cluster.cpp| 24 ++--
2 files changed, 21 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3c7212e9/core/sql/executor/ExSequence.cpp
--
diff --git a/core/sql/executor/ExSequence.cpp b/core/sql/executor/ExSequence.cpp
index 7ba414a..e66551c 100644
--- a/core/sql/executor/ExSequence.cpp
+++ b/core/sql/executor/ExSequence.cpp
@@ -1481,17 +1481,14 @@ void ExSequenceTcb::updateDiagsArea(ex_queue_entry *
centry)
void ExSequenceTcb::updateDiagsArea(ComDiagsArea *da)
{
-if (da)
+if (workAtp_->getDiagsArea())
+{
+ workAtp_->getDiagsArea()->mergeAfter(*da);
+}
+else
{
- if (workAtp_->getDiagsArea())
- {
-workAtp_->getDiagsArea()->mergeAfter(*da);
- }
- else
- {
-workAtp_->setDiagsArea(da);
-da->incrRefCount();
- }
+ workAtp_->setDiagsArea(da);
+ da->incrRefCount();
}
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/3c7212e9/core/sql/executor/cluster.cpp
--
diff --git a/core/sql/executor/cluster.cpp b/core/sql/executor/cluster.cpp
index 14b150b..e986ad7 100644
--- a/core/sql/executor/cluster.cpp
+++ b/core/sql/executor/cluster.cpp
@@ -1621,7 +1621,9 @@ NABoolean Cluster::flush(ComDiagsArea *, CollHeap
*heap) {
//if rc != EXE_OK then it is error.
if(!flush()) {
if(rc != EXE_OK) {
- da = ComDiagsArea::allocate(heap);
+ if(da == NULL) {
+da = ComDiagsArea::allocate(heap);
+ }
*da << DgSqlCode(-rc);
char msg[512];
@@ -1631,20 +1633,20 @@ NABoolean Cluster::flush(ComDiagsArea *, CollHeap
*heap) {
Lng32 scratchSysError = 0;
Lng32 scratchSysErrorDetail = 0;
-if(clusterDb_) {
+if(clusterDb_ != NULL) {
clusterDb_->getScratchErrorDetail(scratchError,
scratchSysError,
scratchSysErrorDetail,
errorMsg);
- str_sprintf(msg, "Scratch IO Error occurred. Scratch Error: %d,
System Error: %d, System Error Detail: %d, Details: %s",
+ snprintf(msg, sizeof(msg), "Scratch IO Error occurred. Scratch
Error: %d, System Error: %d, System Error Detail: %d, Details: %s",
scratchError, scratchSysError, scratchSysErrorDetail, errorMsg);
}
else {
- str_sprintf(msg, "Scratch IO Error occurred. clusterDb_ is NULL" );
+ snprintf(msg, sizeof(msg), "Scratch IO Error occurred. clusterDb_ is
NULL" );
}
} else {
-str_sprintf(msg, "Cluster Flush Error occurred.");
+snprintf(msg, sizeof(msg), "Cluster Flush Error occurred.");
}
*da << DgString0(msg);
@@ -2378,8 +2380,10 @@ NABoolean Cluster::read(ComDiagsArea *, CollHeap
*heap) {
//if rc != EXE_OK then it is error.
if(!read()) {
if(rc != EXE_OK) {
+ if(da == NULL) {
da = ComDiagsArea::allocate(heap);
- *da << DgSqlCode(-rc);
+ }
+ *da << DgSqlCode(-rc);
char msg[512];
if(rc == EXE_SORT_ERROR) {
@@ -2388,20 +2392,20 @@ NABoolean Cluster::read(ComDiagsArea *, CollHeap
*heap) {
Lng32 scratchSysError = 0;
Lng32 scratchSysErrorDetail = 0;
-if(clusterDb_) {
+if(clusterDb_ != NULL) {
clusterDb_->getScratchErrorDetail(scratchError,
scratchSysError,
scratchSysErrorDetail,
errorMsg);
- str_sprintf(msg, "Cluster::read Scratch IO Error occurred. Scratch
Error: %d, System Error: %d, System Error Detail: %d, Details: %s",
+ snprintf(msg, sizeof(msg), "Cluster::read Scratch IO Error occurred.
Scratch Error: %d, System Error: %d, System Error Detail: %d, Details: %s",
scratchError, scratchSysError, scratchSysErrorDetail, errorMsg);
}
else {
- str_sprintf(msg, "Cluster::read Scratch IO Error occurred.
clusterDb_ is NULL" );
+
[2/3] trafodion git commit: [TRAFODION-2430] RMS enhancements
[TRAFODION-2430] RMS enhancements
RMS now displays 3 numeric values separated by '|' in "Details"
columns in the default output based on the type of stats entry.
These numeric values are VAL2, VAL3, VAL4 of the statistics virtual
table.
Stats Type VAL2 VAL3 VAL4
ROOT_OPER_STATSMessageBytes MessageCount MemoryAllocated
SE_STATS SE_IO_KBytes SE_IO_SumTimeActRowsAccessed
BMO_STATS Scr_IO_Count bmoHeapAllocated ScrFileCount
VAL1 is operCpuTime and TEXT column contains the PID of the process
ExFastExtractTcb is now instrumented with ExHdfsScanStats.
Hdfs scan and access opearations are now properly instrumented with
ExHdfsScanStats
counters.
Lob access is now instrumented and is part of the statistics
entry(ExHdfsScanStats or ExHbaseAccessStats) attached with tcb.
Additionally, the following changes are done
1. Removed obsolete ExLobStats
2. Optimized space usage in RMS shared segments for some of the operators
3. A new class ExStorageEngineStats is now created. This class is
type-defed as ExHbaseAccessStats and ExHdfsScanStats.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/abda16ef
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/abda16ef
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/abda16ef
Branch: refs/heads/master
Commit: abda16efac2a0315cf74de16ec29db24f1280047
Parents: dcae57f
Author: selvaganesang
Authored: Tue Jul 24 15:46:53 2018 +
Committer: selvaganesang
Committed: Tue Jul 24 18:21:00 2018 +
--
core/sql/cli/sqlcli.h | 5 +-
core/sql/executor/ExExeUtil.h | 7 +
core/sql/executor/ExExeUtilGetStats.cpp | 5 +-
core/sql/executor/ExExeUtilLoad.cpp | 94 +++-
core/sql/executor/ExFastTransport.cpp | 21 +-
core/sql/executor/ExFastTransport.h | 9 +
core/sql/executor/ExHbaseAccess.h | 1 -
core/sql/executor/ExHbaseIUD.cpp| 12 +-
core/sql/executor/ExHdfsScan.cpp| 28 +-
core/sql/executor/ExHdfsScan.h | 1 -
core/sql/executor/ExStats.cpp | 740 ++-
core/sql/executor/ExStats.h | 160 ++
core/sql/executor/HBaseClient_JNI.h | 6 +-
core/sql/executor/HdfsClient_JNI.cpp| 5 +
core/sql/executor/OrcFileReader.h | 1 +
core/sql/executor/log4cpp.hdfs.config | 37 --
core/sql/executor/log4j.hdfs.config | 50 --
core/sql/exp/ExpHbaseInterface.h| 1 -
core/sql/exp/ExpLOB.cpp | 8 +
core/sql/exp/ExpLOBaccess.cpp | 42 +-
core/sql/exp/ExpLOBaccess.h | 17 +-
core/sql/exp/ExpLOBenums.h | 2 -
core/sql/exp/ExpLOBinterface.cpp| 70 ++-
core/sql/exp/ExpLOBinterface.h | 19 +-
core/sql/exp/ExpLOBprocess.cpp | 6 +-
core/sql/exp/exp_clause.h | 15 +-
core/sql/exp/exp_fixup.cpp | 2 +-
core/sql/generator/GenExplain.cpp | 26 +-
core/sql/regress/core/FILTERRTS | 1 +
29 files changed, 401 insertions(+), 990 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/abda16ef/core/sql/cli/sqlcli.h
--
diff --git a/core/sql/cli/sqlcli.h b/core/sql/cli/sqlcli.h
index 2bfbfcb..00ae7b2 100644
--- a/core/sql/cli/sqlcli.h
+++ b/core/sql/cli/sqlcli.h
@@ -1028,9 +1028,10 @@ enum SQLSTATS_DESC_STATS_TYPE {
SQLSTATS_DESC_REPLICATOR_STATS = 20,
SQLSTATS_DESC_FAST_EXTRACT_STATS = 21,
SQLSTATS_DESC_REORG_STATS = 22,
+ SQLSTATS_DESC_SE_STATS = 23,
SQLSTATS_DESC_HDFSSCAN_STATS = 23,
- SQLSTATS_DESC_HBASE_ACCESS_STATS = 24,
- SQLSTATS_DESC_PROCESS_STATS = 25
+ SQLSTATS_DESC_HBASE_ACCESS_STATS = 23,
+ SQLSTATS_DESC_PROCESS_STATS = 25,
};
http://git-wip-us.apache.org/repos/asf/trafodion/blob/abda16ef/core/sql/executor/ExExeUtil.h
--
diff --git a/core/sql/executor/ExExeUtil.h b/core/sql/executor/ExExeUtil.h
index 49261a6..435dfb5 100644
--- a/core/sql/executor/ExExeUtil.h
+++ b/core/sql/executor/ExExeUtil.h
@@ -2128,6 +2128,7 @@ private:
GET_PROCESS_STATS_ENTRY_,
FORMAT_AND_RETURN_PROCESS_STATS_,
GET_HBASE_STATS_ENTRY_,
+GET_SE_STATS_ENTRY_ = GET_HBASE_STATS_ENTRY_,
DISPLAY_HBASE_STATS_HEADING_,
FORMAT_AND_RETURN_HBASE_STATS_,
GET_HIVE_STATS_ENTRY_,
@@ -2812,6 +2813,8 @@ public:
virtual short work();
virtual ~ExExeUtilLobExtractTcb();
virtual void freeResources();
+ virtual ExOperStats *doAllocateStatsEntry(CollHeap *heap,
+ComTdb *tdb);
ExExeUtilLobExtractTdb & lobTdb() const
{
@@ -2921,6 +2924,8 @@ public:
virtual short work();
virtual
[3/3] trafodion git commit: Merge PR 1662 [TRAFODION-2430] RMS enhancements
Merge PR 1662 [TRAFODION-2430] RMS enhancements Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/e8da2ec7 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/e8da2ec7 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/e8da2ec7 Branch: refs/heads/master Commit: e8da2ec7d13b83b5f61e1c30ff4ebfcf21a01552 Parents: 994e9eb abda16e Author: selvaganesang Authored: Wed Jul 25 17:48:52 2018 + Committer: selvaganesang Committed: Wed Jul 25 17:48:52 2018 + -- core/sql/cli/sqlcli.h | 5 +- core/sql/executor/ExExeUtil.h | 7 + core/sql/executor/ExExeUtilGetStats.cpp | 5 +- core/sql/executor/ExExeUtilLoad.cpp | 94 +++- core/sql/executor/ExFastTransport.cpp | 21 +- core/sql/executor/ExFastTransport.h | 9 + core/sql/executor/ExHbaseAccess.h | 1 - core/sql/executor/ExHbaseIUD.cpp| 12 +- core/sql/executor/ExHdfsScan.cpp| 28 +- core/sql/executor/ExHdfsScan.h | 1 - core/sql/executor/ExStats.cpp | 740 ++- core/sql/executor/ExStats.h | 160 ++ core/sql/executor/HBaseClient_JNI.h | 6 +- core/sql/executor/HdfsClient_JNI.cpp| 5 + core/sql/executor/OrcFileReader.h | 1 + core/sql/executor/log4cpp.hdfs.config | 37 -- core/sql/executor/log4j.hdfs.config | 50 -- core/sql/exp/ExpHbaseInterface.h| 1 - core/sql/exp/ExpLOB.cpp | 8 + core/sql/exp/ExpLOBaccess.cpp | 42 +- core/sql/exp/ExpLOBaccess.h | 17 +- core/sql/exp/ExpLOBenums.h | 2 - core/sql/exp/ExpLOBinterface.cpp| 70 ++- core/sql/exp/ExpLOBinterface.h | 19 +- core/sql/exp/ExpLOBprocess.cpp | 6 +- core/sql/exp/exp_clause.h | 15 +- core/sql/exp/exp_fixup.cpp | 2 +- core/sql/generator/GenExplain.cpp | 26 +- core/sql/regress/core/FILTERRTS | 1 + 29 files changed, 401 insertions(+), 990 deletions(-) --
[2/2] trafodion git commit: Merge PR 1626 [TRAFODION-3126] Refactored HDFS client implementation should also support alluxio filesystem
Merge PR 1626 [TRAFODION-3126] Refactored HDFS client implementation should also support alluxio filesystem Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/0ebd76e1 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/0ebd76e1 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/0ebd76e1 Branch: refs/heads/master Commit: 0ebd76e196c13052cc0affbbe024bbd8532b4131 Parents: f493a65 2a6cfd1 Author: selvaganesang Authored: Tue Jul 3 02:56:42 2018 + Committer: selvaganesang Committed: Tue Jul 3 02:56:42 2018 + -- core/sql/pom.xml| 6 +++ core/sql/pom.xml.apache | 6 +++ core/sql/pom.xml.hdp| 6 +++ .../main/java/org/trafodion/sql/HDFSClient.java | 47 4 files changed, 56 insertions(+), 9 deletions(-) --
[1/2] trafodion git commit: [TRAFODION-3126] Refactored HDFS client implementation should also support Alluxio file system
Repository: trafodion
Updated Branches:
refs/heads/master f493a6573 -> 0ebd76e19
[TRAFODION-3126] Refactored HDFS client implementation should also support
Alluxio file system
Alluxio doesn't support direct ByteBuffer access. Circumvented
this problem by using non-direct ByteBuffer to read hdfs files
when it belongs to Alluxio file system.
No need to change the default setting of USE_LIBHDFS for Alluxio to work.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/2a6cfd1a
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/2a6cfd1a
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/2a6cfd1a
Branch: refs/heads/master
Commit: 2a6cfd1a24d05e1e243919897a11572e68c14d59
Parents: 82bfb1a
Author: selvaganesang
Authored: Fri Jun 29 21:26:49 2018 +
Committer: selvaganesang
Committed: Fri Jun 29 21:26:49 2018 +
--
core/sql/pom.xml| 6 +++
core/sql/pom.xml.apache | 6 +++
core/sql/pom.xml.hdp| 6 +++
.../main/java/org/trafodion/sql/HDFSClient.java | 47
4 files changed, 56 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/2a6cfd1a/core/sql/pom.xml
--
diff --git a/core/sql/pom.xml b/core/sql/pom.xml
index cd025a1..7b143d9 100644
--- a/core/sql/pom.xml
+++ b/core/sql/pom.xml
@@ -84,6 +84,12 @@
protobuf-java
2.5.0
+
+ org.alluxio
+ alluxio-core-client-runtime
+ compile
+ 1.7.1
+
org.trafodion.sql
http://git-wip-us.apache.org/repos/asf/trafodion/blob/2a6cfd1a/core/sql/pom.xml.apache
--
diff --git a/core/sql/pom.xml.apache b/core/sql/pom.xml.apache
index 938..a8afd33 100644
--- a/core/sql/pom.xml.apache
+++ b/core/sql/pom.xml.apache
@@ -119,6 +119,12 @@
protobuf-java
2.5.0
+
+ org.alluxio
+ alluxio-core-client-runtime
+ compile
+ 1.7.1
+
org.trafodion.sql
http://git-wip-us.apache.org/repos/asf/trafodion/blob/2a6cfd1a/core/sql/pom.xml.hdp
--
diff --git a/core/sql/pom.xml.hdp b/core/sql/pom.xml.hdp
index 5b1216f..52bac2e 100644
--- a/core/sql/pom.xml.hdp
+++ b/core/sql/pom.xml.hdp
@@ -99,6 +99,12 @@
protobuf-java
2.5.0
+
+ org.alluxio
+ alluxio-core-client-runtime
+ compile
+ 1.7.1
+
org.trafodion.sql
http://git-wip-us.apache.org/repos/asf/trafodion/blob/2a6cfd1a/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
--
diff --git a/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
b/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
index 95316d5..d4a697f 100644
--- a/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HDFSClient.java
@@ -87,6 +87,7 @@ public class HDFSClient
private static ExecutorService executorService_ = null;
private static FileSystem defaultFs_ = null;
private static CompressionCodecFactory codecFactory_ = null;
+ private static boolean alluxioNotInstalled_ = false;
private FileSystem fs_ = null;
private int bufNo_;
private int rangeNo_;
@@ -95,6 +96,7 @@ public class HDFSClient
private OutputStream outStream_;
private String filename_;
private ByteBuffer buf_;
+ private ByteBuffer savedBuf_;
private byte[] bufArray_;
private int bufLen_;
private int bufOffset_ = 0;
@@ -126,6 +128,16 @@ public class HDFSClient
catch (IOException ioe) {
throw new RuntimeException("Exception in HDFSClient static block",
ioe);
}
+ try {
+ boolean alluxioFs = defaultFs_ instanceof alluxio.hadoop.FileSystem;
+ }
+ catch (Throwable rte)
+ {
+ // Ignore the exception. It is not needed for alluxio to be installed
+ // for the methods of this class to work if
+ // alluxio filesystem is NOT required
+ alluxioNotInstalled_ = true;
+ }
codecFactory_ = new CompressionCodecFactory(config_);
System.loadLibrary("executor");
}
@@ -142,21 +154,32 @@ public class HDFSClient
HDFSRead()
{
}
-
+
public Object call() throws IOException
{
int bytesRead;
int totalBytesRead = 0;
if (compressed_) {
bufArray_ = new byte[ioByteArraySizeInKB_ * 1024];
- } else
- if (! buf_.hasArray()) {
-try {
- fsdis_.seek(pos_);
-} catch (EOFException e) {
[1/4] trafodion git commit: RMS infrastructure now reads the configured pid Max from /proc/sys/kernel/pid_max but limits it to a maximum of 128K. It can be overridden by "PID_MAX" environment variable
Repository: trafodion
Updated Branches:
refs/heads/master 66499100c -> 82bfb1a22
RMS infrastructure now reads the configured pid Max from
/proc/sys/kernel/pid_max
but limits it to a maximum of 128K. It can be overridden by "PID_MAX"
environment
variable in ms.env.
If the PID_MAX variable is set to 0, 64K is assumed to be configured pid max.
If the PID_MAX variable is set to less than 32K, then 32K is assumed to be
configured pid max.
When a SQL process has a pin greater than the configured pid max, an error
message
"Pid , is higher than the configured pid max " is written to
the SQL log file and disables RMS for those processes. Node won't be brought
down.
"Get Statistics for rms " shows the the configured pid max.
The environment variable to set the size of RMS shared segment size is now
changed to RMS_SHARED_SEG_SIZE_MB.
genms change for controlling pid_max and rms shared segment size
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/e7624aaa
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/e7624aaa
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/e7624aaa
Branch: refs/heads/master
Commit: e7624aaaf8d1cad59186c07686404c652d0eb97b
Parents: 087af70
Author: selvaganesang
Authored: Fri Feb 16 15:56:48 2018 +
Committer: selvaganesang
Committed: Fri Feb 16 15:56:48 2018 +
--
core/sqf/sql/scripts/genms | 8
core/sql/bin/ex_sscp_main.cpp | 2 +-
core/sql/cli/Globals.cpp| 17 ++--
core/sql/cli/sqlcli.h | 1 +
core/sql/common/ComRtUtils.cpp | 23 ++
core/sql/common/ComRtUtils.h| 2 +
core/sql/executor/ExExeUtilGetStats.cpp | 10 +++--
core/sql/executor/ExStats.cpp | 9 +++-
core/sql/executor/ExStats.h | 2 +
core/sql/executor/ex_esp_frag_dir.cpp | 18 ++--
core/sql/regress/core/EXPECTEDRTS | 1 +
core/sql/regress/core/FILTERRTS | 1 +
core/sql/runtimestats/SqlStats.cpp | 64 +---
core/sql/runtimestats/SqlStats.h| 10 +++--
14 files changed, 126 insertions(+), 42 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/e7624aaa/core/sqf/sql/scripts/genms
--
diff --git a/core/sqf/sql/scripts/genms b/core/sqf/sql/scripts/genms
index aa9129a..29ac957 100755
--- a/core/sqf/sql/scripts/genms
+++ b/core/sqf/sql/scripts/genms
@@ -208,6 +208,14 @@ echo "REST_INSTALL_DIR=$restinstalldir"
echo "TRAF_VAR=$TRAF_VAR"
echo "TRAF_CONF=$TRAF_CONF"
+if [[ ! -z "$PID_MAX" ]]; then
+ echo "PID_MAX=$PID_MAX"
+fi
+
+if [[ ! -z "$RMS_SHARED_SEG_SIZE_MB" ]]; then
+ echo "RMS_SHARED_SEG_SIZE_MB=$RMS_SHARED_SEG_SIZE_MB"
+fi
+
echo ""
echo ""
echo "# Added by gensq.pl"
http://git-wip-us.apache.org/repos/asf/trafodion/blob/e7624aaa/core/sql/bin/ex_sscp_main.cpp
--
diff --git a/core/sql/bin/ex_sscp_main.cpp b/core/sql/bin/ex_sscp_main.cpp
index a1f1f2b..40b19e2 100644
--- a/core/sql/bin/ex_sscp_main.cpp
+++ b/core/sql/bin/ex_sscp_main.cpp
@@ -165,7 +165,7 @@ void runServer(Int32 argc, char **argv)
struct tm *nowtm;
long maxSegSize = STATS_MAX_SEG_SIZE;
- char *envSegSize = getenv("MX_RTS_STATS_SEG_SIZE");
+ char *envSegSize = getenv("RMS_SHARED_SEG_SIZE_MB");
if (envSegSize)
{
maxSegSize = (long) str_atoi(envSegSize, str_len(envSegSize));
http://git-wip-us.apache.org/repos/asf/trafodion/blob/e7624aaa/core/sql/cli/Globals.cpp
--
diff --git a/core/sql/cli/Globals.cpp b/core/sql/cli/Globals.cpp
index ed30502..5ecd5c1 100644
--- a/core/sql/cli/Globals.cpp
+++ b/core/sql/cli/Globals.cpp
@@ -176,10 +176,21 @@ void CliGlobals::init( NABoolean espProcess,
cli_globals = this;
int error;
statsGlobals_ = (StatsGlobals *)shareStatsSegment(shmId_);
-if (statsGlobals_ == NULL
- || (statsGlobals_ != NULL &&
-statsGlobals_->getVersion() !=
StatsGlobals::CURRENT_SHARED_OBJECTS_VERSION_))
+NABoolean reportError = FALSE;
+char msg[256];;
+if (statsGlobals_ != NULL && myPin_ >=
statsGlobals_->getConfiguredPidMax())
+ reportError = TRUE;
+if ((statsGlobals_ == NULL)
+ || ((statsGlobals_ != NULL) &&
+((statsGlobals_->getVersion() !=
StatsGlobals::CURRENT_SHARED_OBJECTS_VERSION_) ||
+(myPin_ >= statsGlobals_->getConfiguredPidMax()
{
+ if (reportError) {
+ snprintf(msg, sizeof(msg),
+ "Pid %d,%d is higher than the configured pid max %d",
+ myCpu_, myPin_, statsGlobals_->getConfiguredPidMax());
+ SQLMXLoggingArea::logExecRtInfo(__FILE__, __LINE__, msg,
[3/4] trafodion git commit: [TRAFODION-2963] RMS infrastructure now reads the configured pid Max from /proc/sys/kernel/pid_max
[TRAFODION-2963] RMS infrastructure now reads the configured pid Max from
/proc/sys/kernel/pid_max
Changes to avoid log storm when there is a pid violation
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/0f04ef97
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/0f04ef97
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/0f04ef97
Branch: refs/heads/master
Commit: 0f04ef978472adadc0fad4d534b7ea9515ba2ceb
Parents: a972349
Author: selvaganesang
Authored: Wed Jun 27 23:05:02 2018 +
Committer: selvaganesang
Committed: Wed Jun 27 23:05:02 2018 +
--
core/sql/cli/Globals.cpp | 8 ++--
core/sql/executor/ex_esp_frag_dir.cpp | 8 ++--
core/sql/runtimestats/SqlStats.cpp| 15 +++
core/sql/runtimestats/SqlStats.h | 4
4 files changed, 23 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0f04ef97/core/sql/cli/Globals.cpp
--
diff --git a/core/sql/cli/Globals.cpp b/core/sql/cli/Globals.cpp
index 4e2b144..6f498fb 100644
--- a/core/sql/cli/Globals.cpp
+++ b/core/sql/cli/Globals.cpp
@@ -179,16 +179,12 @@ void CliGlobals::init( NABoolean espProcess,
statsGlobals_ = (StatsGlobals *)shareStatsSegment(shmId_);
NABoolean reportError = FALSE;
char msg[256];;
-if (statsGlobals_ != NULL && myPin_ >=
statsGlobals_->getConfiguredPidMax())
- reportError = TRUE;
if ((statsGlobals_ == NULL)
- || ((statsGlobals_ != NULL) &&
-((statsGlobals_->getVersion() !=
StatsGlobals::CURRENT_SHARED_OBJECTS_VERSION_) ||
-(myPin_ >= statsGlobals_->getConfiguredPidMax()
+ || ((statsGlobals_ != NULL) && (statsGlobals_->getInitError(myPin_,
reportError
{
if (reportError) {
snprintf(msg, sizeof(msg),
- "Pid %d,%d is higher than the configured pid max %d",
+ "Version mismatch or Pid %d,%d is higher than the configured pid max
%d",
myCpu_, myPin_, statsGlobals_->getConfiguredPidMax());
SQLMXLoggingArea::logExecRtInfo(__FILE__, __LINE__, msg, 0);
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0f04ef97/core/sql/executor/ex_esp_frag_dir.cpp
--
diff --git a/core/sql/executor/ex_esp_frag_dir.cpp
b/core/sql/executor/ex_esp_frag_dir.cpp
index 233f952..e0205f0 100644
--- a/core/sql/executor/ex_esp_frag_dir.cpp
+++ b/core/sql/executor/ex_esp_frag_dir.cpp
@@ -103,16 +103,12 @@ ExEspFragInstanceDir::ExEspFragInstanceDir(CliGlobals
*cliGlobals,
tid_ = syscall(SYS_gettid);
NABoolean reportError = FALSE;
char msg[256];;
- if (statsGlobals_ != NULL && pid_ >= statsGlobals_->getConfiguredPidMax())
- reportError = TRUE;
if ((statsGlobals_ == NULL)
- || ((statsGlobals_ != NULL) &&
-((statsGlobals_->getVersion() !=
StatsGlobals::CURRENT_SHARED_OBJECTS_VERSION_) ||
-(pid_ >= statsGlobals_->getConfiguredPidMax()
+ || ((statsGlobals_ != NULL) && (statsGlobals_->getInitError(pid_,
reportError
{
if (reportError) {
snprintf(msg, sizeof(msg),
- "Pid %d,%d is higher than the configured pid max %d",
+ "Version mismatch or Pid %d,%d is higher than the configured pid max
%d",
cpu_, pid_, statsGlobals_->getConfiguredPidMax());
SQLMXLoggingArea::logExecRtInfo(__FILE__, __LINE__, msg, 0);
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0f04ef97/core/sql/runtimestats/SqlStats.cpp
--
diff --git a/core/sql/runtimestats/SqlStats.cpp
b/core/sql/runtimestats/SqlStats.cpp
index dc25b52..3fcf9d3 100644
--- a/core/sql/runtimestats/SqlStats.cpp
+++ b/core/sql/runtimestats/SqlStats.cpp
@@ -74,6 +74,7 @@ StatsGlobals::StatsGlobals(void *baseAddr, short envType,
Lng32 maxSegSize)
, pidToCheck_(0)
, ssmpDumpedTimestamp_(0)
, lobLocks_(NULL)
+ , pidViolationCount_(0)
{
statsHeap_.setSharedMemory();
//Phandle wrapper in porting layer
@@ -1616,6 +1617,20 @@ void StatsGlobals::createMemoryMonitor()
memMonitor_->enableLogger();
}
+NABoolean StatsGlobals::getInitError(pid_t pid, NABoolean )
+{
+ NABoolean retcode = FALSE;
+ reportError = FALSE;
+ if ((getVersion() != StatsGlobals::CURRENT_SHARED_OBJECTS_VERSION_) ||
+(pid >= configuredPidMax_))
+ {
+ retcode = TRUE;
+ if (pidViolationCount_++ < PID_VIOLATION_MAX_COUNT)
+ reportError = TRUE;
+ }
+ return retcode;
+}
+
short getMasterCpu(char *uniqueStmtId, Lng32 uniqueStmtIdLen, char *nodeName,
short maxLen, short )
{
Int32 nodeNumber = 0;
[2/4] trafodion git commit: Merge branch 'master' of github.com:apache/trafodion into trafodion-2963
Merge branch 'master' of github.com:apache/trafodion into trafodion-2963 Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/a9723491 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/a9723491 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/a9723491 Branch: refs/heads/master Commit: a9723491f1c4aadb45f307b3fb46dcfe973d510f Parents: e7624aa 072708f Author: selvaganesang Authored: Wed Jun 27 21:53:37 2018 + Committer: selvaganesang Committed: Wed Jun 27 21:53:37 2018 + -- .rat-excludes |3 +- NOTICE |2 +- RAT_README |3 +- .../jdbc/t4/CONNECTION_CONTEXT_def.java |1 + .../java/org/trafodion/jdbc/t4/Certificate.java |4 +- .../main/java/org/trafodion/jdbc/t4/Cipher.java |8 +- .../trafodion/jdbc/t4/ExtractLobMessage.java| 13 +- .../org/trafodion/jdbc/t4/ExtractLobReply.java | 23 +- .../jdbc/t4/InitializeDialogueMessage.java |3 +- .../trafodion/jdbc/t4/InterfaceConnection.java |7 +- .../trafodion/jdbc/t4/InterfaceResultSet.java | 109 +- .../trafodion/jdbc/t4/InterfaceStatement.java | 54 +- .../main/java/org/trafodion/jdbc/t4/Key.java|8 +- .../org/trafodion/jdbc/t4/MessageDigest.java|2 +- .../main/java/org/trafodion/jdbc/t4/SecPwd.java |2 +- .../java/org/trafodion/jdbc/t4/Security.java|2 +- .../trafodion/jdbc/t4/SecurityException.java| 11 +- .../org/trafodion/jdbc/t4/T4DSProperties.java |3 + .../org/trafodion/jdbc/t4/T4Properties.java | 80 +- .../java/org/trafodion/jdbc/t4/TRANSPORT.java |1 + .../java/org/trafodion/jdbc/t4/TrafT4Blob.java | 11 - .../java/org/trafodion/jdbc/t4/TrafT4Clob.java | 13 - .../java/org/trafodion/jdbc/t4/TrafT4Lob.java | 39 +- .../jdbc/t4/TrafT4PreparedStatement.java| 21 +- .../org/trafodion/jdbc/t4/TrafT4ResultSet.java |8 +- .../org/trafodion/jdbc/t4/TrafT4Statement.java |4 +- .../jdbc_type2/native/SQLMXCommonFunctions.cpp |9 + .../org/apache/trafodion/jdbc/t2/SQLMXDesc.java |2 +- .../jdbc/t2/SQLMXPreparedStatement.java | 24 +- core/conn/odbc/src/odbc/Common/Global.h | 18 +- core/conn/odbc/src/odbc/Common/Listener.h |9 +- .../odbc/Krypton/generated_incs/odbcCommon.h|1 + .../odbc/nsksrvr/Interface/Listener_srvr.cpp| 31 +- .../src/odbc/nsksrvr/Interface/Listener_srvr.h |4 +- .../Interface/linux/Listener_srvr_ps.cpp|7 +- .../nsksrvr/Interface/marshalingsrvr_srvr.cpp | 48 +- .../nsksrvr/Interface/marshalingsrvr_srvr.h |6 +- .../src/odbc/nsksrvr/Interface/odbcs_srvr.cpp | 12 +- .../odbc/nsksrvr/Interface/odbcs_srvr_res.cpp | 18 +- .../src/odbc/nsksrvr/Interface/odbcs_srvr_res.h |6 +- core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 348 +- core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h |3 +- core/conn/odbc/src/odbc/nsksrvr/SrvrMain.cpp| 107 +- core/conn/odbc/src/odbc/nsksrvrcore/Makefile|2 +- .../conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h |5 +- .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp| 366 +- core/conn/trafci/install/Installer.java-tmpl|8 + .../java/org/trafodion/ci/SessionInterface.java |2 + .../odbc/odbcclient/unixcli/cli/chandle.cpp |5 +- .../odbc/odbcclient/unixcli/cli/ctosqlconv.cpp |4 +- .../unixcli/cli/sqlexportfunc_drvr.cpp | 470 +- .../odbcclient/unixcli/cli/sqlexportfunc_drvr.h | 367 ++ core/sqf/commonLogger/CommonLogger.cpp |3 + core/sqf/conf/log4cxx.monitor.trafns.config | 45 + .../export/include/common/evl_sqlog_eventnum.h | 143 +- core/sqf/export/include/seabed/int/thread.inl |3 + core/sqf/export/include/seabed/ms.h |9 + core/sqf/export/include/trafconf/trafconfig.h | 25 +- core/sqf/macros.gmk |9 + core/sqf/monitor/linux/cluster.cxx | 2264 +-- core/sqf/monitor/linux/cluster.h| 90 +- core/sqf/monitor/linux/commaccept.cxx | 168 +- core/sqf/monitor/linux/config.cxx | 416 +- core/sqf/monitor/linux/config.h | 25 +- core/sqf/monitor/linux/device.h |2 + core/sqf/monitor/linux/healthcheck.cxx | 119 +- core/sqf/monitor/linux/healthcheck.h|5 + core/sqf/monitor/linux/internal.h | 99 +- core/sqf/monitor/linux/lnode.cxx| 47 +- core/sqf/monitor/linux/lnode.h |3 +- core/sqf/monitor/linux/localio.h|7 +- core/sqf/monitor/linux/makefile | 79 +- core/sqf/monitor/linux/meas.cxx | 240 + core/sqf/monitor/linux/meas.h
[4/4] trafodion git commit: Merge PR 1449 [TRAFODION-2963] RMS infrastructure now reads the configured pid Max from /proc/sys/kernel/pid_max
Merge PR 1449 [TRAFODION-2963] RMS infrastructure now reads the configured pid Max from /proc/sys/kernel/pid_max Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/82bfb1a2 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/82bfb1a2 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/82bfb1a2 Branch: refs/heads/master Commit: 82bfb1a22fa40b4bdf48d58945f1d66ab74c72f1 Parents: 6649910 0f04ef9 Author: selvaganesang Authored: Fri Jun 29 00:05:36 2018 + Committer: selvaganesang Committed: Fri Jun 29 00:05:36 2018 + -- core/sqf/sql/scripts/genms | 8 +++ core/sql/bin/ex_sscp_main.cpp | 2 +- core/sql/cli/Globals.cpp| 13 +++-- core/sql/cli/sqlcli.h | 1 + core/sql/common/ComRtUtils.cpp | 23 core/sql/common/ComRtUtils.h| 2 + core/sql/executor/ExExeUtilGetStats.cpp | 10 ++-- core/sql/executor/ExStats.cpp | 9 +++- core/sql/executor/ExStats.h | 2 + core/sql/executor/ex_esp_frag_dir.cpp | 14 +++-- core/sql/regress/core/EXPECTEDRTS | 1 + core/sql/regress/core/FILTERRTS | 1 + core/sql/runtimestats/SqlStats.cpp | 79 +++- core/sql/runtimestats/SqlStats.h| 14 +++-- 14 files changed, 137 insertions(+), 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/trafodion/blob/82bfb1a2/core/sql/cli/sqlcli.h --
[2/7] trafodion git commit: [TRAFODION-3110] Refactor LOB access to use the new implementation of HdfsClient
[TRAFODION-3110] Refactor LOB access to use the new implementation of HdfsClient
Used a single CQD USE_LIBHDFS to switch to older implementation of
using libhdfs for both hdfs scan and LOB access. The CQD USE_LIBHDS_SCAN is
retired.
In addition fixed the following:
1. Fixed a memory leak of LOB Heap structures
2. Possible fix for memory corruption at times
3. Avoid unnecessary creation of LOB threads when not needed
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/2113439f
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/2113439f
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/2113439f
Branch: refs/heads/master
Commit: 2113439f3ab46e2d51f933fd66c016d38689437a
Parents: 52f074a
Author: selvaganesang
Authored: Fri Jun 22 16:13:18 2018 +
Committer: selvaganesang
Committed: Fri Jun 22 16:13:18 2018 +
--
core/sql/cli/Cli.cpp| 21
core/sql/cli/SessionDefaults.cpp| 8 +++
core/sql/cli/SessionDefaults.h | 12 +
core/sql/comexe/ComTdb.h| 8 ++-
core/sql/common/NAMemory.cpp| 19 ++--
core/sql/common/NAMemory.h | 2 +
core/sql/executor/HdfsClient_JNI.cpp| 3 +-
core/sql/executor/HdfsClient_JNI.h | 2 -
core/sql/executor/ex_control.cpp| 7 +++
core/sql/executor/ex_globals.cpp| 10 ++--
core/sql/executor/ex_globals.h | 3 +-
core/sql/executor/ex_root.cpp | 2 +-
core/sql/executor/ex_split_bottom.cpp | 4 +-
core/sql/exp/ExpLOB.cpp | 23 +++--
core/sql/exp/ExpLOB.h | 2 +
core/sql/exp/ExpLOBaccess.cpp | 51
core/sql/exp/ExpLOBinterface.cpp| 4 +-
core/sql/generator/GenPreCode.cpp | 4 +-
core/sql/generator/GenRelEnforcer.cpp | 6 ++-
core/sql/generator/GenRelMisc.cpp | 7 +--
core/sql/generator/GenRelScan.cpp | 2 +-
core/sql/sqlcomp/DefaultConstants.h | 9 ++--
core/sql/sqlcomp/nadefaults.cpp | 3 +-
.../main/java/org/trafodion/sql/HDFSClient.java | 13 +++--
24 files changed, 153 insertions(+), 72 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/2113439f/core/sql/cli/Cli.cpp
--
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index d641f6d..b8b9969 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -9466,7 +9466,7 @@ Lng32 SQLCLI_LOBddlInterface
ComDiagsArea & diags = currContext.diags();
ComDiagsArea * myDiags = NULL;
-
+ NABoolean useLibHdfs = currContext.getSessionDefaults()->getUseLibHdfs();
char logBuf[4096];
lobDebugInfo("In LOBddlInterface",0,__LINE__,lobTrace);
ExeCliInterface *cliInterface = NULL;
@@ -9486,6 +9486,7 @@ Lng32 SQLCLI_LOBddlInterface
char * query = new(currContext.exHeap()) char[4096];
char *hdfsServer = new(currContext.exHeap()) char[256];
strcpy(hdfsServer,lobHdfsServer);
+ Int32 rc = 0;
switch (qType)
{
case LOB_CLI_CREATE:
@@ -9525,8 +9526,8 @@ Lng32 SQLCLI_LOBddlInterface
//Initialize LOB interface
-Int32 rc=
ExpLOBoper::initLOBglobal(exLobGlob,currContext.exHeap(),,hdfsServer,hdfsPort);
-if (rc)
+exLobGlob = ExpLOBoper::initLOBglobal(currContext.exHeap(),
, useLibHdfs);
+if (exLobGlob == NULL)
{
cliRC = 0;
ComDiagsArea * da =
@@ -9536,7 +9537,7 @@ Lng32 SQLCLI_LOBddlInterface
getLobErrStr(rc), (char*)getSqlJniErrorStr());
goto non_cli_error_return;
}
-
+
for (Lng32 i = 0; i < numLOBs; i++)
{
// create lob data tables
@@ -9640,8 +9641,8 @@ Lng32 SQLCLI_LOBddlInterface
//above tables .
//Initialize LOB interface
-Int32 rc=
ExpLOBoper::initLOBglobal(exLobGlob,currContext.exHeap(),,hdfsServer,hdfsPort);
-if (rc)
+exLobGlob = ExpLOBoper::initLOBglobal(currContext.exHeap(),
, useLibHdfs);
+if (exLobGlob == NULL)
{
cliRC = 0;
ComDiagsArea * da =
@@ -9689,9 +9690,8 @@ Lng32 SQLCLI_LOBddlInterface
goto error_return;
//Initialize LOB interface
-
-Int32 rc=
ExpLOBoper::initLOBglobal(exLobGlob,currContext.exHeap(),,hdfsServer,hdfsPort);
-if (rc)
+exLobGlob = ExpLOBoper::initLOBglobal(currContext.exHeap(),
, useLibHdfs);
+if (exLobGlob == NULL)
{
cliRC = 0;
ComDiagsArea
[7/7] trafodion git commit: Merge PR 1612 [TRAFODION-3110] Refactor LOB access to use the new implementation of HdfsClient
Merge PR 1612 [TRAFODION-3110] Refactor LOB access to use the new implementation of HdfsClient Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/a6512c05 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/a6512c05 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/a6512c05 Branch: refs/heads/master Commit: a6512c05c1316cb481c3314eff68eaf420729ba1 Parents: 072708f ee44ad9 Author: selvaganesang Authored: Wed Jun 27 23:58:42 2018 + Committer: selvaganesang Committed: Wed Jun 27 23:58:42 2018 + -- core/sql/bin/SqlciErrors.txt| 2 +- core/sql/cli/Cli.cpp| 37 +- core/sql/cli/SessionDefaults.cpp| 8 + core/sql/cli/SessionDefaults.h | 12 + core/sql/comexe/ComTdb.h| 8 +- core/sql/common/NAMemory.cpp| 19 +- core/sql/common/NAMemory.h | 2 + core/sql/executor/ExExeUtilGet.cpp | 46 +-- core/sql/executor/ExExeUtilLoad.cpp | 48 +-- core/sql/executor/ExHdfsScan.cpp| 8 +- core/sql/executor/HdfsClient_JNI.cpp| 209 +- core/sql/executor/HdfsClient_JNI.h | 22 +- core/sql/executor/ex_control.cpp| 7 + core/sql/executor/ex_globals.cpp| 10 +- core/sql/executor/ex_globals.h | 3 +- core/sql/executor/ex_root.cpp | 2 +- core/sql/executor/ex_split_bottom.cpp | 4 +- core/sql/exp/ExpLOB.cpp | 35 +- core/sql/exp/ExpLOB.h | 4 +- core/sql/exp/ExpLOBaccess.cpp | 413 --- core/sql/exp/ExpLOBaccess.h | 12 + core/sql/exp/ExpLOBinterface.cpp| 18 +- core/sql/generator/GenPreCode.cpp | 4 +- core/sql/generator/GenRelEnforcer.cpp | 6 +- core/sql/generator/GenRelExeUtil.cpp| 10 +- core/sql/generator/GenRelMisc.cpp | 7 +- core/sql/generator/GenRelScan.cpp | 2 +- core/sql/regress/executor/EXPECTED130 | 4 +- core/sql/sqlcomp/DefaultConstants.h | 4 +- core/sql/sqlcomp/nadefaults.cpp | 3 +- .../main/java/org/trafodion/sql/HDFSClient.java | 118 +- 31 files changed, 752 insertions(+), 335 deletions(-) -- http://git-wip-us.apache.org/repos/asf/trafodion/blob/a6512c05/core/sql/bin/SqlciErrors.txt --
[6/7] trafodion git commit: [TRAFODION-3110] Refactor LOB access to use the new implementation of HdfsClient
[TRAFODION-3110] Refactor LOB access to use the new implementation of HdfsClient
The CQD USE_LIBHDFS is now made effective for updateLOB and extract LOB utility
commands
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/ee44ad98
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/ee44ad98
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/ee44ad98
Branch: refs/heads/master
Commit: ee44ad98bc6c8857d0147e547c3902ad7d0c34cc
Parents: 457e171
Author: selvaganesang
Authored: Wed Jun 27 20:41:24 2018 +
Committer: selvaganesang
Committed: Wed Jun 27 20:41:24 2018 +
--
core/sql/executor/ExExeUtilLoad.cpp | 19 +--
core/sql/exp/ExpLOBaccess.cpp| 3 ++-
core/sql/generator/GenRelExeUtil.cpp | 10 ++
3 files changed, 13 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/ee44ad98/core/sql/executor/ExExeUtilLoad.cpp
--
diff --git a/core/sql/executor/ExExeUtilLoad.cpp
b/core/sql/executor/ExExeUtilLoad.cpp
index bf4e1a5..960c31f 100644
--- a/core/sql/executor/ExExeUtilLoad.cpp
+++ b/core/sql/executor/ExExeUtilLoad.cpp
@@ -68,6 +68,7 @@ using std::ofstream;
#include "ExpHbaseInterface.h"
#include "ExHbaseAccess.h"
#include "ExpErrorEnums.h"
+#include "ExpLOBaccess.h"
#include "HdfsClient_JNI.h"
///
@@ -2545,11 +2546,7 @@ ExExeUtilLobExtractTcb::ExExeUtilLobExtractTcb
requestTag_ = -1;
lobLoc_[0] = '\0';
- exLobGlobals_ = NULL;
-
- ExpLOBinterfaceInit(exLobGlobals_,(NAHeap
*)glob->getDefaultHeap(),currContext,TRUE,
- lobTdb().getLobHdfsServer(),
- lobTdb().getLobHdfsPort());
+ exLobGlobals_ = ExpLOBoper::initLOBglobal((NAHeap *)glob->getDefaultHeap(),
currContext, exe_util_tdb.useLibHdfs());
}
void ExExeUtilLobExtractTcb::freeResources()
@@ -2584,8 +2581,7 @@ void ExExeUtilLobExtractTcb::freeResources()
lobDataLen_, lobData_,
3, // close
0); // open type not applicable
-
- ExpLOBinterfaceCleanup(exLobGlobals_);
+ ExpLOBoper::deleteLOBglobal(exLobGlobals_, (NAHeap *)(NAHeap
*)getGlobals()->getDefaultHeap());
exLobGlobals_ = NULL;
}
@@ -3324,9 +3320,7 @@ ExExeUtilLobUpdateTcb::ExExeUtilLobUpdateTcb
lobHandle_[0] = '\0';
exLobGlobals_=NULL;
memset(lobLockId_,'\0',LOB_LOCK_ID_SIZE);
- ExpLOBinterfaceInit(exLobGlobals_,(NAHeap
*)glob->getDefaultHeap(),currContext,TRUE,
- lobTdb().getLobHdfsServer(),
- lobTdb().getLobHdfsPort());
+ exLobGlobals_ = ExpLOBoper::initLOBglobal((NAHeap *)glob->getDefaultHeap(),
currContext, exe_util_lobupdate_tdb.useLibHdfs());
}
ExExeUtilLobUpdateTcb::~ExExeUtilLobUpdateTcb()
@@ -3336,10 +3330,7 @@ ExExeUtilLobUpdateTcb::~ExExeUtilLobUpdateTcb()
void ExExeUtilLobUpdateTcb::freeResources()
{
- ContextCli *currContext =
-getGlobals()->castToExExeStmtGlobals()->castToExMasterStmtGlobals()->
-getStatement()->getContext();
- ExpLOBinterfaceCleanup(exLobGlobals_);
+ ExpLOBoper::deleteLOBglobal(exLobGlobals_, (NAHeap
*)getGlobals()->getDefaultHeap());
exLobGlobals_ = NULL;
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/ee44ad98/core/sql/exp/ExpLOBaccess.cpp
--
diff --git a/core/sql/exp/ExpLOBaccess.cpp b/core/sql/exp/ExpLOBaccess.cpp
index 1defb3f..a24018a 100644
--- a/core/sql/exp/ExpLOBaccess.cpp
+++ b/core/sql/exp/ExpLOBaccess.cpp
@@ -1784,7 +1784,8 @@ Ex_Lob_Error ExLob::allocateDesc(ULng32 size, Int64
, Int64 ,
if (! useLibHdfs_) {
if (size == 0) {
- hdfsClientRetcode = HdfsClient::hdfsDeletePath(lobDataFile_.data());
+ // Delete and Create the Hdfs file by passing overwrite to TRUE
+ hdfsClientRetcode = hdfsClient_->hdfsCreate(lobDataFile_.data(),
TRUE, FALSE);
if (hdfsClientRetcode != HDFS_CLIENT_OK)
return LOB_DATA_FILE_WRITE_ERROR;
else {
http://git-wip-us.apache.org/repos/asf/trafodion/blob/ee44ad98/core/sql/generator/GenRelExeUtil.cpp
--
diff --git a/core/sql/generator/GenRelExeUtil.cpp
b/core/sql/generator/GenRelExeUtil.cpp
index dbbbf56..1caa440 100644
--- a/core/sql/generator/GenRelExeUtil.cpp
+++ b/core/sql/generator/GenRelExeUtil.cpp
@@ -3646,6 +3646,8 @@ short ExeUtilLobInfo::codeGen(Generator * generator)
(queue_index)64,
4,
64000);
+
+ exe_util_tdb->setUseLibHdfs(CmpCommon::getDefault(USE_LIBHDFS) == DF_ON);
generator->initTdbFields(exe_util_tdb);
[3/7] trafodion git commit: [TRAFODION-3110] Refactor LOB access to use the new implementation of HdfsClient
[TRAFODION-3110] Refactor LOB access to use the new implementation of HdfsClient
Ensured that the CQD USE_LIBHDFS 'ON' works as expected via the
older implementation
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/99c299b0
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/99c299b0
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/99c299b0
Branch: refs/heads/master
Commit: 99c299b063280c51be36489937569a232526ecd1
Parents: 2113439
Author: selvaganesang
Authored: Fri Jun 22 23:19:39 2018 +
Committer: selvaganesang
Committed: Fri Jun 22 23:19:39 2018 +
--
core/sql/comexe/ComTdb.h| 2 +-
core/sql/executor/ExExeUtilLoad.cpp | 7 ++-
core/sql/executor/ExHdfsScan.cpp| 8
3 files changed, 7 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/trafodion/blob/99c299b0/core/sql/comexe/ComTdb.h
--
diff --git a/core/sql/comexe/ComTdb.h b/core/sql/comexe/ComTdb.h
index 374f10c..5d84977 100644
--- a/core/sql/comexe/ComTdb.h
+++ b/core/sql/comexe/ComTdb.h
@@ -561,7 +561,7 @@ public:
void setProcessLOB(NABoolean v){ v ? flags_ |= PROCESS_LOB: flags_ &=
~PROCESS_LOB;}
- NABoolean useLibHdfs() const { return flags_ & USE_LIBHDFS;}
+ NABoolean useLibHdfs() const { return ((flags_ & USE_LIBHDFS) > 0);}
void setUseLibHdfs(NABoolean v){ v ? flags_ |= USE_LIBHDFS : flags_ &=
~USE_LIBHDFS ;}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/99c299b0/core/sql/executor/ExExeUtilLoad.cpp
--
diff --git a/core/sql/executor/ExExeUtilLoad.cpp
b/core/sql/executor/ExExeUtilLoad.cpp
index 235293c..bdf4b96 100644
--- a/core/sql/executor/ExExeUtilLoad.cpp
+++ b/core/sql/executor/ExExeUtilLoad.cpp
@@ -2546,12 +2546,9 @@ ExExeUtilLobExtractTcb::ExExeUtilLobExtractTcb
lobLoc_[0] = '\0';
exLobGlobals_ = NULL;
- ExpLOBinterfaceInit(exLobGlobals_,currContext->exHeap(),currContext,TRUE,
+ ExpLOBinterfaceInit(exLobGlobals_,(NAHeap
*)glob->getDefaultHeap(),currContext,TRUE,
lobTdb().getLobHdfsServer(),
lobTdb().getLobHdfsPort());
-
-
-
}
void ExExeUtilLobExtractTcb::freeResources()
@@ -3326,7 +3323,7 @@ ExExeUtilLobUpdateTcb::ExExeUtilLobUpdateTcb
lobHandle_[0] = '\0';
exLobGlobals_=NULL;
memset(lobLockId_,'\0',LOB_LOCK_ID_SIZE);
- ExpLOBinterfaceInit(exLobGlobals_,currContext->exHeap(),currContext,TRUE,
+ ExpLOBinterfaceInit(exLobGlobals_,(NAHeap
*)glob->getDefaultHeap(),currContext,TRUE,
lobTdb().getLobHdfsServer(),
lobTdb().getLobHdfsPort());
http://git-wip-us.apache.org/repos/asf/trafodion/blob/99c299b0/core/sql/executor/ExHdfsScan.cpp
--
diff --git a/core/sql/executor/ExHdfsScan.cpp b/core/sql/executor/ExHdfsScan.cpp
index 9c68aa7..df269d5 100644
--- a/core/sql/executor/ExHdfsScan.cpp
+++ b/core/sql/executor/ExHdfsScan.cpp
@@ -46,6 +46,7 @@
#include "ExpORCinterface.h"
#include "ComSmallDefs.h"
#include "HdfsClient_JNI.h"
+#include "ExpLOB.h"
ex_tcb * ExHdfsScanTdb::build(ex_globals * glob)
{
@@ -374,10 +375,9 @@ ex_tcb_private_state *ExHdfsScanTcb::allocatePstates(
Int32 ExHdfsScanTcb::fixup()
{
lobGlob_ = NULL;
-
- ExpLOBinterfaceInit
-(lobGlob_, (NAHeap
*)getGlobals()->getDefaultHeap(),getGlobals()->castToExExeStmtGlobals()->getContext(),TRUE,
hdfsScanTdb().hostName_,hdfsScanTdb().port_);
-
+ lobGlob_ = ExpLOBoper::initLOBglobal((NAHeap
*)getGlobals()->getDefaultHeap(),
+
getGlobals()->castToExExeStmtGlobals()->getContext(),
+ useLibhdfsScan_);
return 0;
}
[4/7] trafodion git commit: Merge branch 'master' of github.com:apache/trafodion into trafodion_2917_1
Merge branch 'master' of github.com:apache/trafodion into trafodion_2917_1 Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/8c61fe70 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/8c61fe70 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/8c61fe70 Branch: refs/heads/master Commit: 8c61fe707979010debbc8fedb8becf6f754db581 Parents: 99c299b c0a125e Author: selvaganesang Authored: Sat Jun 23 00:37:23 2018 + Committer: selvaganesang Committed: Sat Jun 23 00:37:23 2018 + -- .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp| 135 +- core/sqf/commonLogger/CommonLogger.cpp |3 + core/sqf/conf/log4cxx.monitor.trafns.config | 45 + .../export/include/common/evl_sqlog_eventnum.h | 129 +- core/sqf/export/include/seabed/ms.h |9 + core/sqf/export/include/trafconf/trafconfig.h | 25 +- core/sqf/monitor/linux/cluster.cxx | 1974 +++ core/sqf/monitor/linux/cluster.h| 74 +- core/sqf/monitor/linux/commaccept.cxx | 60 +- core/sqf/monitor/linux/config.cxx | 416 +++- core/sqf/monitor/linux/config.h | 25 +- core/sqf/monitor/linux/device.h |2 + core/sqf/monitor/linux/healthcheck.cxx | 119 +- core/sqf/monitor/linux/healthcheck.h|5 + core/sqf/monitor/linux/internal.h | 99 +- core/sqf/monitor/linux/lnode.cxx| 47 +- core/sqf/monitor/linux/lnode.h |3 +- core/sqf/monitor/linux/localio.h|7 +- core/sqf/monitor/linux/makefile | 79 +- core/sqf/monitor/linux/meas.cxx | 240 ++ core/sqf/monitor/linux/meas.h | 75 + core/sqf/monitor/linux/mlio.cxx | 28 +- core/sqf/monitor/linux/mlio.h |2 + core/sqf/monitor/linux/monitor.cxx | 849 +-- core/sqf/monitor/linux/monitor.h| 16 + core/sqf/monitor/linux/monlogging.h |2 + core/sqf/monitor/linux/monmemlog.cxx| 11 + core/sqf/monitor/linux/monsonar.h | 18 + core/sqf/monitor/linux/montrace.cxx | 24 +- core/sqf/monitor/linux/montrace.h | 44 +- core/sqf/monitor/linux/msgdef.h | 159 ++ core/sqf/monitor/linux/nameserver.cxx | 1120 + core/sqf/monitor/linux/nameserver.h | 74 + core/sqf/monitor/linux/notice.cxx | 199 +- core/sqf/monitor/linux/notice.h |7 + core/sqf/monitor/linux/nscluster.cxx| 40 + core/sqf/monitor/linux/nscommaccept.cxx | 28 + core/sqf/monitor/linux/nscommacceptmon.cxx | 907 +++ core/sqf/monitor/linux/nscommacceptmon.h| 79 + core/sqf/monitor/linux/nsconfig.cxx | 28 + core/sqf/monitor/linux/nshealthcheck.cxx| 28 + core/sqf/monitor/linux/nslnode.cxx | 28 + core/sqf/monitor/linux/nsmonitor.cxx| 28 + core/sqf/monitor/linux/nsmontrace.cxx | 28 + core/sqf/monitor/linux/nspnode.cxx | 28 + core/sqf/monitor/linux/nsprocess.cxx| 132 + core/sqf/monitor/linux/nsredirector.cxx | 28 + core/sqf/monitor/linux/nsreplicate.cxx | 28 + core/sqf/monitor/linux/nsreqdelproc.cxx | 191 ++ core/sqf/monitor/linux/nsreqnewproc.cxx | 180 ++ core/sqf/monitor/linux/nsreqprocinfo.cxx| 28 + core/sqf/monitor/linux/nsreqprocinfons.cxx | 288 +++ core/sqf/monitor/linux/nsreqqueue.cxx | 129 + core/sqf/monitor/linux/nsreqshutdown.cxx| 110 + core/sqf/monitor/linux/nsreqstart.cxx | 130 + core/sqf/monitor/linux/nsreqstop.cxx| 124 + core/sqf/monitor/linux/nsreqworker.cxx | 28 + core/sqf/monitor/linux/nstype.h | 28 + core/sqf/monitor/linux/pnode.cxx| 737 +- core/sqf/monitor/linux/pnode.h | 61 +- core/sqf/monitor/linux/process.cxx | 1495 ++-- core/sqf/monitor/linux/process.h| 109 +- core/sqf/monitor/linux/pstartd.cxx |1 + core/sqf/monitor/linux/ptpclient.cxx| 1102 + core/sqf/monitor/linux/ptpclient.h | 98 + core/sqf/monitor/linux/ptpcommaccept.cxx| 444 core/sqf/monitor/linux/ptpcommaccept.h | 62 + core/sqf/monitor/linux/redirector.cxx | 100 +- core/sqf/monitor/linux/redirector.h |2 + core/sqf/monitor/linux/replicate.cxx| 442 +++- core/sqf/monitor/linux/replicate.h | 75 + core/sqf/monitor/linux/reqdump.cxx | 96 +- core/sqf/monitor/linux/reqevent.cxx | 121 +-
