Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mac build #4868

Closed
wants to merge 1 commit into from
Closed

Fix mac build #4868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bdb/log_queue_dump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ static void dump_qtrigger(bdb_state_type *bdb_state, const DB_LSN *commit_lsn, c
fprintf(f, "Processing record for %s\n", filename);
fprintf(f, "Commit-lsn: %u:%u\n", commit_lsn->file, commit_lsn->offset);
fprintf(f, "Consumer: %d\n", consumer);
fprintf(f, "Genid: %lu\n", genid);
fprintf(f, "Genid: %llu\n", genid);
fprintf(f, "Seq: %lld\n", seq);
fprintf(f, "Datalen): %ld\n", fnddtalen);
fprintf(f, "Qf-genid: %llu\n", fnd->genid);
Expand Down
2 changes: 1 addition & 1 deletion bdb/log_queue_trigger.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ void *log_queue_consumer(void *arg)
if (comdb2_time_epoch() - txn->qtime > 0) {
file->longq_cnt++;
if (comdb2_time_epoch() - file->lastpr) {
logmsg(LOGMSG_ERROR, "%s long-queue %d, cnt=%lu\n", __func__, comdb2_time_epoch() - txn->qtime,
logmsg(LOGMSG_ERROR, "%s long-queue %d, cnt=%llu\n", __func__, comdb2_time_epoch() - txn->qtime,
file->longq_cnt);
file->lastpr = comdb2_time_epoch();
}
Expand Down
4 changes: 2 additions & 2 deletions plugins/newsql/newsql_evbuffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,10 +1188,10 @@ static void *gethostname_fn(void *arg)
timersub(&now, &arg->start, &q);
if (diff.tv_sec) {
last_report = now;
printf("%s took %lds:%ldms pending:%d\n", __func__, diff.tv_sec, diff.tv_usec / 1000, pending);
printf("%s took %lds:%dms pending:%d\n", __func__, diff.tv_sec, diff.tv_usec / 1000, pending);
} else if (q.tv_sec > 2) {
last_report = now;
printf("%s took %lds:%ldms queue:%lds:%ldms pending:%d\n", __func__,
printf("%s took %lds:%dms queue:%lds:%dms pending:%d\n", __func__,
diff.tv_sec, diff.tv_usec / 1000, q.tv_sec, q.tv_usec / 1000, pending);
} else if (pending > max_pending) {
last_report = now;
Expand Down