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

New Cottontail API, PolyphenyDB #224

Merged
merged 119 commits into from
Feb 7, 2022
Merged

New Cottontail API, PolyphenyDB #224

merged 119 commits into from
Feb 7, 2022

Commits on Aug 25, 2021

  1. Started implementation of Polypheny DB adapter.

    Ralph Gasser committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    6700870 View commit details
    Browse the repository at this point in the history
  2. Added missing library.

    Ralph Gasser committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    bf301b2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5b630a2 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2021

  1. Configuration menu
    Copy the full SHA
    201fa6d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    73ef482 View commit details
    Browse the repository at this point in the history
  3. Added missing comment.

    ppanopticon committed Aug 27, 2021
    Configuration menu
    Copy the full SHA
    c2872da View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    aaed7c9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8223fd8 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    211947d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    60e86ff View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    d3e1236 View commit details
    Browse the repository at this point in the history
  9. Fixed minor bugs.

    ppanopticon committed Aug 27, 2021
    Configuration menu
    Copy the full SHA
    15930cb View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    e2ecbda View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    58b65ed View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    023992b View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2021

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

Commits on Sep 22, 2021

  1. Configuration menu
    Copy the full SHA
    46fdb04 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    de37311 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'origin/polyphenydb' into polyphenydb

    # Conflicts:
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/db/cottontaildb/CottontailSelector.java
    ppanopticon committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    ac2a29a View commit details
    Browse the repository at this point in the history
  4. Fixed tow minor issues.

    Ralph Gasser committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    1c294a9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a3b1340 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2021

  1. Added implementation for getNearestNeighborGeneric().

    Ralph Gasser committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    03d2af4 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2021

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

Commits on Sep 27, 2021

  1. Adjusted log levels.

    ppanopticon committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    20fe4c5 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2021

  1. Fixed and optimized PolyphenySelector

    Ralph Gasser committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    30e0b83 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2021

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

Commits on Oct 4, 2021

  1. Merged dev.

    Ralph Gasser committed Oct 4, 2021
    Configuration menu
    Copy the full SHA
    cb11a15 View commit details
    Browse the repository at this point in the history
  2. Fixed LDC21TemporalUpdateCommand.

    Ralph Gasser committed Oct 4, 2021
    Configuration menu
    Copy the full SHA
    35d9490 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6f935eb View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2021

  1. Configuration menu
    Copy the full SHA
    bf2bd49 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    19cef72 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'origin/polyphenydb' into polyphenydb

    # Conflicts:
    #	cineast-runtime/src/main/java/org/vitrivr/cineast/standalone/cli/CineastCli.java
    ppanopticon committed Oct 7, 2021
    Configuration menu
    Copy the full SHA
    f2b445a View commit details
    Browse the repository at this point in the history
  4. Fixed semantic issue

    ppanopticon committed Oct 7, 2021
    Configuration menu
    Copy the full SHA
    69a6cf6 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2021

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

Commits on Oct 15, 2021

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

Commits on Oct 18, 2021

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

Commits on Oct 20, 2021

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

Commits on Oct 28, 2021

  1. Configuration menu
    Copy the full SHA
    e3530a1 View commit details
    Browse the repository at this point in the history
  2. specifying jar version

    silvanheller committed Oct 28, 2021
    Configuration menu
    Copy the full SHA
    5dfc2bb View commit details
    Browse the repository at this point in the history
  3. removing start & endabs

    silvanheller committed Oct 28, 2021
    Configuration menu
    Copy the full SHA
    da9070d View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2021

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

