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 2018/11/20 23:15:55 UTC
[3/5] trafodion git commit: print all error message but one bad
record associated
print all error message but one bad record associated
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/4c18d9d4
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/4c18d9d4
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/4c18d9d4
Branch: refs/heads/master
Commit: 4c18d9d406aec2a410021d04de9bbfbfe3e03321
Parents: 3c9cc94
Author: SuJinpei <87...@qq.com>
Authored: Thu Nov 15 12:50:19 2018 +0800
Committer: SuJinpei <87...@qq.com>
Committed: Tue Nov 20 12:57:01 2018 +0800
----------------------------------------------------------------------
core/conn/odb/src/odb.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/4c18d9d4/core/conn/odb/src/odb.c
----------------------------------------------------------------------
diff --git a/core/conn/odb/src/odb.c b/core/conn/odb/src/odb.c
index 8e2593f..e0b8e95 100755
--- a/core/conn/odb/src/odb.c
+++ b/core/conn/odb/src/odb.c
@@ -10198,22 +10198,22 @@ static int Oloadbuff(int eid)
/* Ok, now we have an error message (Otxt), a five char SQLState (Ostate),
* a native error code (Onative) and the rowset row number (Orown). Let's
* print everything to stderr. */
- if (tLastRow != Orown) {
- tLastRow = Orown;
- fprintf(stderr, "[%d] odb [Oloadbuff(%d)] - Error loading row %lu (State: %s, Native %ld)\n%s\n",
- tid, __LINE__, (unsigned long)Orown + etab[eid].nbs, (char *)Ostate, (long)Onative, (char *)Otxt);
- if (type == 'C') { /* 'C' thread */
- if (etab[eid].fdmp) { /* dump ODBC buffer */
- MutexLock(&etab[gpar].pmutex);
- fprintf(etab[eid].fdmp, "[%d] odb [Oloadbuff(%d)] - Error loading row %lu (State: %s, Native %ld)\n%s\n",
- tid, __LINE__, (unsigned long)Orown + etab[eid].nbs, (char *)Ostate, (long)Onative, (char *)Otxt);
- fprintf(etab[eid].fdmp, "[%d] Dumping row %lu in a block of %zu rows. ODBC row length = %zu\n",
- tid, (unsigned long)Orown, etab[eid].ar, etab[par].s);
- dumpbuff(etab[eid].fdmp, tid, (unsigned char *)(etab[eid].Orowsetl + (Orown - 1) * etab[par].s), etab[par].s, 0);
- MutexUnlock(&etab[gpar].pmutex);
- }
+ fprintf(stderr, "[%d] odb [Oloadbuff(%d)] - Error loading row %lu (State: %s, Native %ld)\n%s\n",
+ tid, __LINE__, (unsigned long)Orown + etab[eid].nbs, (char *)Ostate, (long)Onative, (char *)Otxt);
+ if (type == 'C') { /* 'C' thread */
+ if (etab[eid].fdmp) { /* dump ODBC buffer */
+ MutexLock(&etab[gpar].pmutex);
+ fprintf(etab[eid].fdmp, "[%d] odb [Oloadbuff(%d)] - Error loading row %lu (State: %s, Native %ld)\n%s\n",
+ tid, __LINE__, (unsigned long)Orown + etab[eid].nbs, (char *)Ostate, (long)Onative, (char *)Otxt);
+ fprintf(etab[eid].fdmp, "[%d] Dumping row %lu in a block of %zu rows. ODBC row length = %zu\n",
+ tid, (unsigned long)Orown, etab[eid].ar, etab[par].s);
+ dumpbuff(etab[eid].fdmp, tid, (unsigned char *)(etab[eid].Orowsetl + (Orown - 1) * etab[par].s), etab[par].s, 0);
+ MutexUnlock(&etab[gpar].pmutex);
}
- else { /* either multi ('L') or single ('l') threaded loaders */
+ }
+ else { /* either multi ('L') or single ('l') threaded loaders */
+ if (tLastRow != Orown) { /* ensure no duplicated rows in bad file */
+ tLastRow = Orown;
prec('L', (unsigned char *)(etab[eid].Orowsetl + etab[par].s*(Orown - 1)), eid);
}
}