You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2018/02/02 04:00:52 UTC
[1/3] trafodion git commit: fix trafodion-2939
Repository: trafodion
Updated Branches:
refs/heads/master b2717ecbe -> 6ab2cb933
fix trafodion-2939
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/0d6ce6f6
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/0d6ce6f6
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/0d6ce6f6
Branch: refs/heads/master
Commit: 0d6ce6f6904f1e528e5502bbd51c013be573e6e9
Parents: 622e67b
Author: SuJinpei <87...@qq.com>
Authored: Thu Feb 1 14:57:23 2018 +0800
Committer: SuJinpei <87...@qq.com>
Committed: Thu Feb 1 14:57:23 2018 +0800
----------------------------------------------------------------------
core/conn/odb/src/odb.c | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/0d6ce6f6/core/conn/odb/src/odb.c
----------------------------------------------------------------------
diff --git a/core/conn/odb/src/odb.c b/core/conn/odb/src/odb.c
index 5f8db45..211623e 100755
--- a/core/conn/odb/src/odb.c
+++ b/core/conn/odb/src/odb.c
@@ -5494,6 +5494,8 @@ static void etabadd(char type, char *run, int id)
if ( etab[no].ps ){
etab[no].TotalMaxRecords = etab[no].mr;
etab[no].mr /= etab[no].ps; /* each thread will get a portion of the max record to fetch */
+ if (etab[0].r > etab[0].mr) /* rowset size should not exceeds the max size */
+ etab[0].r = etab[0].mr;
}
strmcpy(tabn, etab[no].src, sizeof(tabn));
if ( !SQL_SUCCEEDED(Oret=SQLAllocHandle(SQL_HANDLE_STMT, Oc, &Os))){
[2/3] trafodion git commit: little improvement
Posted by su...@apache.org.
little improvement
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/5cd19f67
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/5cd19f67
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/5cd19f67
Branch: refs/heads/master
Commit: 5cd19f67339ed8a3595266cc6ac921a476b7c647
Parents: 0d6ce6f
Author: SuJinpei <87...@qq.com>
Authored: Thu Feb 1 15:03:08 2018 +0800
Committer: SuJinpei <87...@qq.com>
Committed: Thu Feb 1 15:03:08 2018 +0800
----------------------------------------------------------------------
core/conn/odb/src/odb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/5cd19f67/core/conn/odb/src/odb.c
----------------------------------------------------------------------
diff --git a/core/conn/odb/src/odb.c b/core/conn/odb/src/odb.c
index 211623e..fa3e732 100755
--- a/core/conn/odb/src/odb.c
+++ b/core/conn/odb/src/odb.c
@@ -5491,7 +5491,7 @@ static void etabadd(char type, char *run, int id)
}
} else { /* not a load job */
etab[no].k = no; /* record grandparent for copy/diff ops */
- if ( etab[no].ps ){
+ if ( etab[no].ps > 1 ){
etab[no].TotalMaxRecords = etab[no].mr;
etab[no].mr /= etab[no].ps; /* each thread will get a portion of the max record to fetch */
if (etab[0].r > etab[0].mr) /* rowset size should not exceeds the max size */
[3/3] trafodion git commit: Merge [TRAFODION-2939] PR-1433 odb copied
data exceeds the max size specified by max option when copying data from
oracle to Trafodion
Posted by su...@apache.org.
Merge [TRAFODION-2939] PR-1433 odb copied data exceeds the max size specified by max option when copying data from oracle to Trafodion
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/6ab2cb93
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/6ab2cb93
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/6ab2cb93
Branch: refs/heads/master
Commit: 6ab2cb93392a167d822c9d313c558f336ec65b59
Parents: b2717ec 5cd19f6
Author: Suresh Subbiah <su...@apache.org>
Authored: Fri Feb 2 04:00:37 2018 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Fri Feb 2 04:00:37 2018 +0000
----------------------------------------------------------------------
core/conn/odb/src/odb.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------