Commits on Nov 10, 2021

  1. Configuration menu
    Copy the full SHA
    c013349 View commit details
    Browse the repository at this point in the history
  2. Merged dev into polyphenydb

    sauterl committed Nov 10, 2021
    Configuration menu
    Copy the full SHA
    7baab9a View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2021

  1. Configuration menu
    Copy the full SHA
    7b9371e View commit details
    Browse the repository at this point in the history
  2. Added embedded cottontaildb (Tests still broken)

    For some reason, there seems to be a race condition as any test runs
    indefinitely long
    sauterl committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    506a71d View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2021

  1. Configuration menu
    Copy the full SHA
    459d641 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9b1f801 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1cb5c9f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7a74f61 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    405081d View commit details
    Browse the repository at this point in the history
  6. Fixed compilation error.

    ppanopticon committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    d85e74e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d3a4255 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    5478995 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    c4dd6cc View commit details
    Browse the repository at this point in the history
  10. Cleanup after merge.

    ppanopticon committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    64d0f5d View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    dfdd285 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    bd01eb9 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    a9186d8 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2022

  1. Configuration menu
    Copy the full SHA
    4e8d6b8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4f6749d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b16d33d View commit details
    Browse the repository at this point in the history
  4. Embedded Cottontail DB is no longer started in a dedicated thread (wh…

    …ich it doesn't need anyway).
    ppanopticon committed Jan 3, 2022
    Configuration menu
    Copy the full SHA
    64c6e17 View commit details
    Browse the repository at this point in the history
  5. Separated version of Cottontail DB and Cottontail DB Proto and elevat…

    …ed version of embedded Cottontail DB to 0.13.2-SNAPSHOT (for unit tests).
    ppanopticon committed Jan 3, 2022
    Configuration menu
    Copy the full SHA
    26d8049 View commit details
    Browse the repository at this point in the history
  6. Removed optimization, which is no longer required due to incremental …

    …nature of indexes involved.
    ppanopticon committed Jan 3, 2022
    Configuration menu
    Copy the full SHA
    3c7cd43 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    840ea92 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    a49fdfe View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    5d93d7e View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    31d38bc View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    cd85e8b View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    35942ca View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    fe82ec8 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    57eedaf View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2022

  1. Merge branch 'master' into polypheny-merge

    # Conflicts:
    #	build.gradle
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/config/DatabaseConfig.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/db/DBSelectorSupplier.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/db/adampro/ADAMproEntityCreator.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/db/adampro/ADAMproMessageBuilder.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/db/adampro/ADAMproSelector.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/db/adampro/ADAMproStreamingSelector.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/db/adampro/ADAMproWrapper.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/db/adampro/ADAMproWriter.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/db/adampro/AbstractADAMproSelector.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/db/cottontaildb/CottontailEntityCreator.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/db/cottontaildb/CottontailWrapper.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/db/cottontaildb/CottontailWriter.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/db/dao/reader/AbstractEntityReader.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/db/dao/writer/AbstractBatchedEntityWriter.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/AverageColorRasterReduced11.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/AverageColorRasterReduced15.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/MedianColorRaster.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/STMP7EH.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/abstracts/AbstractCodebookFeatureModule.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/abstracts/AbstractFeatureModule.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/abstracts/BooleanRetriever.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/abstracts/SubDivMotionHistogram.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/exporter/AudioSegmentExporter.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/exporter/AudioSpectogramExporter.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/exporter/AudioWaveformExporter.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/exporter/CENSExporter.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/exporter/ChromagramExporter.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/exporter/FrameExporter.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/exporter/Model3DThumbnailExporter.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/exporter/MotionFrameExporter.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/exporter/MotionHistoryImageExporter.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/exporter/QueryImageExporter.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/exporter/RepresentativeFrameExporter.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/exporter/ShotDescriptorExporter.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/exporter/ShotThumbnailsExporter.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/extractor/Extractor.java
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/features/retriever/Retriever.java
    #	cineast-runtime/src/main/java/org/vitrivr/cineast/standalone/cli/ImportCommand.java
    #	cineast-runtime/src/main/java/org/vitrivr/cineast/standalone/cli/OptimizeEntitiesCommand.java
    #	cineast-runtime/src/main/java/org/vitrivr/cineast/standalone/cli/db/LSC21TemporalUpdateCommand.java
    #	cineast-runtime/src/main/java/org/vitrivr/cineast/standalone/config/IngestConfig.java
    #	cineast-runtime/src/main/java/org/vitrivr/cineast/standalone/importer/handlers/DataImportHandler.java
    #	cineast-runtime/src/main/java/org/vitrivr/cineast/standalone/importer/lsc2020/LSCUtilities.java
    silvanheller committed Jan 4, 2022
    Configuration menu
    Copy the full SHA
    72ff775 View commit details
    Browse the repository at this point in the history
  2. reformatting codebase

    silvanheller committed Jan 4, 2022
    Configuration menu
    Copy the full SHA
    39514e4 View commit details
    Browse the repository at this point in the history
  3. reformatting codebase

    silvanheller committed Jan 4, 2022
    Configuration menu
    Copy the full SHA
    c01dee3 View commit details
    Browse the repository at this point in the history
  4. removing empty @param tags

    silvanheller committed Jan 4, 2022
    Configuration menu
    Copy the full SHA
    cc87863 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2022

  1. Configuration menu
    Copy the full SHA
    0a27431 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c782671 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into polyphenydb

    # Conflicts:
    #	build.gradle
    silvanheller committed Jan 5, 2022
    Configuration menu
    Copy the full SHA
    1ed5aef View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2022

  1. Fixed order of how PK_HINT and NULLABLE_HINT are applied during entit…

    …y creation in PolyphenyEntityCreator.
    ppanopticon committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    86d38d8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    168bf08 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f0035d0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f43ca9f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b21a0e6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9269f83 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2022

  1. Configuration menu
    Copy the full SHA
    1f3cc1f View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into polyphenydb

    # Conflicts:
    #	build.gradle
    #	cineast-core/src/main/java/org/vitrivr/cineast/core/db/cottontaildb/CottontailWrapper.java
    silvanheller committed Jan 24, 2022
    Configuration menu
    Copy the full SHA
    cac1453 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c8c0248 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5d67c46 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fa911dc View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    09ddebc View commit details
    Browse the repository at this point in the history
  7. added missing -X

    silvanheller committed Jan 24, 2022
    Configuration menu
    Copy the full SHA
    d514c5f View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2022

  1. Fixed typo

    ppanopticon committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    3532403 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2022

  1. Refactoring based on conversation with @lucaro:

    - Re-introduced DBSelectorSupplier and PersistencyWriterSupplier interfaces.
    - Removed batchSize from init() method of extractors and moved it to in a property of the PersistencyWriter itself.
    ppanopticon committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    308170d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    91b80bb View commit details
    Browse the repository at this point in the history
  3. Fixed typo.

    ppanopticon committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    4d38ac5 View commit details
    Browse the repository at this point in the history
  4. Fixed unit tests.

    ppanopticon committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    bfb0968 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2440df4 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9fbfe3b View commit details
    Browse the repository at this point in the history
  7. spaces and tabs

    silvanheller committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    32d7aae View commit details
    Browse the repository at this point in the history
  8. docker options

    silvanheller committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    998e132 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    6915690 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    da66b0a View commit details
    Browse the repository at this point in the history
  11. fixing payload

    silvanheller committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    1f34889 View commit details
    Browse the repository at this point in the history
  12. typo in yml

    silvanheller committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    a991b2c View commit details
    Browse the repository at this point in the history
  13. adding another test

    silvanheller committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    1408d1e View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2022

  1. Configuration menu
    Copy the full SHA
    efe33e2 View commit details
    Browse the repository at this point in the history
  2. adding new ci container

    silvanheller committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    c088b0d View commit details
    Browse the repository at this point in the history
  3. ci script updates

    silvanheller committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    8bb546e View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2022

  1. Configuration menu
    Copy the full SHA
    8cbf4de View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    254c9b8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6ef30f1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6ba81f3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4cd2b33 View commit details
    Browse the repository at this point in the history
  6. Merge remote-tracking branch 'origin/master' into polyphenydb

    # Conflicts:
    #	build.gradle
    silvanheller committed Feb 4, 2022
    Configuration menu
    Copy the full SHA
    6182bb6 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    760d419 View commit details
    Browse the repository at this point in the history
  8. resetting to defaults

    silvanheller committed Feb 4, 2022
    Configuration menu
    Copy the full SHA
    bbc0e05 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    0ac3a69 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2022

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