Commit 7f4d557

authored

fixed Arangosearch PrimarySort (#594)

1 parent 1b6066a commit 7f4d557Copy full SHA for 7f4d557

File tree

3 files changed

+52

-2

lines changed

core/src/main/java/com/arangodb
- entity/arangosearch
  - PrimarySort.java
- model/arangosearch
  - ArangoSearchCreateOptions.java
test-functional/src/test/java/com/arangodb
- ArangoSearchTest.java

3 files changed

+52

-2

lines changed

`‎core/src/main/java/com/arangodb/entity/arangosearch/PrimarySort.java`

Lines changed: 33 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@`
`20`	`20`
`21`	`21`	`package com.arangodb.entity.arangosearch;`
`22`	`22`
	`23`	`+import com.fasterxml.jackson.annotation.JsonIgnore;`
	`24`	`+import com.fasterxml.jackson.annotation.JsonProperty;`
	`25`	`+`
`23`	`26`	`/**`
`24`	`27`	`* @author Heiko Kernbach`
`25`	`28`	`*/`
`@@ -28,6 +31,14 @@ public final class PrimarySort {`
`28`	`31`	`private final String fieldName;`
`29`	`32`	`private Boolean ascending;`
`30`	`33`
	`34`	`+ public PrimarySort(`
	`35`	`+ @JsonProperty("field") String field,`
	`36`	`+ @JsonProperty("asc") Boolean asc`
	`37`	`+ ) {`
	`38`	`+ this.fieldName = field;`
	`39`	`+ this.ascending = asc;`
	`40`	`+ }`
	`41`	`+`
`31`	`42`	`private PrimarySort(final String fieldName) {`
`32`	`43`	`super();`
`33`	`44`	`this.fieldName = fieldName;`
`@@ -46,11 +57,33 @@ public PrimarySort ascending(final Boolean ascending) {`
`46`	`57`	`return this;`
`47`	`58`	`}`
`48`	`59`
	`60`	`+ @JsonIgnore`
`49`	`61`	`public Boolean getAscending() {`
`50`	`62`	`return ascending;`
`51`	`63`	`}`
`52`	`64`
	`65`	`+ public Direction getDirection() {`
	`66`	`+ if (ascending == null) {`
	`67`	`+ return null;`
	`68`	`+ }`
	`69`	`+ return ascending ? Direction.asc : Direction.desc;`
	`70`	`+ }`
	`71`	`+`
	`72`	`+ /**`
	`73`	`+ * @deprecated for removal, use {@link #getField()} instead`
	`74`	`+ */`
	`75`	`+ @Deprecated`
	`76`	`+ @JsonIgnore`
`53`	`77`	`public String getFieldName() {`
	`78`	`+ return getField();`
	`79`	`+ }`
	`80`	`+`
	`81`	`+ public String getField() {`
`54`	`82`	`return fieldName;`
`55`	`83`	`}`
	`84`	`+`
	`85`	`+ public enum Direction {`
	`86`	`+ asc,`
	`87`	`+ desc`
	`88`	`+ }`
`56`	`89`	`}`

`‎core/src/main/java/com/arangodb/model/arangosearch/ArangoSearchCreateOptions.java`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`import com.arangodb.entity.ViewType;`
`24`	`24`	`import com.arangodb.entity.arangosearch.*;`
`25`	`25`	`import com.arangodb.internal.serde.InternalSerializers;`
	`26`	`+import com.fasterxml.jackson.annotation.JsonIgnore;`
`26`	`27`	`import com.fasterxml.jackson.databind.annotation.JsonSerialize;`
`27`	`28`
`28`	`29`	`import java.util.Arrays;`
`@@ -217,7 +218,16 @@ public Collection<CollectionLink> getLinks() {`
`217`	`218`	`return links;`
`218`	`219`	`}`
`219`	`220`
	`221`	`+ /**`
	`222`	`+ * @deprecated for removal, use {@link #getPrimarySort()} instead`
	`223`	`+ */`
	`224`	`+ @Deprecated`
	`225`	`+ @JsonIgnore`
`220`	`226`	`public Collection<PrimarySort> getPrimarySorts() {`
	`227`	`+ return getPrimarySort();`
	`228`	`+ }`
	`229`	`+`
	`230`	`+ public Collection<PrimarySort> getPrimarySort() {`
`221`	`231`	`return primarySorts;`
`222`	`232`	`}`
`223`	`233`

`‎test-functional/src/test/java/com/arangodb/ArangoSearchTest.java`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ void createArangoSearchViewWithPrimarySort(ArangoDatabase db) {`
`154`	`154`	`final ArangoSearchCreateOptions options = new ArangoSearchCreateOptions();`
`155`	`155`
`156`	`156`	`final PrimarySort primarySort = PrimarySort.on("myFieldName");`
`157`		`- primarySort.ascending(true);`
	`157`	`+ primarySort.ascending(false);`
`158`	`158`	`options.primarySort(primarySort);`
`159`	`159`	`options.primarySortCompression(ArangoSearchCompression.none);`
`160`	`160`	`options.consolidationIntervalMsec(666666L);`
`@@ -179,6 +179,13 @@ void createArangoSearchViewWithPrimarySort(ArangoDatabase db) {`
`179`	`179`	`assertThat(retrievedStoredValue).isNotNull();`
`180`	`180`	`assertThat(retrievedStoredValue.getFields()).isEqualTo(storedValue.getFields());`
`181`	`181`	`assertThat(retrievedStoredValue.getCompression()).isEqualTo(storedValue.getCompression());`
	`182`	`+ assertThat(properties.getPrimarySort())`
	`183`	`+ .hasSize(1)`
	`184`	`+ .allSatisfy(ps -> {`
	`185`	`+ assertThat(ps).isNotNull();`
	`186`	`+ assertThat(ps.getField()).isEqualTo(primarySort.getField());`
	`187`	`+ assertThat(ps.getAscending()).isEqualTo(primarySort.getAscending());`
	`188`	`+ });`
`182`	`189`	`}`
`183`	`190`	`}`
`184`	`191`
`@@ -739,7 +746,7 @@ void arangoSearchOptions(ArangoDatabase db) {`
`739`	`746`	`}`
`740`	`747`
`741`	`748`	`if (isEnterprise() && isAtLeastVersion(3, 12)) {`
`742`		`- assertThat(properties.getOptimizeTopK()).containsExactly(optimizeTopK);`
	`749`	`+ assertThat(properties.getOptimizeTopK()).containsExactly(optimizeTopK);`
`743`	`750`	`}`
`744`	`751`
`745`	`752`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 7f4d557

File tree

3 files changed

3 files changed

`‎core/src/main/java/com/arangodb/entity/arangosearch/PrimarySort.java`

`‎core/src/main/java/com/arangodb/model/arangosearch/ArangoSearchCreateOptions.java`

`‎test-functional/src/test/java/com/arangodb/ArangoSearchTest.java`

0 commit comments