Commit 9f91aa5
committed
Remove UR:file:// and UR:ftp:// from ref search path, plus REF_PATH to EBI.
While use of the EBI refget server was originally encouraged by the
CRAM inventors, it became a self-imposed DDOS and it is now unreliable
due to rate limiting by the EBI. This removes EBI as a fallback when
REF_PATH has not been set.
In doing this we discovered that we could still retrieve references
(ironically also from EBI due to the test being a 1000genomes CRAM)
via the SQ UR: tag supporting remote URIs. This behaviour is
explicity listed as not being supported in the samtools manpage and we
believe it was an accidental ability added when switching from fopen
to bgzf_open for reading the UR reference file.
Note this check must be in cram_populate_ref and not load_ref_portion
or bgzf_open_ref as the user still has the ability to explicitly
request an external reference, eg via "samtools view -T URI".
open_path_mfile() now takes an extra 'int *local' argument which is
filled out with non-zero if the file found in REF_PATH is local.
Non-local files will be cached to REF_CACHE if set, but it no longer
has a default value as we did when ebi refget was the default REF_PATH.
This means it should operate much as before, except for the lack of
EBI defaults.1 parent a4dde3f commit 9f91aa5
3 files changed
+40
-61
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2473 | 2473 | | |
2474 | 2474 | | |
2475 | 2475 | | |
| 2476 | + | |
| 2477 | + | |
| 2478 | + | |
2476 | 2479 | | |
2477 | 2480 | | |
2478 | 2481 | | |
| |||
2934 | 2937 | | |
2935 | 2938 | | |
2936 | 2939 | | |
2937 | | - | |
2938 | | - | |
2939 | | - | |
2940 | | - | |
2941 | | - | |
2942 | | - | |
2943 | | - | |
2944 | | - | |
2945 | | - | |
2946 | | - | |
2947 | | - | |
2948 | | - | |
2949 | | - | |
2950 | | - | |
2951 | | - | |
2952 | | - | |
2953 | | - | |
2954 | | - | |
2955 | | - | |
2956 | | - | |
2957 | | - | |
2958 | | - | |
2959 | | - | |
2960 | | - | |
2961 | 2940 | | |
2962 | 2941 | | |
2963 | 2942 | | |
| |||
2971 | 2950 | | |
2972 | 2951 | | |
2973 | 2952 | | |
2974 | | - | |
2975 | 2953 | | |
2976 | 2954 | | |
2977 | 2955 | | |
2978 | 2956 | | |
2979 | 2957 | | |
2980 | 2958 | | |
2981 | | - | |
2982 | | - | |
2983 | | - | |
2984 | | - | |
2985 | | - | |
2986 | | - | |
2987 | | - | |
2988 | | - | |
2989 | | - | |
2990 | | - | |
2991 | | - | |
2992 | | - | |
2993 | | - | |
2994 | | - | |
2995 | | - | |
2996 | | - | |
2997 | | - | |
2998 | | - | |
2999 | 2959 | | |
3000 | 2960 | | |
3001 | 2961 | | |
| |||
3009 | 2969 | | |
3010 | 2970 | | |
3011 | 2971 | | |
3012 | | - | |
| 2972 | + | |
| 2973 | + | |
| 2974 | + | |
| 2975 | + | |
3013 | 2976 | | |
3014 | 2977 | | |
3015 | 2978 | | |
| |||
3053 | 3016 | | |
3054 | 3017 | | |
3055 | 3018 | | |
3056 | | - | |
| 3019 | + | |
| 3020 | + | |
3057 | 3021 | | |
3058 | 3022 | | |
3059 | 3023 | | |
| |||
3069 | 3033 | | |
3070 | 3034 | | |
3071 | 3035 | | |
| 3036 | + | |
3072 | 3037 | | |
3073 | 3038 | | |
3074 | 3039 | | |
3075 | | - | |
| 3040 | + | |
| 3041 | + | |
| 3042 | + | |
| 3043 | + | |
| 3044 | + | |
| 3045 | + | |
| 3046 | + | |
3076 | 3047 | | |
| 3048 | + | |
3077 | 3049 | | |
3078 | | - | |
3079 | | - | |
3080 | | - | |
| 3050 | + | |
| 3051 | + | |
| 3052 | + | |
3081 | 3053 | | |
3082 | 3054 | | |
3083 | 3055 | | |
| |||
3108 | 3080 | | |
3109 | 3081 | | |
3110 | 3082 | | |
3111 | | - | |
| 3083 | + | |
3112 | 3084 | | |
3113 | 3085 | | |
3114 | | - | |
3115 | | - | |
3116 | | - | |
3117 | | - | |
3118 | | - | |
3119 | | - | |
3120 | 3086 | | |
3121 | 3087 | | |
3122 | 3088 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
343 | 343 | | |
344 | 344 | | |
345 | 345 | | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
346 | 349 | | |
347 | 350 | | |
348 | 351 | | |
349 | | - | |
| 352 | + | |
| 353 | + | |
350 | 354 | | |
351 | 355 | | |
352 | 356 | | |
353 | 357 | | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
354 | 361 | | |
355 | 362 | | |
356 | 363 | | |
| |||
380 | 387 | | |
381 | 388 | | |
382 | 389 | | |
| 390 | + | |
| 391 | + | |
383 | 392 | | |
384 | 393 | | |
385 | 394 | | |
386 | | - | |
387 | | - | |
388 | | - | |
| 395 | + | |
389 | 396 | | |
390 | 397 | | |
| 398 | + | |
| 399 | + | |
391 | 400 | | |
392 | 401 | | |
393 | 402 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
99 | 102 | | |
100 | 103 | | |
101 | 104 | | |
102 | | - | |
| 105 | + | |
| 106 | + | |
103 | 107 | | |
104 | 108 | | |
105 | 109 | | |
| |||
0 commit comments