You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/07/25 16:28:10 UTC
[1/4] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into sean_traf
Repository: incubator-trafodion
Updated Branches:
refs/heads/master f444869dd -> a82b4e323
Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d0490464
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d0490464
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d0490464
Branch: refs/heads/master
Commit: d049046439cb3dd350fb35437634265be5280ae6
Parents: 21d5cc4 825276e
Author: Sean Broeder <sb...@edev06.esgyn.local>
Authored: Thu Jul 21 21:27:46 2016 +0000
Committer: Sean Broeder <sb...@edev06.esgyn.local>
Committed: Thu Jul 21 21:27:46 2016 +0000
----------------------------------------------------------------------
.../transactional/TransactionManager.java | 29 +-
.../java/org/trafodion/dtm/HBaseTxClient.java | 9 +-
core/sql/bin/SqlciErrors.txt | 3 +-
core/sql/executor/ExExeUtilLoad.cpp | 2 +-
core/sql/executor/ExFastTransport.cpp | 2 -
core/sql/executor/ExHbaseAccess.cpp | 26 +-
core/sql/executor/ExHbaseAccess.h | 4 +-
core/sql/executor/ExHbaseIUD.cpp | 15 +-
core/sql/executor/ExHdfsScan.cpp | 17 +-
core/sql/executor/ExHdfsScan.h | 1 +
core/sql/executor/SequenceFileReader.cpp | 263 ++++++++-----------
core/sql/exp/ExpErrorEnums.h | 1 +
core/sql/regress/hive/EXPECTED018 | 8 +
core/sql/regress/hive/FILTER018 | 2 +
14 files changed, 198 insertions(+), 184 deletions(-)
----------------------------------------------------------------------
[4/4] incubator-trafodion git commit: Merge [TRAFODION-2125] PR 616
ID request times out to idtmsrv process
Posted by db...@apache.org.
Merge [TRAFODION-2125] PR 616 ID request times out to idtmsrv process
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a82b4e32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a82b4e32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a82b4e32
Branch: refs/heads/master
Commit: a82b4e3231daac8e8b6551d11c2cf8ec6dc2f69b
Parents: f444869 08d6309
Author: Dave Birdsall <db...@apache.org>
Authored: Mon Jul 25 16:25:48 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Mon Jul 25 16:25:48 2016 +0000
----------------------------------------------------------------------
.../hbase/client/transactional/RMInterface.java | 4 +-
core/sqf/src/seatrans/tm/hbasetmlib2/idtm.cpp | 2 +
.../src/seatrans/tm/hbasetmlib2/idtmclicom.h | 138 +++++++++++--------
3 files changed, 84 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
[2/4] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into sean_traf
Posted by db...@apache.org.
Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/dee8448b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/dee8448b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/dee8448b
Branch: refs/heads/master
Commit: dee8448b14c38e2a97c6c538a958cec1824bb421
Parents: d049046 63b0628
Author: Sean Broeder <sb...@edev06.esgyn.local>
Authored: Fri Jul 22 18:16:46 2016 +0000
Committer: Sean Broeder <sb...@edev06.esgyn.local>
Committed: Fri Jul 22 18:16:46 2016 +0000
----------------------------------------------------------------------
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 2 +-
core/sqf/sql/scripts/sqcheck | 2 +-
core/sql/executor/ex_root.cpp | 6 +-----
docs/jdbct4ref_guide/src/asciidoc/_chapters/introduction.adoc | 2 +-
docs/load_transform/src/asciidoc/index.adoc | 1 +
docs/messages_guide/src/asciidoc/_chapters/introduction.adoc | 2 +-
docs/odb_user/src/asciidoc/_chapters/about.adoc | 2 +-
7 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[3/4] incubator-trafodion git commit: [TRAFODION-2125] ID request
times out to idtmsrv process
Posted by db...@apache.org.
[TRAFODION-2125] ID request times out to idtmsrv process
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/08d6309a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/08d6309a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/08d6309a
Branch: refs/heads/master
Commit: 08d6309ad6b683527ef6d23fd1f04cf4add2de65
Parents: dee8448
Author: Sean Broeder <sb...@edev06.esgyn.local>
Authored: Fri Jul 22 18:25:20 2016 +0000
Committer: Sean Broeder <sb...@edev06.esgyn.local>
Committed: Fri Jul 22 18:25:20 2016 +0000
----------------------------------------------------------------------
.../hbase/client/transactional/RMInterface.java | 4 +-
core/sqf/src/seatrans/tm/hbasetmlib2/idtm.cpp | 2 +
.../src/seatrans/tm/hbasetmlib2/idtmclicom.h | 138 +++++++++++--------
3 files changed, 84 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d6309a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/RMInterface.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/RMInterface.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/RMInterface.java
index dc3e140..e1740c4 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/RMInterface.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/RMInterface.java
@@ -106,7 +106,7 @@ public class RMInterface {
}
private IdTm idServer;
- private static final int ID_TM_SERVER_TIMEOUT = 1000;
+ private static final int ID_TM_SERVER_TIMEOUT = 1000; // 1 sec
public enum AlgorithmType {
MVCC, SSCC
@@ -166,7 +166,7 @@ public class RMInterface {
IdTmId startId;
try {
startId = new IdTmId();
- if (LOG.isTraceEnabled()) LOG.trace("registerTransaction getting new startId");
+ if (LOG.isTraceEnabled()) LOG.trace("registerTransaction getting new startId with timeout " + ID_TM_SERVER_TIMEOUT);
idServer.id(ID_TM_SERVER_TIMEOUT, startId);
if (LOG.isTraceEnabled()) LOG.trace("registerTransaction idServer.id returned: " + startId.val);
} catch (IdTmException exc) {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d6309a/core/sqf/src/seatrans/tm/hbasetmlib2/idtm.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/idtm.cpp b/core/sqf/src/seatrans/tm/hbasetmlib2/idtm.cpp
index 180dae8..924b1cb 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/idtm.cpp
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/idtm.cpp
@@ -173,6 +173,8 @@ jint Java_org_apache_hadoop_hbase_regionserver_transactional_IdTm_native_1id(JNI
jclass lv_id_class;
jfieldID lv_id_val;
+ if (gv_verbose)
+ printf("cli: id() timeout=%d\n", (int)j_timeout);
lv_ferr = do_init(pp_j_env);
lv_id = 0;
if (lv_ferr == XZFIL_ERR_OK) {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/08d6309a/core/sqf/src/seatrans/tm/hbasetmlib2/idtmclicom.h
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/idtmclicom.h b/core/sqf/src/seatrans/tm/hbasetmlib2/idtmclicom.h
index b83aa18..7cc264e 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/idtmclicom.h
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/idtmclicom.h
@@ -68,6 +68,7 @@ static int do_link(SB_Phandle_Type *pp_phandle,
long pv_rep_tag,
size_t pv_rep_len) {
bool lv_break_done;
+ bool lv_wait_done;
int lv_ferr;
int lv_lerr;
int lv_msgid;
@@ -102,77 +103,95 @@ static int do_link(SB_Phandle_Type *pp_phandle,
0, // xmitclass
BMSG_LINK_LDONEQ); // linkopts
if (lv_ferr == XZFIL_ERR_OK) {
- lv_timeout_tics = pv_timeout / 10; // ms -> tics
+ if (pv_timeout == -1){
+ lv_timeout_tics = pv_timeout; // no timeout
+ }
+ else{
+ lv_timeout_tics = pv_timeout / 10; // ms -> tics
+ }
lv_break_done = false;
- lv_lerr = XWAIT(LDONE, lv_timeout_tics);
- if (lv_lerr & LDONE) {
- lv_lerr = BMSG_LISTEN_((short *) &lv_sre, // sre
- BLISTEN_ALLOW_LDONEM, // listenopts
- 0); // listenertag
- if (lv_lerr == XSRETYPE_LDONE) {
- if (lv_sre.sre_linkTag != (SB_Tag_Type) pp_req) {
- if (gv_verbose)
- printf("cli: BMSG_LISTEN_ tag=0x%lx, expected tag=0x%lx\n",
- lv_sre.sre_linkTag, (SB_Tag_Type) pp_req);
- assert(lv_sre.sre_linkTag == (SB_Tag_Type) pp_req);
- }
- lv_break_done = true;
- lv_ferr = BMSG_BREAK_(lv_msgid,
- lv_results.u.s,
- pp_phandle);
- if (gv_verbose)
- printf("cli: BMSG_BREAK_ ferr=%d\n", lv_ferr);
- switch (lv_ferr) {
- case XZFIL_ERR_PATHDOWN:
+ lv_wait_done = false;
+ do {
+ lv_lerr = XWAIT(LDONE, lv_timeout_tics);
+ if (gv_verbose)
+ printf("cli: XWAIT ret=%d\n", lv_lerr);
+ if (lv_lerr & LDONE) {
+ lv_lerr = BMSG_LISTEN_((short *) &lv_sre, // sre
+ BLISTEN_ALLOW_LDONEM, // listenopts
+ 0); // listenertag
+ if (lv_lerr == XSRETYPE_LDONE) {
+ if (lv_sre.sre_linkTag != (SB_Tag_Type) pp_req) {
+ if (gv_verbose)
+ printf("cli: BMSG_LISTEN_ tag=0x%lx, expected tag=0x%lx\n",
+ lv_sre.sre_linkTag, (SB_Tag_Type) pp_req);
+ assert(lv_sre.sre_linkTag == (SB_Tag_Type) pp_req);
+ }
+ lv_break_done = true;
+ lv_wait_done = true;
+ lv_ferr = BMSG_BREAK_(lv_msgid,
+ lv_results.u.s,
+ pp_phandle);
+ if (gv_verbose)
+ printf("cli: BMSG_BREAK_ ferr=%d\n", lv_ferr);
+ switch (lv_ferr) {
+ case XZFIL_ERR_PATHDOWN:
if (gv_verbose)
printf("cli: sleeping\n");
sleep(1);
lv_relink = true;
break;
- default:
+ default:
break;
- }
- } else {
- if (gv_verbose)
+ }
+ } else {
+ if (gv_verbose)
printf("cli: BMSG_LISTEN_ did not return LDONE, ret=%d\n", lv_lerr);
- }
- } else {
- if (gv_verbose)
- printf("cli: XWAIT timedout\n");
- }
- if (!lv_break_done) {
- lv_ferr = BMSG_ABANDON_(lv_msgid); // cancel
- if (gv_verbose)
- printf("cli: BMSG_ABANDON_ ret=%d\n", lv_ferr);
- lv_ferr = XZFIL_ERR_TIMEDOUT;
- }
- if (lv_ferr == XZFIL_ERR_OK) {
- if (pp_rep->iv_rep_type != pv_rep_type) {
- if (gv_verbose)
- printf("cli: rep-type=%d, expecting rep-type=%d, SETTING FSERR\n",
- pp_rep->iv_rep_type, pv_rep_type);
- lv_ferr = XZFIL_ERR_FSERR;
- } else if (pp_rep->iv_rep_tag != pv_rep_tag) {
- if (gv_verbose)
+ if (lv_lerr == BSRETYPE_NOWORK){
+ if (gv_verbose)
+ printf("cli: BMSG_LISTEN_ returned BSRETYPE_NOWORK, retrying XWAIT\n");
+ continue;
+ }
+ }
+ } else {
+ if (gv_verbose)
+ printf("cli: XWAIT timedout, ret=%d\n", lv_lerr);
+ lv_wait_done = true;
+ }
+ if (!lv_break_done) {
+ lv_ferr = BMSG_ABANDON_(lv_msgid); // cancel
+ if (gv_verbose)
+ printf("cli: BMSG_ABANDON_ ret=%d\n", lv_ferr);
+ lv_ferr = XZFIL_ERR_TIMEDOUT;
+ }
+ if (lv_ferr == XZFIL_ERR_OK) {
+ if (pp_rep->iv_rep_type != pv_rep_type) {
+ if (gv_verbose)
+ printf("cli: rep-type=%d, expecting rep-type=%d, SETTING FSERR\n",
+ pp_rep->iv_rep_type, pv_rep_type);
+ lv_ferr = XZFIL_ERR_FSERR;
+ } else if (pp_rep->iv_rep_tag != pv_rep_tag) {
+ if (gv_verbose)
printf("cli: rep-tag=0x%lx, expecting rep-tag=0x%lx, SETTING FSERR\n",
- pp_rep->iv_rep_tag, pv_rep_tag);
- lv_ferr = XZFIL_ERR_FSERR;
- } else if (pp_rep->iv_rep_len != (int) pv_rep_len) {
- if (gv_verbose)
+ pp_rep->iv_rep_tag, pv_rep_tag);
+ lv_ferr = XZFIL_ERR_FSERR;
+ } else if (pp_rep->iv_rep_len != (int) pv_rep_len) {
+ if (gv_verbose)
printf("cli: rep-len=%d, expecting rep-len=%d, SETTING FSERR\n",
- pp_rep->iv_rep_len, (int) pv_rep_len);
- lv_ferr = XZFIL_ERR_FSERR;
- }
- }
- } else {
- if (gv_verbose)
+ pp_rep->iv_rep_len, (int) pv_rep_len);
+ lv_ferr = XZFIL_ERR_FSERR;
+ }
+ }
+ } while (! lv_wait_done);
+
+ } else {
+ if (gv_verbose)
printf("cli: BMSG_LINK_ ret=%d\n", lv_ferr);
- }
- } while (lv_relink);
- if (gv_verbose)
+ }
+ } while (lv_relink);
+ if (gv_verbose)
printf("cli: do_link EXIT ret=%d\n", lv_ferr);
- return lv_ferr;
+ return lv_ferr;
}
//
@@ -208,6 +227,9 @@ static int do_cli_id(SB_Phandle_Type *pp_phandle, int pv_timeout, long *pp_id) {
GID_Rep lv_rep;
GID_Req lv_req;
+ if (gv_verbose)
+ printf("cli: get id with timeout %d\n", pv_timeout);
+
init_req(&lv_req, GID_REQ_ID, sizeof(lv_req.u.iv_id));
init_rep(&lv_rep);
lv_ferr = do_link(pp_phandle,