e72cf0100e06d6fadb7282d4e7eb2c592f320951 galt Mon Jul 4 13:08:35 2011 -0700 Adding parallel-fetch loading of remote bigDataUrl tracks using pthreads diff --git src/hg/hgTracks/bigBedTrack.c src/hg/hgTracks/bigBedTrack.c index 95c7127..ae55aff 100644 --- src/hg/hgTracks/bigBedTrack.c +++ src/hg/hgTracks/bigBedTrack.c @@ -1,164 +1,184 @@ /* bigBed - stuff to handle loading and display of bigBed type tracks in browser. * Mostly just links to bed code, but handles a few things itself, like the dense * drawing code. */ #include "common.h" #include "hash.h" #include "linefile.h" #include "jksql.h" #include "hdb.h" #include "bedCart.h" #include "hgTracks.h" #include "hmmstats.h" #include "localmem.h" #include "wigCommon.h" #include "bbiFile.h" #include "obscure.h" #include "bigWig.h" #include "bigBed.h" #include "bigWarn.h" #include "errCatch.h" struct bbiFile *fetchBbiForTrack(struct track *track) /* Fetch bbiFile from track, opening it if it is not already open. */ { struct bbiFile *bbi = track->bbiFile; if (bbi == NULL) { + char *fileName = NULL; + if (track->parallelLoading) // do not use mysql during parallel fetch + { + fileName = cloneString(trackDbSetting(track->tdb, "bigDataUrl")); + } + else + { struct sqlConnection *conn = hAllocConnTrack(database, track->tdb); - char *fileName = bbiNameFromSettingOrTable(track->tdb, conn, track->table); + fileName = bbiNameFromSettingOrTable(track->tdb, conn, track->table); hFreeConn(&conn); + } bbi = track->bbiFile = bigBedFileOpen(fileName); } return bbi; } struct bigBedInterval *bigBedSelectRange(struct track *track, char *chrom, int start, int end, struct lm *lm) /* Return list of intervals in range. */ { struct bigBedInterval *result = NULL; /* protect against temporary network error */ struct errCatch *errCatch = errCatchNew(); if (errCatchStart(errCatch)) { struct bbiFile *bbi = fetchBbiForTrack(track); + if (track->limitedVis != tvDense) + { int maxItems = maximumTrackItems(track) + 1; result = bigBedIntervalQuery(bbi, chrom, start, end, maxItems, lm); if (slCount(result) >= maxItems) { track->limitedVis = tvDense; track->limitedVisSet = TRUE; result = NULL; } } + if (track->visibility == tvDense || track->limitedVis == tvDense) + { + AllocArray(track->summary, insideWidth); + if (bigBedSummaryArrayExtended(bbi, chrom, start, end, insideWidth, track->summary)) + { + char *denseCoverage = trackDbSettingClosestToHome(track->tdb, "denseCoverage"); + if (denseCoverage != NULL) + { + double endVal = atof(denseCoverage); + if (endVal <= 0) + { + AllocVar(track->sumAll); + *track->sumAll = bbiTotalSummary(bbi); + } + } + } + else + freez(&track->summary); + } + bbiFileClose(&bbi); + track->bbiFile = NULL; + } errCatchEnd(errCatch); if (errCatch->gotError) { track->networkErrMsg = cloneString(errCatch->message->string); track->drawItems = bigDrawWarning; track->totalHeight = bigWarnTotalHeight; result = NULL; } errCatchFree(&errCatch); return result; } void bigBedAddLinkedFeaturesFrom(struct track *track, char *chrom, int start, int end, int scoreMin, int scoreMax, boolean useItemRgb, int fieldCount, struct linkedFeatures **pLfList) /* Read in items in chrom:start-end from bigBed file named in track->bbiFileName, convert * them to linkedFeatures, and add to head of list. */ { struct lm *lm = lmInit(0); struct trackDb *tdb = track->tdb; struct bigBedInterval *bb, *bbList = bigBedSelectRange(track, chrom, start, end, lm); char *bedRow[32]; char startBuf[16], endBuf[16]; for (bb = bbList; bb != NULL; bb = bb->next) { bigBedIntervalToRow(bb, chromName, startBuf, endBuf, bedRow, ArraySize(bedRow)); struct bed *bed = bedLoadN(bedRow, fieldCount); struct linkedFeatures *lf = bedMungToLinkedFeatures(&bed, tdb, fieldCount, scoreMin, scoreMax, useItemRgb); slAddHead(pLfList, lf); } lmCleanup(&lm); } boolean canDrawBigBedDense(struct track *tg) /* Return TRUE if conditions are such that can do the fast bigBed dense data fetch and * draw. */ { return tg->isBigBed; } void bigBedDrawDense(struct track *tg, int seqStart, int seqEnd, struct hvGfx *hvg, int xOff, int yOff, int width, MgFont *font, Color color) /* Use big-bed summary data to quickly draw bigBed. */ { -/* protect against temporary network error */ -struct errCatch *errCatch = errCatchNew(); -if (errCatchStart(errCatch)) - { - struct bbiSummaryElement summary[width]; - struct bbiFile *bbi = fetchBbiForTrack(tg); - if (bigBedSummaryArrayExtended(bbi, chromName, seqStart, seqEnd, width, summary)) +struct bbiSummaryElement *summary = tg->summary; +if (summary) { char *denseCoverage = trackDbSettingClosestToHome(tg->tdb, "denseCoverage"); if (denseCoverage != NULL) { double startVal = 0, endVal = atof(denseCoverage); if (endVal <= 0) { - struct bbiSummaryElement sumAll = bbiTotalSummary(bbi); + struct bbiSummaryElement sumAll = *tg->sumAll; double mean = sumAll.sumData/sumAll.validCount; double std = calcStdFromSums(sumAll.sumData, sumAll.sumSquares, sumAll.validCount); rangeFromMinMaxMeanStd(0, sumAll.maxVal, mean, std, &startVal, &endVal); } int x; for (x=0; x<width; ++x) { if (summary[x].validCount > 0) { Color color = shadesOfGray[grayInRange(summary[x].maxVal, startVal, endVal)]; hvGfxBox(hvg, x+xOff, yOff, 1, tg->heightPer, color); } } } else { int x; for (x=0; x<width; ++x) { if (summary[x].validCount > 0) { hvGfxBox(hvg, x+xOff, yOff, 1, tg->heightPer, color); } } } } - } -errCatchEnd(errCatch); -if (errCatch->gotError) - { - tg->networkErrMsg = cloneString(errCatch->message->string); - bigDrawWarning(tg, seqStart, seqEnd, hvg, xOff, yOff, width, font, color, tvDense); - } -errCatchFree(&errCatch); +freez(&tg->summary); } void bigBedMethods(struct track *track, struct trackDb *tdb, int wordCount, char *words[]) /* Set up bigBed methods. */ { complexBedMethods(track, tdb, TRUE, wordCount, words); }