Browse Source

ckdb - completely ignore dup shares, since it can stop workmarker processing

master
kanoi 8 years ago
parent
commit
8ed2003afc
  1. 2
      src/ckdb.h
  2. 4
      src/ckdb_dbio.c

2
src/ckdb.h

@ -58,7 +58,7 @@
#define DB_VLOCK "1" #define DB_VLOCK "1"
#define DB_VERSION "1.0.7" #define DB_VERSION "1.0.7"
#define CKDB_VERSION DB_VERSION"-2.509" #define CKDB_VERSION DB_VERSION"-2.510"
#define WHERE_FFL " - from %s %s() line %d" #define WHERE_FFL " - from %s %s() line %d"
#define WHERE_FFL_HERE __FILE__, __func__, __LINE__ #define WHERE_FFL_HERE __FILE__, __func__, __LINE__

4
src/ckdb_dbio.c

@ -4074,9 +4074,13 @@ bool shares_db(PGconn *conn, K_ITEM *s_item)
res = PQexecParams(conn, ins, par, NULL, (const char **)params, NULL, NULL, 0, CKPQ_WRITE); res = PQexecParams(conn, ins, par, NULL, (const char **)params, NULL, NULL, 0, CKPQ_WRITE);
rescode = PQresultStatus(res); rescode = PQresultStatus(res);
if (!PGOK(rescode)) { if (!PGOK(rescode)) {
// If the share is already in the db ignore the error
char *code = PQresultErrorField(res, PG_DIAG_SQLSTATE);
if (!code || strcmp(code, SQL_UNIQUE_VIOLATION)) {
PGLOGERR("Insert", rescode, conn); PGLOGERR("Insert", rescode, conn);
goto unparam; goto unparam;
} }
}
ok = true; ok = true;
unparam: unparam:

Loading…
Cancel
Save