Browse Source

ckdb - sharesummaries can't be deleted since they are no longer in the DB

master
kanoi 10 years ago
parent
commit
a128c70dbe
  1. 2
      src/ckdb.h
  2. 12
      src/ckdb_dbio.c

2
src/ckdb.h

@ -55,7 +55,7 @@
#define DB_VLOCK "1" #define DB_VLOCK "1"
#define DB_VERSION "1.0.0" #define DB_VERSION "1.0.0"
#define CKDB_VERSION DB_VERSION"-1.103" #define CKDB_VERSION DB_VERSION"-1.104"
#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__

12
src/ckdb_dbio.c

@ -3452,12 +3452,11 @@ bool sharesummaries_to_markersummaries(PGconn *conn, WORKMARKERS *workmarkers,
K_ITEM *p_ss_item, *p_ms_item; K_ITEM *p_ss_item, *p_ms_item;
bool ok = false, conned = false; bool ok = false, conned = false;
int64_t diffacc, shareacc; int64_t diffacc, shareacc;
char *reason = NULL, *tuples = NULL; char *reason = NULL;
char *params[2]; char *params[2];
int n, par = 0, deleted = -7; int n, par = 0;
int ss_count, ms_count; int ss_count, ms_count;
char *st = NULL; char *st = NULL;
char *del;
LOGWARNING("%s() Processing: workmarkers %"PRId64"/%s/" LOGWARNING("%s() Processing: workmarkers %"PRId64"/%s/"
"End %"PRId64"/Stt %"PRId64"/%s/%s", "End %"PRId64"/Stt %"PRId64"/%s/%s",
@ -3606,6 +3605,12 @@ bool sharesummaries_to_markersummaries(PGconn *conn, WORKMARKERS *workmarkers,
ms_item = ms_item->next; ms_item = ms_item->next;
} }
#if 0
int deleted = -7;
char *tuples = NULL;
char *del;
// No longer in the DB
if (old_sharesummary_store->count > 0) { if (old_sharesummary_store->count > 0) {
par = 0; par = 0;
params[par++] = bigint_to_buf(workmarkers->workinfoidstart, NULL, 0); params[par++] = bigint_to_buf(workmarkers->workinfoidstart, NULL, 0);
@ -3636,6 +3641,7 @@ bool sharesummaries_to_markersummaries(PGconn *conn, WORKMARKERS *workmarkers,
goto rollback; goto rollback;
} }
} }
#endif
ok = workmarkers_process(conn, true, true, ok = workmarkers_process(conn, true, true,
workmarkers->markerid, workmarkers->markerid,

Loading…
Cancel
Save