Skip to content

Commit 56bccd6

Browse files
rashtaorashtao
committed
[DE-462] removed hash and skipList index
1 parent 5fe4834 commit 56bccd6

File tree

15 files changed

+18
-601
lines changed

15 files changed

+18
-601
lines changed

‎core/src/main/java/com/arangodb/ArangoCollection.java

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -610,34 +610,6 @@ <T> MultiDocumentEntity<DocumentDeleteEntity<T>> deleteDocuments(
610610
*/
611611
String deleteIndex(String id);
612612

613-
/**
614-
* Creates a hash index for the collection if it does not already exist.
615-
*
616-
* @param fields A list of attribute paths
617-
* @param options Additional options, can be null
618-
* @return information about the index
619-
* @see
620-
* <a href="https://www.arangodb.com/docs/stable/http/indexes-hash.html#create-hash-index">API Documentation</a>
621-
* @deprecated use {@link #ensurePersistentIndex(Iterable, PersistentIndexOptions)} instead. Since ArangoDB 3.7 a
622-
* hash index is an alias for a persistent index.
623-
*/
624-
@Deprecated
625-
IndexEntity ensureHashIndex(Iterable<String> fields, HashIndexOptions options);
626-
627-
/**
628-
* Creates a skip-list index for the collection, if it does not already exist.
629-
*
630-
* @param fields A list of attribute paths
631-
* @param options Additional options, can be null
632-
* @return information about the index
633-
* @see <a href="https://www.arangodb.com/docs/stable/http/indexes-skiplist.html#create-skip-list">API
634-
* Documentation</a>
635-
* @deprecated use {@link #ensurePersistentIndex(Iterable, PersistentIndexOptions)} instead. Since ArangoDB 3.7 a
636-
* skiplist index is an alias for a persistent index.
637-
*/
638-
@Deprecated
639-
IndexEntity ensureSkiplistIndex(Iterable<String> fields, SkiplistIndexOptions options);
640-
641613
/**
642614
* Creates a persistent index for the collection, if it does not already exist.
643615
*

‎core/src/main/java/com/arangodb/async/ArangoCollectionAsync.java

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -650,36 +650,6 @@ <T> CompletableFuture<MultiDocumentEntity<DocumentDeleteEntity<T>>> deleteDocume
650650
*/
651651
CompletableFuture<String> deleteIndex(final String id);
652652

653-
/**
654-
* Creates a hash index for the collection, if it does not already exist.
655-
*
656-
* @param fields A list of attribute paths
657-
* @param options Additional options, can be null
658-
* @return information about the index
659-
* @see
660-
* <a href="https://www.arangodb.com/docs/stable/http/indexes-hash.html#create-hash-index">API Documentation</a>
661-
* @deprecated use {@link #ensurePersistentIndex(Iterable, PersistentIndexOptions)} instead. Since ArangoDB 3.7 a
662-
* hash index is an alias for a persistent index.
663-
*/
664-
@Deprecated
665-
CompletableFuture<IndexEntity> ensureHashIndex(final Iterable<String> fields, final HashIndexOptions options);
666-
667-
/**
668-
* Creates a skip-list index for the collection, if it does not already exist.
669-
*
670-
* @param fields A list of attribute paths
671-
* @param options Additional options, can be null
672-
* @return information about the index
673-
* @see <a href="https://www.arangodb.com/docs/stable/http/indexes-skiplist.html#create-skip-list">API
674-
* Documentation</a>
675-
* @deprecated use {@link #ensurePersistentIndex(Iterable, PersistentIndexOptions)} instead. Since ArangoDB 3.7 a
676-
* skiplist index is an alias for a persistent index.
677-
*/
678-
@Deprecated
679-
CompletableFuture<IndexEntity> ensureSkiplistIndex(
680-
final Iterable<String> fields,
681-
final SkiplistIndexOptions options);
682-
683653
/**
684654
* Creates a persistent index for the collection, if it does not already exist.
685655
*

‎core/src/main/java/com/arangodb/async/internal/ArangoCollectionAsyncImpl.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -361,22 +361,6 @@ public CompletableFuture<String> deleteIndex(final String id) {
361361
return executor.execute(deleteIndexRequest(id), deleteIndexResponseDeserializer());
362362
}
363363

364-
@Override
365-
@Deprecated
366-
public CompletableFuture<IndexEntity> ensureHashIndex(
367-
final Iterable<String> fields,
368-
final HashIndexOptions options) {
369-
return executor.execute(createHashIndexRequest(fields, options), IndexEntity.class);
370-
}
371-
372-
@Override
373-
@Deprecated
374-
public CompletableFuture<IndexEntity> ensureSkiplistIndex(
375-
final Iterable<String> fields,
376-
final SkiplistIndexOptions options) {
377-
return executor.execute(createSkiplistIndexRequest(fields, options), IndexEntity.class);
378-
}
379-
380364
@Override
381365
public CompletableFuture<IndexEntity> ensurePersistentIndex(
382366
final Iterable<String> fields,

‎core/src/main/java/com/arangodb/internal/ArangoCollectionImpl.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -359,18 +359,6 @@ public String deleteIndex(final String id) {
359359
return executor.execute(deleteIndexRequest(id), deleteIndexResponseDeserializer());
360360
}
361361

362-
@Deprecated
363-
@Override
364-
public IndexEntity ensureHashIndex(final Iterable<String> fields, final HashIndexOptions options) {
365-
return executor.execute(createHashIndexRequest(fields, options), IndexEntity.class);
366-
}
367-
368-
@Deprecated
369-
@Override
370-
public IndexEntity ensureSkiplistIndex(final Iterable<String> fields, final SkiplistIndexOptions options) {
371-
return executor.execute(createSkiplistIndexRequest(fields, options), IndexEntity.class);
372-
}
373-
374362
@Override
375363
public IndexEntity ensurePersistentIndex(final Iterable<String> fields, final PersistentIndexOptions options) {
376364
return executor.execute(createPersistentIndexRequest(fields, options), IndexEntity.class);

‎core/src/main/java/com/arangodb/internal/InternalArangoCollection.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -425,25 +425,6 @@ private String createIndexId(final String id) {
425425
return index;
426426
}
427427

428-
@Deprecated
429-
protected InternalRequest createHashIndexRequest(final Iterable<String> fields, final HashIndexOptions options) {
430-
final InternalRequest request = request(db.dbName(), RequestType.POST, PATH_API_INDEX);
431-
request.putQueryParam(COLLECTION, name);
432-
request.setBody(
433-
getSerde().serialize(OptionsBuilder.build(options != null ? options : new HashIndexOptions(), fields)));
434-
return request;
435-
}
436-
437-
@Deprecated
438-
protected InternalRequest createSkiplistIndexRequest(final Iterable<String> fields, final SkiplistIndexOptions options) {
439-
final InternalRequest request = request(db.dbName(), RequestType.POST, PATH_API_INDEX);
440-
request.putQueryParam(COLLECTION, name);
441-
request.setBody(
442-
getSerde().serialize(OptionsBuilder.build(options != null ? options : new SkiplistIndexOptions(),
443-
fields)));
444-
return request;
445-
}
446-
447428
protected InternalRequest createPersistentIndexRequest(
448429
final Iterable<String> fields, final PersistentIndexOptions options) {
449430
final InternalRequest request = request(db.dbName(), RequestType.POST, PATH_API_INDEX);

‎core/src/main/java/com/arangodb/model/HashIndexOptions.java

Lines changed: 0 additions & 121 deletions
This file was deleted.

‎core/src/main/java/com/arangodb/model/OptionsBuilder.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,6 @@ public static UserCreateOptions build(final UserCreateOptions options, final Str
4141
return options.user(user).passwd(passwd);
4242
}
4343

44-
/**
45-
* @deprecated use {@link #build(PersistentIndexOptions, Iterable)} instead. Since ArangoDB 3.7 a hash index is an
46-
* alias for a persistent index.
47-
*/
48-
@Deprecated
49-
public static HashIndexOptions build(final HashIndexOptions options, final Iterable<String> fields) {
50-
return options.fields(fields);
51-
}
52-
53-
/**
54-
* @deprecated use {@link #build(PersistentIndexOptions, Iterable)} instead. Since ArangoDB 3.7 a skiplist index is
55-
* an alias for a persistent index.
56-
*/
57-
@Deprecated
58-
public static SkiplistIndexOptions build(final SkiplistIndexOptions options, final Iterable<String> fields) {
59-
return options.fields(fields);
60-
}
61-
6244
public static PersistentIndexOptions build(final PersistentIndexOptions options, final Iterable<String> fields) {
6345
return options.fields(fields);
6446
}

0 commit comments

Comments
 (0)