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.

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

MRG: add generic support for any type of sketch collection as query or database #430

Merged
merged 111 commits into from
Oct 15, 2024

Commits on Aug 17, 2024

  1. refactor & rename & consolidate

    ctb committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    480f319 View commit details
    Browse the repository at this point in the history
  2. remove 'lower'

    ctb committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    e6b1c5b View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2024

  1. Merge branch 'main' of github.com:sourmash-bio/sourmash_plugin_branch…

    …water into ctb_misc_cleanup
    ctb committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    153f246 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0d7a556 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'main' of github.com:sourmash-bio/sourmash_plugin_branch…

    …water into ctb_misc2
    ctb committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    df753db View commit details
    Browse the repository at this point in the history
  4. add a few comments/docs

    ctb committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    1da0cf3 View commit details
    Browse the repository at this point in the history
  5. switch to dev version of sourmash

    ctb committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    2e7f027 View commit details
    Browse the repository at this point in the history
  6. tracking

    ctb committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    6b9e00f View commit details
    Browse the repository at this point in the history
  7. cleaner

    ctb committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    2747935 View commit details
    Browse the repository at this point in the history
  8. cleanup

    ctb committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    4f49ef8 View commit details
    Browse the repository at this point in the history
  9. load rocksdb natively

    ctb committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    af1c82d View commit details
    Browse the repository at this point in the history
  10. foo

    ctb committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    53924d6 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Merge branch 'main' of github.com:sourmash-bio/sourmash_plugin_branch…

    …water into ctb_misc2
    ctb committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    e5faed8 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'main' of github.com:sourmash-bio/sourmash_plugin_branch…

    …water into ctb_misc_cleanup
    ctb committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    7649375 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e4618f0 View commit details
    Browse the repository at this point in the history
  4. cargo fmt

    ctb committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    3462f92 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. upd

    ctb committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    9823ef6 View commit details
    Browse the repository at this point in the history
  2. upd

    ctb committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    bfb5053 View commit details
    Browse the repository at this point in the history
  3. fix fmt

    ctb committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    c311a69 View commit details
    Browse the repository at this point in the history
  4. MRG: create MultiCollection for collections that span multiple files (

    #434)
    
    * preliminary victory
    
    * compiles and mostly runs
    
    * cleanup, split to new module
    
    * cleanup and comment
    
    * more cleanup of diff
    
    * cargo fmt
    
    * fix fmt
    
    * restore n_failed
    
    * comment failing test
    
    * cleanup and de-vec
    
    * create module/submodule structure
    
    * comment for later
    
    * get rid of vec
    
    * beg for help
    
    * cleanup and doc
    ctb authored Aug 20, 2024
    Configuration menu
    Copy the full SHA
    28b43d8 View commit details
    Browse the repository at this point in the history
  5. clippy fixes

    ctb committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    a1b19ae View commit details
    Browse the repository at this point in the history
  6. compiling again

    ctb committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    51a14ac View commit details
    Browse the repository at this point in the history
  7. cleanup

    ctb committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    99bd174 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. bump sourmash to v0.15.1

    ctb committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    36d33a5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    02bf7e9 View commit details
    Browse the repository at this point in the history
  3. check if is rocksdb

    ctb committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    7f0b010 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'main' of github.com:sourmash-bio/sourmash_plugin_branch…

    …water into ctb_misc2
    ctb committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    b9972c6 View commit details
    Browse the repository at this point in the history
  5. weird error

    ctb committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    5561911 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    dfe56d3 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e6e80f3 View commit details
    Browse the repository at this point in the history
  8. old bug now fixed

    ctb committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    fed4db3 View commit details
    Browse the repository at this point in the history
  9. clippy, format, and fix

    ctb committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    f5331ef View commit details
    Browse the repository at this point in the history
  10. make names clearer

    ctb committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    8f90129 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    4511347 View commit details
    Browse the repository at this point in the history
  12. testy testy

    ctb committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    4ea6730 View commit details
    Browse the repository at this point in the history
  13. getting closer

    ctb committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    ac35b24 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. update sourmash

    ctb committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    741a44a View commit details
    Browse the repository at this point in the history
  2. mark failing tests

    ctb committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    d429205 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2024

  1. upd

    ctb committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    994fcec View commit details
    Browse the repository at this point in the history
  2. cargo fmt

    ctb committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    8451259 View commit details
    Browse the repository at this point in the history
  3. MRG: test exit from pairwise and multisearch if no loaded sketches (

    #437)
    
    * upd
    
    * check for appropriate multisearch error exits
    
    * add more tests for pairwise, too
    
    * cargo fmt
    ctb authored Aug 24, 2024
    Configuration menu
    Copy the full SHA
    91b04b5 View commit details
    Browse the repository at this point in the history
  4. MRG: switch to more efficient use of Collection by removing cloning (

    …#438)
    
    * remove unnecessary clones by switch to references in SmallSignature
    
    * switch away from references for collections => avoid clones
    
    * remove MultiCollection::iter
    ctb authored Aug 24, 2024
    Configuration menu
    Copy the full SHA
    b3e5b81 View commit details
    Browse the repository at this point in the history
  5. MRG: add tests for RocksDB/RevIndex, standalone manifests, and flexib…

    …le pathlists (#436)
    
    * test using rocksdb as source of sketches
    
    * test file lists of zips
    
    * cargo fmt
    
    * hackity hack hack a picklist
    
    * ok that makes more sense
    
    * it works
    
    * comments around future par_iter
    
    * support loading from a .sig.gz for index
    
    * test pairwise loading from rocksdb
    
    * add test for queries from Rocksdb
    
    * decide not to implement lists of manifests :)
    ctb authored Aug 24, 2024
    Configuration menu
    Copy the full SHA
    97db857 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    551758f View commit details
    Browse the repository at this point in the history
  7. impl Deref for MultiCollection

    ctb committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    e3e95fc View commit details
    Browse the repository at this point in the history
  8. clippy

    ctb committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    8d39a4f View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    3439592 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    d3fa529 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. update to latest sourmash code

    ctb committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    5a20381 View commit details
    Browse the repository at this point in the history
  2. update to latest sourmash code

    ctb committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    6563b0a View commit details
    Browse the repository at this point in the history
  3. simplify

    ctb committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    45608c7 View commit details
    Browse the repository at this point in the history
  4. update to latest sourmash code

    ctb committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    bd256dd View commit details
    Browse the repository at this point in the history
  5. Merge branch 'main' of github.com:sourmash-bio/sourmash_plugin_branch…

    …water into ctb_misc2
    ctb committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    675974e View commit details
    Browse the repository at this point in the history
  6. remove unnecessary flag

    ctb committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    afa0faf View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2024

  1. Merge branch 'main' of github.com:sourmash-bio/sourmash_plugin_branch…

    …water into ctb_misc2
    ctb committed Sep 8, 2024
    Configuration menu
    Copy the full SHA
    89b1c08 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. MRG: support & test loading of standalone manifests within pathlists (#…

    …450)
    
    * use recursion to load paths into a MultiCollection => mf support
    
    * MRG: clean up index to use `MultiCollection` (#451)
    
    * try making index work with standard code
    
    * kinda working
    
    * fmt
    
    * refactor
    
    * clear up the tests
    
    * refactor/clean up
    
    * cargo fmt
    
    * add tests for index warning & error
    
    * comment
    ctb authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    d120547 View commit details
    Browse the repository at this point in the history
  2. MRG: documentation updates based on new collection loading (#444)

    * update docs for #430
    
    * upd documentation
    
    * upd
    ctb authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    73c7f53 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'main' of github.com:sourmash-bio/sourmash_plugin_branch…

    …water into ctb_misc2
    ctb committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    e32638a View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Merge branch 'main' of github.com:sourmash-bio/sourmash_plugin_branch…

    …water into ctb_misc2
    ctb committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    fcae8e7 View commit details
    Browse the repository at this point in the history
  2. Update src/lib.rs

    Co-authored-by: Tessa Pierce Ward <[email protected]>
    ctb and bluegenes authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    74d7367 View commit details
    Browse the repository at this point in the history
  3. switch unwrap to expect

    ctb committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    4e28d64 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'ctb_misc2' of github.com:sourmash-bio/sourmash_plugin_b…

    …ranchwater into ctb_misc2
    ctb committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    74e2217 View commit details
    Browse the repository at this point in the history
  5. move unwrap to expect

    ctb committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    de35cd5 View commit details
    Browse the repository at this point in the history
  6. minor cleanup

    ctb committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    1e5ac07 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. cargo fmt

    ctb committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    388a49a View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2024

  1. Configuration menu
    Copy the full SHA
    7be1883 View commit details
    Browse the repository at this point in the history
  2. switch to using reference

    ctb committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    679b972 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a9143d0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    574cd28 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a5b4299 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. update to latest sourmash

    ctb committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    74b9ae6 View commit details
    Browse the repository at this point in the history
  2. upd sourmash

    ctb committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    9df421d View commit details
    Browse the repository at this point in the history
  3. Merge branch 'main' of github.com:sourmash-bio/sourmash_plugin_branch…

    …water into ctb_misc2
    ctb committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    ccd26da View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. update sourmash

    ctb committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    847917f View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. mut MultiCollection

    ctb committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    9733d47 View commit details
    Browse the repository at this point in the history
  2. cleanup

    ctb committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    019fd1b View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2024

  1. Configuration menu
    Copy the full SHA
    780fbda View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. fix contains_revindex

    ctb committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    84934a7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    56fb948 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. use released version of sourmash

    ctb committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    6550683 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Configuration menu
    Copy the full SHA
    b510e8e View commit details
    Browse the repository at this point in the history
  2. cargo fmt

    ctb committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    0993b39 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Configuration menu
    Copy the full SHA
    ac82fb3 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2024

  1. Configuration menu
    Copy the full SHA
    7ea9a40 View commit details
    Browse the repository at this point in the history
  2. move downsampling side guard

    ctb committed Oct 5, 2024
    Configuration menu
    Copy the full SHA
    03b9da0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b954daa View commit details
    Browse the repository at this point in the history
  4. move calc_abund_stats

    ctb committed Oct 5, 2024
    Configuration menu
    Copy the full SHA
    b0bcc66 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a2871c0 View commit details
    Browse the repository at this point in the history
  6. cleanup

    ctb committed Oct 5, 2024
    Configuration menu
    Copy the full SHA
    d853ef3 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    207efb2 View commit details
    Browse the repository at this point in the history
  8. fmt

    ctb committed Oct 5, 2024
    Configuration menu
    Copy the full SHA
    453f943 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2024

  1. Configuration menu
    Copy the full SHA
    5380325 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Merge branch 'main' of github.com:sourmash-bio/sourmash_plugin_branch…

    …water into ctb_misc2
    ctb committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    4f5fefd View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. update to next sourmash release

    ctb committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    69fd38b View commit details
    Browse the repository at this point in the history
  2. cargo fmt

    ctb committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    ee580b6 View commit details
    Browse the repository at this point in the history
  3. upd sourmash

    ctb committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    9814051 View commit details
    Browse the repository at this point in the history
  4. correct numbers

    ctb committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    d27b03e View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2024

  1. upd sourmash

    ctb committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    e35111a View commit details
    Browse the repository at this point in the history
  2. upd sourmash

    ctb committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    4778862 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bd18277 View commit details
    Browse the repository at this point in the history
  4. upd sourmash

    ctb committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    2563b0b View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2024

  1. upd sourmash

    ctb committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    a0e02ef View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9b448c8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    58502d8 View commit details
    Browse the repository at this point in the history
  4. refactor a bit more

    ctb committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    4a780f4 View commit details
    Browse the repository at this point in the history
  5. deallocate collection?

    ctb committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    c43f0d9 View commit details
    Browse the repository at this point in the history
  6. upd sourmash

    ctb committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    87118de View commit details
    Browse the repository at this point in the history
  7. cargo fmt

    ctb committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    ee296e7 View commit details
    Browse the repository at this point in the history
  8. fix merge foo

    ctb committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    a5bf5fa View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Merge branch 'main' of github.com:sourmash-bio/sourmash_plugin_branch…

    …water into ctb_misc2
    ctb committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    fff1cd9 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. merge

    ctb committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    2d8b2bb View commit details
    Browse the repository at this point in the history