aboutsummaryrefslogtreecommitdiffstats
path: root/searchlib/src/tests/attribute
diff options
context:
space:
mode:
authorGeir Storli <geirst@verizonmedia.com>2020-09-02 15:11:30 +0200
committerGitHub <noreply@github.com>2020-09-02 15:11:30 +0200
commit14ecc08b3fdd78b47fade15e6386f28879a9ed2a (patch)
tree2d4962a6f1a753015e0fe23ad0b81e6a9761790f /searchlib/src/tests/attribute
parent6caf2bcb9a52710b4445e6806f9fb5eaa9b4e9ba (diff)
parent77059853f79c749908b1b4ca2cf7c2c6e8d1d3fc (diff)
Merge pull request #14239 from vespa-engine/geirst/memory-usage-tracking-in-direct-tensor-store
Memory usage tracking in direct tensor store
Diffstat (limited to 'searchlib/src/tests/attribute')
-rw-r--r--searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp
index 089a2a8476e..efd17f773f3 100644
--- a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp
+++ b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp
@@ -578,7 +578,9 @@ Fixture::testSaveLoad()
void
Fixture::testCompaction()
{
- if (_traits.use_dense_tensor_attribute && _denseTensors) {
+ if ((_traits.use_dense_tensor_attribute && _denseTensors) ||
+ _traits.use_direct_tensor_attribute)
+ {
LOG(info, "Skipping compaction test for tensor '%s' which is using free-lists", _cfg.tensorType().to_spec().c_str());
return;
}