Commit 0ecad04

committed

optimizeTopK in inverted indexes

1 parent 9865ebb commit 0ecad04Copy full SHA for 0ecad04

File tree

+25

-0

lines changed

+25

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public class InvertedIndexEntity implements Entity {`
`45`	`45`	`private Collection<InvertedIndexField> fields;`
`46`	`46`	`private Boolean searchField;`
`47`	`47`	`private Collection<StoredValue> storedValues;`
	`48`	`+ private Collection<String> optimizeTopK;`
`48`	`49`	`private InvertedIndexPrimarySort primarySort;`
`49`	`50`	`private String analyzer;`
`50`	`51`	`private Set<AnalyzerFeature> features;`
`@@ -104,6 +105,10 @@ public Collection<StoredValue> getStoredValues() {`
`104`	`105`	`return storedValues;`
`105`	`106`	`}`
`106`	`107`
	`108`	`+ public Collection<String> getOptimizeTopK() {`
	`109`	`+ return optimizeTopK;`
	`110`	`+ }`
	`111`	`+`
`107`	`112`	`public InvertedIndexPrimarySort getPrimarySort() {`
`108`	`113`	`return primarySort;`
`109`	`114`	`}`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ public class InvertedIndexOptions extends IndexOptions<InvertedIndexOptions> {`
`38`	`38`	`private Integer parallelism;`
`39`	`39`	`private InvertedIndexPrimarySort primarySort;`
`40`	`40`	`private final Collection<StoredValue> storedValues = new ArrayList<>();`
	`41`	`+ private final Collection<String> optimizeTopK = new ArrayList<>();`
`41`	`42`	`private String analyzer;`
`42`	`43`	`private final Set<AnalyzerFeature> features = new HashSet<>();`
`43`	`44`	`private Boolean includeAllFields;`
`@@ -112,6 +113,20 @@ public InvertedIndexOptions storedValues(StoredValue... storedValues) {`
`112`	`113`	`return this;`
`113`	`114`	`}`
`114`	`115`
	`116`	`+ public Collection<String> getOptimizeTopK() {`
	`117`	`+ return optimizeTopK;`
	`118`	`+ }`
	`119`	`+`
	`120`	`+ /**`
	`121`	`+ * @param optimizeTopK An array of strings defining sort expressions that you want to optimize.`
	`122`	`+ * @return options`
	`123`	`+ * @since ArangoDB 3.11, Enterprise Edition only`
	`124`	`+ */`
	`125`	`+ public InvertedIndexOptions optimizeTopK(String... optimizeTopK) {`
	`126`	`+ Collections.addAll(this.optimizeTopK, optimizeTopK);`
	`127`	`+ return this;`
	`128`	`+ }`
	`129`	`+`
`115`	`130`	`public String getAnalyzer() {`
`116`	`131`	`return analyzer;`
`117`	`132`	`}`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ private InvertedIndexOptions createOptions(String analyzerName) {`
`93`	`93`	`.cache(cache)`
`94`	`94`	`)`
`95`	`95`	`.storedValues(new StoredValue(Arrays.asList("f3", "f4"), ArangoSearchCompression.none, cache))`
	`96`	`+ .optimizeTopK("BM25(@doc) DESC", "TFIDF(@doc) DESC")`
`96`	`97`	`.analyzer(analyzerName)`
`97`	`98`	`.features(AnalyzerFeature.position, AnalyzerFeature.frequency)`
`98`	`99`	`.includeAllFields(false)`
`@@ -144,6 +145,10 @@ private void assertCorrectIndexEntity(InvertedIndexEntity indexResult, InvertedI`
`144`	`145`	`assertThat(indexResult.getWritebufferSizeMax()).isEqualTo(options.getWritebufferSizeMax());`
`145`	`146`	`assertThat(indexResult.getCache()).isEqualTo(options.getCache());`
`146`	`147`	`assertThat(indexResult.getPrimaryKeyCache()).isEqualTo(options.getPrimaryKeyCache());`
	`148`	`+`
	`149`	`+ if (isEnterprise() && isAtLeastVersion(3, 11)) {`
	`150`	`+ assertThat(indexResult.getOptimizeTopK()).containsExactlyElementsOf(options.getOptimizeTopK());`
	`151`	`+ }`
`147`	`152`	`}`
`148`	`153`
`149`	`154`	`@ParameterizedTest(name = "{index}")`

Comments

(0)