Cosmetics: whitespaces

This commit is contained in:
Robert Schulze 2024-08-09 12:59:54 +00:00
parent 27a6931a35
commit 9ad890e399
No known key found for this signature in database
GPG Key ID: 26703B55FB13728A
2 changed files with 37 additions and 16 deletions

View File

@ -71,7 +71,10 @@ String keysAsString(const T & t)
}
USearchIndexWithSerialization::USearchIndexWithSerialization(size_t dimensions, unum::usearch::metric_kind_t metric_kind, unum::usearch::scalar_kind_t scalar_kind)
USearchIndexWithSerialization::USearchIndexWithSerialization(
size_t dimensions,
unum::usearch::metric_kind_t metric_kind,
unum::usearch::scalar_kind_t scalar_kind)
: Base(Base::make(unum::usearch::metric_punned_t(dimensions, metric_kind, scalar_kind)))
{
}
@ -122,11 +125,7 @@ MergeTreeIndexGranuleUSearch::MergeTreeIndexGranuleUSearch(
const Block & index_sample_block_,
unum::usearch::metric_kind_t metric_kind_,
unum::usearch::scalar_kind_t scalar_kind_)
: index_name(index_name_)
, index_sample_block(index_sample_block_)
, metric_kind(metric_kind_)
, scalar_kind(scalar_kind_)
, index(nullptr)
: MergeTreeIndexGranuleUSearch(index_name_, index_sample_block_, metric_kind_, scalar_kind_, nullptr)
{
}
@ -291,7 +290,7 @@ MergeTreeIndexConditionUSearch::MergeTreeIndexConditionUSearch(
{
}
bool MergeTreeIndexConditionUSearch::mayBeTrueOnGranule(MergeTreeIndexGranulePtr /*idx_granule*/) const
bool MergeTreeIndexConditionUSearch::mayBeTrueOnGranule(MergeTreeIndexGranulePtr) const
{
throw Exception(ErrorCodes::LOGICAL_ERROR, "mayBeTrueOnGranule is not supported for ANN skip indexes");
}
@ -308,14 +307,14 @@ bool MergeTreeIndexConditionUSearch::alwaysUnknownOrTrue() const
return ann_condition.alwaysUnknownOrTrue(index_distance_function);
}
std::vector<size_t> MergeTreeIndexConditionUSearch::getUsefulRanges(MergeTreeIndexGranulePtr idx_granule) const
std::vector<size_t> MergeTreeIndexConditionUSearch::getUsefulRanges(MergeTreeIndexGranulePtr granule_) const
{
const UInt64 limit = ann_condition.getLimit();
const UInt64 index_granularity = ann_condition.getIndexGranularity();
const std::vector<float> reference_vector = ann_condition.getReferenceVector();
const auto granule = std::dynamic_pointer_cast<MergeTreeIndexGranuleUSearch>(idx_granule);
const auto granule = std::dynamic_pointer_cast<MergeTreeIndexGranuleUSearch>(granule_);
if (granule == nullptr)
throw Exception(ErrorCodes::LOGICAL_ERROR, "Granule has the wrong type");

View File

@ -21,7 +21,11 @@ class USearchIndexWithSerialization : public USearchIndex
using Base = USearchIndex;
public:
USearchIndexWithSerialization(size_t dimensions, unum::usearch::metric_kind_t metric_kind, unum::usearch::scalar_kind_t scalar_kind);
USearchIndexWithSerialization(
size_t dimensions,
unum::usearch::metric_kind_t metric_kind,
unum::usearch::scalar_kind_t scalar_kind);
void serialize(WriteBuffer & ostr) const;
void deserialize(ReadBuffer & istr);
@ -46,8 +50,18 @@ using USearchIndexWithSerializationPtr = std::shared_ptr<USearchIndexWithSeriali
struct MergeTreeIndexGranuleUSearch final : public IMergeTreeIndexGranule
{
MergeTreeIndexGranuleUSearch(const String & index_name_, const Block & index_sample_block_, unum::usearch::metric_kind_t metric_kind, unum::usearch::scalar_kind_t scalar_kind_);
MergeTreeIndexGranuleUSearch(const String & index_name_, const Block & index_sample_block_, unum::usearch::metric_kind_t metric_kind, unum::usearch::scalar_kind_t scalar_kind_, USearchIndexWithSerializationPtr index_);
MergeTreeIndexGranuleUSearch(
const String & index_name_,
const Block & index_sample_block_,
unum::usearch::metric_kind_t metric_kind_,
unum::usearch::scalar_kind_t scalar_kind_);
MergeTreeIndexGranuleUSearch(
const String & index_name_,
const Block & index_sample_block_,
unum::usearch::metric_kind_t metric_kind_,
unum::usearch::scalar_kind_t scalar_kind_,
USearchIndexWithSerializationPtr index_);
~MergeTreeIndexGranuleUSearch() override = default;
@ -75,7 +89,12 @@ private:
struct MergeTreeIndexAggregatorUSearch final : IMergeTreeIndexAggregator
{
MergeTreeIndexAggregatorUSearch(const String & index_name_, const Block & index_sample_block, unum::usearch::metric_kind_t metric_kind_, unum::usearch::scalar_kind_t scalar_kind_);
MergeTreeIndexAggregatorUSearch(
const String & index_name_,
const Block & index_sample_block,
unum::usearch::metric_kind_t metric_kind_,
unum::usearch::scalar_kind_t scalar_kind_);
~MergeTreeIndexAggregatorUSearch() override = default;
bool empty() const override { return !index || index->size() == 0; }
@ -102,8 +121,8 @@ public:
~MergeTreeIndexConditionUSearch() override = default;
bool alwaysUnknownOrTrue() const override;
bool mayBeTrueOnGranule(MergeTreeIndexGranulePtr idx_granule) const override;
std::vector<size_t> getUsefulRanges(MergeTreeIndexGranulePtr idx_granule) const override;
bool mayBeTrueOnGranule(MergeTreeIndexGranulePtr granule) const override;
std::vector<size_t> getUsefulRanges(MergeTreeIndexGranulePtr granule) const override;
private:
const ApproximateNearestNeighborCondition ann_condition;
@ -114,7 +133,10 @@ private:
class MergeTreeIndexUSearch : public IMergeTreeIndex
{
public:
MergeTreeIndexUSearch(const IndexDescription & index_, unum::usearch::metric_kind_t metric_kind_, unum::usearch::scalar_kind_t scalar_kind_);
MergeTreeIndexUSearch(
const IndexDescription & index_,
unum::usearch::metric_kind_t metric_kind_,
unum::usearch::scalar_kind_t scalar_kind_);
~MergeTreeIndexUSearch() override = default;