Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removed AQL `SKIPLIST` function deprecated in 2.6

This commit is contained in:
Jan Steemann 2015-06-21 16:21:49 +02:00
parent f7d5a612d9
commit 5480e6f4bd
2 changed files with 0 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arangod/Aql/Executor.cpp
View File

@ -250,7 +250,6 @@ std::unordered_map<std::string, Function const> const Executor::FunctionNames{
{ "FIRST_LIST", Function("FIRST_LIST", "AQL_FIRST_LIST", ".|+", true, false, true, true) },
{ "FIRST_DOCUMENT", Function("FIRST_DOCUMENT", "AQL_FIRST_DOCUMENT", ".|+", true, false, true, true) },
{ "PARSE_IDENTIFIER", Function("PARSE_IDENTIFIER", "AQL_PARSE_IDENTIFIER", ".", true, false, true, true) },
{ "SKIPLIST", Function("SKIPLIST", "AQL_SKIPLIST", "h,a|n,n", false, true, false, true) },
{ "CURRENT_USER", Function("CURRENT_USER", "AQL_CURRENT_USER", "", false, false, false, true) },
{ "CURRENT_DATABASE", Function("CURRENT_DATABASE", "AQL_CURRENT_DATABASE", "", false, false, false, true) }
};

51
js/server/modules/org/arangodb/aql.js
View File

@ -3950,56 +3950,6 @@ function AQL_PARSE_IDENTIFIER (value) {
return null;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief query a skiplist index
///
/// returns a documents from a skiplist index on the specified collection. Only
/// documents that match the specified condition will be returned.
////////////////////////////////////////////////////////////////////////////////
function AQL_SKIPLIST (collection, condition, skip, limit) {
'use strict';
var keys = [ ], key, idx;
for (key in condition) {
if (condition.hasOwnProperty(key)) {
keys.push(key);
}
}
var c = COLLECTION(collection);
if (c === null) {
THROW("SKIPLIST", INTERNAL.errors.ERROR_ARANGO_COLLECTION_NOT_FOUND, collection);
}
idx = c.lookupSkiplist.apply(c, keys);
if (idx === null) {
THROW("SKIPLIST", INTERNAL.errors.ERROR_ARANGO_NO_INDEX);
}
if (skip === undefined || skip === null) {
skip = 0;
}
if (limit === undefined || limit === null) {
limit = null;
}
try {
if (isCoordinator) {
return c.byConditionSkiplist(idx.id, condition).skip(skip).limit(limit).toArray();
}
return c.BY_CONDITION_SKIPLIST(idx.id, condition, skip, limit).documents;
}
catch (err) {
THROW("SKIPLIST", INTERNAL.errors.ERROR_ARANGO_NO_INDEX);
}
}
////////////////////////////////////////////////////////////////////////////////
/// @brief check whether a document has a specific attribute
////////////////////////////////////////////////////////////////////////////////
@ -8526,7 +8476,6 @@ exports.AQL_NOT_NULL = AQL_NOT_NULL;
exports.AQL_FIRST_LIST = AQL_FIRST_LIST;
exports.AQL_FIRST_DOCUMENT = AQL_FIRST_DOCUMENT;
exports.AQL_PARSE_IDENTIFIER = AQL_PARSE_IDENTIFIER;
exports.AQL_SKIPLIST = AQL_SKIPLIST;
exports.AQL_HAS = AQL_HAS;
exports.AQL_ATTRIBUTES = AQL_ATTRIBUTES;
exports.AQL_VALUES = AQL_VALUES;