From a90482c772509af0a2cdd3ca4e512d7e25ebce46 Mon Sep 17 00:00:00 2001 From: Mark DePristo Date: Fri, 4 May 2012 15:38:24 -0400 Subject: [PATCH] Rev. tribble to v101 with another putative open file leak fix Scalability bugfixes; can issues tens of thousands of queries to an reader without opening too many files -- Fixed missing close() statement in TribbleIndexedFeatureReader -- Fixed NPE in TabixIteratorLineReader -- Added scalability test that confirms .query() failure and subsequent fix Note this actually fixes a tested and reproducible scability issue. Might not be the only one but I believe it should do the trick. Sorry everyone for the inconvenience. Note that we now have a test in Tribble to ensure this doesn't happen again. --- .../{tribble-100.jar => tribble-101.jar} | Bin 310728 -> 310936 bytes .../{tribble-100.xml => tribble-101.xml} | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename settings/repository/org.broad/{tribble-100.jar => tribble-101.jar} (93%) rename settings/repository/org.broad/{tribble-100.xml => tribble-101.xml} (79%) diff --git a/settings/repository/org.broad/tribble-100.jar b/settings/repository/org.broad/tribble-101.jar similarity index 93% rename from settings/repository/org.broad/tribble-100.jar rename to settings/repository/org.broad/tribble-101.jar index 450d702f7ed481ecec9d66c35c55943e2a8a9704..9e81f9eb2939745afb4c2de3f2c8bc2d933c5ba6 100644 GIT binary patch delta 7507 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 diff --git a/settings/repository/org.broad/tribble-100.xml b/settings/repository/org.broad/tribble-101.xml similarity index 79% rename from settings/repository/org.broad/tribble-100.xml rename to settings/repository/org.broad/tribble-101.xml index de43933f0..09d13e43a 100644 --- a/settings/repository/org.broad/tribble-100.xml +++ b/settings/repository/org.broad/tribble-101.xml @@ -1,3 +1,3 @@ - +