瀏覽代碼

ft: 适配eVPack 修改

master
SisMaker 2 年之前
父節點
當前提交
c85772e74e
共有 21 個檔案被更改,包括 109 行新增109 行删除
  1. +1
    -1
      src/agApi/agAdminMonitor.erl
  2. +1
    -1
      src/agApi/agAnalyzers.erl
  3. +6
    -6
      src/agApi/agAqls.erl
  4. +3
    -3
      src/agApi/agBulkImports.erl
  5. +1
    -1
      src/agApi/agCluster.erl
  6. +6
    -6
      src/agApi/agColls.erl
  7. +1
    -1
      src/agApi/agDbMgr.erl
  8. +18
    -18
      src/agApi/agDocs.erl
  9. +8
    -8
      src/agApi/agFoxxServices.erl
  10. +22
    -22
      src/agApi/agGraphs.erl
  11. +5
    -5
      src/agApi/agHotBackup.erl
  12. +7
    -7
      src/agApi/agIndexes.erl
  13. +2
    -2
      src/agApi/agMiscFuns.erl
  14. +1
    -1
      src/agApi/agPregel.erl
  15. +6
    -6
      src/agApi/agReplication.erl
  16. +2
    -2
      src/agApi/agTasks.erl
  17. +2
    -2
      src/agApi/agTransactions.erl
  18. +5
    -5
      src/agApi/agUserMgr.erl
  19. +4
    -4
      src/agApi/agViews.erl
  20. +5
    -5
      src/agTest.erl
  21. +3
    -3
      src/agVstCli/agVstProto.erl

+ 1
- 1
src/agApi/agAdminMonitor.erl 查看文件

@ -106,7 +106,7 @@ getAdminLogLevel(PoolNameOrSocket) ->
% 405使HTTP方法时返回
% 500
modifyAdminLogLevel(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/log/level">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/log/level">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
% TLS
% TLS数据的摘要

+ 1
- 1
src/agApi/agAnalyzers.erl 查看文件

@ -25,7 +25,7 @@
% 400
% 403使
newAnalyzer(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/analyzer">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/analyzer">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% GET /_api/analyzer/{analyzer-name}

+ 6
- 6
src/agApi/agAqls.erl 查看文件

@ -98,7 +98,7 @@
% 404访使HTTP 404
% 405使 HTTP 使HTTP 405
newCursor(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/cursor">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/cursor">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% PUT /_api/cursor/{cursor-identifier}
@ -164,7 +164,7 @@ delCursor(PoolNameOrSocket, CursorId) ->
% 400使HTTP 400 JSON HTTP 400
% 404访使HTTP 404
explainQuery(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/explain">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/explain">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
% AQL查询并返回有关它的信息
% POST /_api/query
@ -175,7 +175,7 @@ explainQuery(PoolNameOrSocket, MapData) ->
% 200使HTTP 200bindVars属性中返回在查询中找到的绑定参数的名称collections属性中返回查询中使用的collections的数组JSON ast属性将包含查询的抽象语法树表示形式ast的格式在将来的ArangoDB版本中可能会发生变化ArangoDB如何解释给定查询
% 400HTTP 400JSON对象中的错误详细信息
parseQuery(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/query">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/query">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
% AQL
@ -229,7 +229,7 @@ getQueryProps(PoolNameOrSocket) ->
% 200
% 400HTTP 400
changeQueryProps(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/query/properties">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/query/properties">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
% AQL
% GET /_api/query/current
@ -381,7 +381,7 @@ getQCacheProps(PoolNameOrSocket) ->
% 200
% 400HTTP 400
changeQCacheProps(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/query-cache/properties">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/query-cache/properties">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
% AQL用户功能管理固定链接
% AQL用户功能的ArangoDB HTTP接口的简介AQL用户功能是一种使用用户定义的JavaScript代码扩展ArangoDB查询语言AQL
@ -410,7 +410,7 @@ changeQCacheProps(PoolNameOrSocket, MapData) ->
% errorNum
% errorMessage
newUserFun(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/aqlfunction">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/aqlfunction">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
% AQL用户功能
% DELETE /_api/aqlfunction/{name}

+ 3
- 3
src/agApi/agBulkImports.erl 查看文件

@ -58,7 +58,7 @@
% 409complete则返回 true
% 500500
docImports(PoolNameOrSocket, ListOfList, QueryPars) ->
BodyStr = <<<<(eVPack:encodeBin(OneList))/binary, "\n">> || OneList <- ListOfList>>,
BodyStr = <<<<(eVPack:encode(OneList))/binary, "\n">> || OneList <- ListOfList>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/import">>, QueryPars, ?AgDefHeader, BodyStr).
% JSON导入文档
@ -101,9 +101,9 @@ docImports(PoolNameOrSocket, ListOfList, QueryPars) ->
jsonImports(PoolNameOrSocket, MapDataList, QueryPars) ->
case QueryPars of
#{type := list} ->
BodyStr = eVPack:encodeBin(MapDataList);
BodyStr = eVPack:encode(MapDataList);
#{type := documents} ->
BodyStr = <<<<(eVPack:encodeBin(OneList))/binary, "\n">> || OneList <- MapDataList>>;
BodyStr = <<<<(eVPack:encode(OneList))/binary, "\n">> || OneList <- MapDataList>>;
_ ->
BodyStr = MapDataList
end,

+ 1
- 1
src/agApi/agCluster.erl 查看文件

@ -96,7 +96,7 @@ clusterHealth(PoolNameOrSocket) ->
% 501
% 504
setClusterMaintenance(PoolNameOrSocket, OnOrOff) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/cluster/maintenance">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(OnOrOff)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/cluster/maintenance">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(OnOrOff)).
%%%%%%%%%%%%%%% Agency ??????????????????????????

+ 6
- 6
src/agApi/agColls.erl 查看文件

@ -92,10 +92,10 @@
% HTTP 200
newColl(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/collection">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/collection">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
newColl(PoolNameOrSocket, MapData, QueryPars) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/collection">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/collection">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
%
% DELETE /_api/collection/{collection-name}
@ -245,7 +245,7 @@ collFigures(PoolNameOrSocket, CollName, QueryPars) ->
% eg: MapData = #{'_key' => testkey, value => 23}
collResponsibleShard(PoolNameOrSocket, CollName, MapData) ->
Path = <<"/_api/collection/", CollName/binary, "/responsibleShard">>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
% ID
% GET /_api/collection/{collection-name}/shards
@ -351,7 +351,7 @@ loadColl(PoolNameOrSocket, CollName) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path).
loadColl(PoolNameOrSocket, CollName, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/collection/", CollName/binary, "/load">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/collection/", CollName/binary, "/load">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% PUT /_api/collection/{collection-name}/unload
@ -394,7 +394,7 @@ unloadColl(PoolNameOrSocket, CollName) ->
% 404 HTTP 404
renameColl(PoolNameOrSocket, OldName, MapData) ->
Path = <<"/_api/collection/", OldName/binary, "/rename">>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% PUT /_api/collection/{collection-name}/loadIndexesIntoMemory
@ -439,7 +439,7 @@ collLoadIndexesIntoMemory(PoolNameOrSocket, CollName) ->
% 404 HTTP 404
collChangeProps(PoolNameOrSocket, CollName, MapData) ->
Path = <<"/_api/collection/", CollName/binary, "/properties">>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
%

+ 1
- 1
src/agApi/agDbMgr.erl 查看文件

@ -79,7 +79,7 @@ allDbs(PoolNameOrSocket) ->
% 403_system数据库中执行
% 409
newDb(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/database">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData), true).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/database">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData), true).
%
% DELETE /_api/database/{database-name}

+ 18
- 18
src/agApi/agDocs.erl 查看文件

@ -168,11 +168,11 @@ getHead(PoolNameOrSocket, CollName, Key, Headers) ->
% 409409
newDoc(PoolNameOrSocket, CollName, MapData) ->
Path = <<"/_api/document/", CollName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
newDoc(PoolNameOrSocket, CollName, MapData, QueryPars) ->
Path = <<"/_api/document/", CollName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
%
% PUT /_api/document/{collection}/{key}
@ -209,15 +209,15 @@ newDoc(PoolNameOrSocket, CollName, MapData, QueryPars) ->
% 412_rev _id和_key
replaceDoc(PoolNameOrSocket, CollName, Key, MapData) ->
Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
replaceDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars) ->
Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
replaceDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars, Headers) ->
Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, Headers, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, Headers, eVPack:encode(MapData)).
%
% PATCH /_api/document/{collection}/{key}
@ -257,15 +257,15 @@ replaceDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars, Headers) ->
% 412_rev _id和_key
updateDoc(PoolNameOrSocket, CollName, Key, MapData) ->
Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
updateDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars) ->
Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
updateDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars, Headers) ->
Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, Headers, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, Headers, eVPack:encode(MapData)).
%
% DELETE /_api/document/{collection}/{key}
@ -321,7 +321,7 @@ delDoc(PoolNameOrSocket, CollName, Key, QueryPars, Headers) ->
% _rev条件不满足 使
getDocs(PoolNameOrSocket, CollName, KeyOrMapDataList) ->
Path = <<"/_api/document/", CollName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, #{<<"onlyget">> => <<"true">>}, ?AgDefHeader, eVPack:encodeBin(KeyOrMapDataList)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, #{<<"onlyget">> => <<"true">>}, ?AgDefHeader, eVPack:encode(KeyOrMapDataList)).
getDocs(PoolNameOrSocket, CollName, KeyOrMapDataList, QueryPars) ->
LastQueryPars =
@ -334,7 +334,7 @@ getDocs(PoolNameOrSocket, CollName, KeyOrMapDataList, QueryPars) ->
QueryPars#{<<"onlyget">> => <<"true">>}
end,
Path = <<"/_api/document/", CollName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, LastQueryPars, ?AgDefHeader, eVPack:encodeBin(KeyOrMapDataList)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, LastQueryPars, ?AgDefHeader, eVPack:encode(KeyOrMapDataList)).
%
% POST /_api/document/{collection}#multiple
@ -374,11 +374,11 @@ getDocs(PoolNameOrSocket, CollName, KeyOrMapDataList, QueryPars) ->
% 404collection指定的collection未知时返回
newDocs(PoolNameOrSocket, CollName, MapDataList) ->
Path = <<"/_api/document/", CollName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapDataList)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapDataList)).
newDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
Path = <<"/_api/document/", CollName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapDataList)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapDataList)).
%
% PUT /_api/document/{collection}
@ -407,11 +407,11 @@ newDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
% 404
replaceDocs(PoolNameOrSocket, CollName, MapDataList) ->
Path = <<"/_api/document/", CollName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapDataList)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapDataList)).
replaceDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
Path = <<"/_api/document/", CollName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapDataList)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapDataList)).
%
% PATCH /_api/document/{collection}
@ -443,11 +443,11 @@ replaceDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
% 404
updateDocs(PoolNameOrSocket, CollName, MapDataList) ->
Path = <<"/_api/document/", CollName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapDataList)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapDataList)).
updateDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
Path = <<"/_api/document/", CollName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapDataList)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapDataList)).
%
% DELETE /_api/document/{collection}
@ -470,8 +470,8 @@ updateDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
% 404
delDocs(PoolNameOrSocket, CollName, KeyOrMapDataList) ->
Path = <<"/_api/document/", CollName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(KeyOrMapDataList)).
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(KeyOrMapDataList)).
delDocs(PoolNameOrSocket, CollName, KeyOrMapDataList, QueryPars) ->
Path = <<"/_api/document/", CollName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(KeyOrMapDataList)).
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars, ?AgDefHeader, eVPack:encode(KeyOrMapDataList)).

+ 8
- 8
src/agApi/agFoxxServices.erl 查看文件

@ -81,7 +81,7 @@ getFoxxService(PoolNameOrSocket, QueryPars) ->
%
% 201
installFoxx(PoolNameOrSocket, MapData, QueryPars) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/foxx">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/foxx">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
%
% DELETE /_api/foxx/service
@ -121,7 +121,7 @@ uninstallFoxx(PoolNameOrSocket, QueryPars) ->
%
% 200
replaceFoxx(PoolNameOrSocket, MapData, QueryPars) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/foxx/service">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/foxx/service">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
%
% PATCH /_api/foxx/service
@ -149,7 +149,7 @@ replaceFoxx(PoolNameOrSocket, MapData, QueryPars) ->
%
% 200
upgradeFoxx(PoolNameOrSocket, MapData, QueryPars) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, <<"/_api/foxx/service">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, <<"/_api/foxx/service">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
% Foxx服务配置/
% Foxx服务配置和依赖关系的ArangoDB HTTP接口的简介
@ -176,7 +176,7 @@ getFoxxConfig(PoolNameOrSocket, QueryPars) ->
%
% 200
updateFoxxConfig(PoolNameOrSocket, MapData, QueryPars) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, <<"/_api/foxx/configuration">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, <<"/_api/foxx/configuration">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
%
% PUT /_api/foxx/configuration
@ -189,7 +189,7 @@ updateFoxxConfig(PoolNameOrSocket, MapData, QueryPars) ->
%
% 200
replaceFoxxConfig(PoolNameOrSocket, MapData, QueryPars) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/foxx/configuration">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/foxx/configuration">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
%
% GET /_api/foxx/dependencies
@ -214,7 +214,7 @@ getFoxxDependencies(PoolNameOrSocket, QueryPars) ->
%
% 200
updateFoxxDependencies(PoolNameOrSocket, MapData, QueryPars) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, <<"/_api/foxx/dependencies">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, <<"/_api/foxx/dependencies">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
%
% PUT /_api/foxx/dependencies
@ -227,7 +227,7 @@ updateFoxxDependencies(PoolNameOrSocket, MapData, QueryPars) ->
%
% 200
replaceFoxxDependencies(PoolNameOrSocket, MapData, QueryPars) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/foxx/dependencies">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/foxx/dependencies">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
% Foxx服务杂项
%
@ -256,7 +256,7 @@ getFoxxScripts(PoolNameOrSocket, QueryPars) ->
% 200
runFoxxScripts(PoolNameOrSocket, ScriptName, MapData, QueryPars) ->
Path = <<"/_api/foxx/scripts/", ScriptName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
%
% POST /_api/foxx/tests

+ 22
- 22
src/agApi/agGraphs.erl 查看文件

@ -80,10 +80,10 @@ graphs(PoolNameOrSocket) ->
% errorNumArangoDB错误号
% errorMessage
newGraph(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/gharial">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/gharial">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
newGraph(PoolNameOrSocket, MapData, QueryPars) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/gharial">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/gharial">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
%
% GET /_api/gharial/{graph}
@ -183,7 +183,7 @@ vertexCollList(PoolNameOrSocket, GraphName) ->
%% MapData = #{"collection" => "otherVertices"}
addVertexColl(PoolNameOrSocket, GraphName, MapData) ->
Path = <<"/_api/gharial/", GraphName/binary, "/vertex">>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% DELETE /_api/gharial/{graph}/vertex/{collection}
@ -279,7 +279,7 @@ edgeDefs(PoolNameOrSocket, GraphName) ->
% errorMessage
addEdgeDef(PoolNameOrSocket, GraphName, MapData) ->
Path = <<"/_api/gharial/", GraphName/binary, "/edge">>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% PUT /_api/gharial/{graph}/edge/{definition}#definition
@ -322,11 +322,11 @@ addEdgeDef(PoolNameOrSocket, GraphName, MapData) ->
% EdgeDefName MapData中的collection from to
replaceEdgeDef(PoolNameOrSocket, GraphName, EdgeDefName, MapData) ->
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", EdgeDefName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
replaceEdgeDef(PoolNameOrSocket, GraphName, EdgeDefName, MapData, QueryPars) ->
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", EdgeDefName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
%
% DELETE /_api/gharial/{graph}/edge/{definition}#definition
@ -400,11 +400,11 @@ delEdgeDef(PoolNameOrSocket, GraphName, EdgeDefName, QueryPars) ->
% errorMessage
newVertex(PoolNameOrSocket, GraphName, CollName, MapData) ->
Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
newVertex(PoolNameOrSocket, GraphName, CollName, MapData, QueryPars) ->
Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
%
% GET /_api/gharial/{graph}/vertex/{collection}/{vertex}
@ -509,15 +509,15 @@ getVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, QueryPars, Headers)
% errorMessage
updateVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData) ->
Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
updateVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPars) ->
Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
updateVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPars, Headers) ->
Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, Headers, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, Headers, eVPack:encode(MapData)).
%
% PUT /_api/gharial/{graph}/vertex/{collection}/{vertex}
@ -569,15 +569,15 @@ updateVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPar
% errorMessage
replaceVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData) ->
Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
replaceVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPars) ->
Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
replaceVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPars, Headers) ->
Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, Headers, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, Headers, eVPack:encode(MapData)).
%
% DELETE /_api/gharial/{graph}/vertex/{collection}/{vertex}
@ -678,11 +678,11 @@ delVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, QueryPars, Headers)
% errorMessage
newEdge(PoolNameOrSocket, GraphName, CollName, MapData) ->
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
newEdge(PoolNameOrSocket, GraphName, CollName, MapData, QueryPars) ->
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
%
% GET /_api/gharial/{graph}/edge/{collection}/{edge}
@ -788,15 +788,15 @@ getEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, QueryPars, Headers) ->
% errorMessage
updateEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData) ->
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
updateEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, QueryPars) ->
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
updateEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, Headers, QueryPars) ->
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, Headers, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, QueryPars, Headers, eVPack:encode(MapData)).
%
@ -851,15 +851,15 @@ updateEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, Headers, Que
% errorMessage
replaceEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData) ->
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
replaceEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, QueryPars) ->
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
replaceEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, QueryPars, Headers) ->
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, Headers, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, QueryPars, Headers, eVPack:encode(MapData)).
%
% DELETE /_api/gharial/{graph}/edge/{collection}/{edge}

+ 5
- 5
src/agApi/agHotBackup.erl 查看文件

@ -30,7 +30,7 @@
% 400使HTTP方法调用了create命令POSTHTTP 400
% 408HTTP 408
newBackup(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/create">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/create">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% POST /_admin/backup/restore
@ -41,7 +41,7 @@ newBackup(PoolNameOrSocket, MapData) ->
% 200
% 400使HTTP方法调用了restore命令POSTHTTP 400
restoreBackup(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/restore">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/restore">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% POST /_admin/backup/delete
@ -53,7 +53,7 @@ restoreBackup(PoolNameOrSocket, MapData) ->
% 400使HTTP方法调用delete命令POSTHTTP 400
% 404id找不到与该标识符相对应的备份
delBackup(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/delete">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/delete">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% POST /_admin/backup/list
@ -90,7 +90,7 @@ backupList(PoolNameOrSocket) ->
% 401HTTP 400
% 404id uploadId
uploadBackup(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/upload">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/upload">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% POST /_admin/backup/download
@ -108,4 +108,4 @@ uploadBackup(PoolNameOrSocket, MapData) ->
% 401HTTP 401
% 404id downloadId
downloadBackup(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/download">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/download">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).

+ 7
- 7
src/agApi/agIndexes.erl 查看文件

@ -75,7 +75,7 @@ getIndexInfo(PoolNameOrSocket, IndexId) ->
% 400使HTTP 400
% 404HTTP 404
newIndex(PoolNameOrSocket, MapData, QueryPars) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
%
% DELETE /_api/index/{index-id}
@ -122,7 +122,7 @@ indexList(PoolNameOrSocket, QueryPars) ->
% 400使HTTP 400
% 404HTTP 404
newIndexOfHash(PoolNameOrSocket, MapData, QueryPars) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
% 使
% /_api/simple/range和其他操作将使用该索引来执行查询
@ -147,7 +147,7 @@ newIndexOfHash(PoolNameOrSocket, MapData, QueryPars) ->
% 400HTTP 400
% 404HTTP 404
newIndexOfSkipList(PoolNameOrSocket, MapData, QueryPars) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
% 使
% /_api/simple/range其他操作将使用该索引执行查询
@ -172,7 +172,7 @@ newIndexOfSkipList(PoolNameOrSocket, MapData, QueryPars) ->
% 400HTTP 400
% 404HTTP 404
newIndexOfPersistent(PoolNameOrSocket, MapData, QueryPars) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
% 使TTL
%
@ -191,7 +191,7 @@ newIndexOfPersistent(PoolNameOrSocket, MapData, QueryPars) ->
% 400TTL索引HTTP 400TTL索引
% 404HTTP 404
newIndexOfTtl(PoolNameOrSocket, MapData, QueryPars) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
%
% POST /_api/index#geo
@ -211,7 +211,7 @@ newIndexOfTtl(PoolNameOrSocket, MapData, QueryPars) ->
% 201 HTTP 201
% 404HTTP 404
newIndexOfGeo(PoolNameOrSocket, MapData, QueryPars) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
%
% /_api/simple/fulltext则将使用该索引执行指定的全文查询
@ -229,4 +229,4 @@ newIndexOfGeo(PoolNameOrSocket, MapData, QueryPars) ->
% 201 HTTP 201
% 404HTTP 404
newIndexOfFulltext(PoolNameOrSocket, MapData, QueryPars) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/index">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).

+ 2
- 2
src/agApi/agMiscFuns.erl 查看文件

@ -111,7 +111,7 @@ getWalProps(PoolNameOrSocket) ->
% 200
% 405使HTTP方法时返回
setWalProps(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/wal/properties">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/wal/properties">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% GET /_admin/wal/transactions
@ -166,7 +166,7 @@ curDbTime(PoolNameOrSocket) ->
% path
% rawRequestBody
echo(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/echo">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/echo">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% GET /_admin/database/target-version

+ 1
- 1
src/agApi/agPregel.erl 查看文件

@ -35,7 +35,7 @@
% 403访 Pregel HTTP 403
% 404graphNamevertexCollectionsedgeCollections HTTP 404
run(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/control_pregel">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/control_pregel">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
% Pregel
% GET /_api/control_pregel/{id}

+ 6
- 6
src/agApi/agReplication.erl 查看文件

@ -77,7 +77,7 @@ getRepInventory(PoolNameOrSocket, QueryPars) ->
% 400 ttl DBserver属性或协调器上的DBserver属性不合法
% 405使HTTP方法时返回
newRepBatch(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/replication/batch">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/replication/batch">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
%
@ -114,7 +114,7 @@ delRepBatch(PoolNameOrSocket, BatchId) ->
% 使
prolongRepBatch(PoolNameOrSocket, BatchId, MapData) ->
Path = <<"/_api/replication/batch/", (agMiscUtils:toBinary(BatchId))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
%
@ -269,7 +269,7 @@ getRepDoc(PoolNameOrSocket, QueryPars) ->
% 500
% 501
startRepSync(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/sync">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/sync">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
%
@ -462,10 +462,10 @@ getRepApplierConfig(PoolNameOrSocket, QueryPars) ->
% 405使HTTP方法时返回
% 500500
setRepApplierConfig(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-config">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-config">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
setRepApplierConfig(PoolNameOrSocket, MapData, QueryPars) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-config">>, QueryPars, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-config">>, QueryPars, ?AgDefHeader, eVPack:encode(MapData)).
%
% PUT /_api/replication/applier-start
@ -613,7 +613,7 @@ getRepApplierState(PoolNameOrSocket, QueryPars) ->
% 500
% 501Coordinator上调用该操作时返回
changeRepMakeSlave(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/make-follower">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/make-follower">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
%ID

+ 2
- 2
src/agApi/agTasks.erl 查看文件

@ -54,7 +54,7 @@ getTask(PoolNameOrSocket, TaskId) ->
% errorfalse
% 400HTTP 400
newTask(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/tasks">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/tasks">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
% ID的新任务
% PUT /_api/tasks/{id}
@ -71,7 +71,7 @@ newTask(PoolNameOrSocket, MapData) ->
% 400ID已经存在或其余主体不正确HTTP 400
newTask(PoolNameOrSocket, TaskId, MapData) ->
Path = <<"/_api/tasks/", (agMiscUtils:toBinary(TaskId))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% DELETE /_api/tasks/{id}

+ 2
- 2
src/agApi/agTransactions.erl 查看文件

@ -79,7 +79,7 @@
% 400使HTTP 400
% 404使HTTP 404
beginTransaction(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/transaction/begin">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/transaction/begin">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% GET /_api/transaction/{transaction-id}
@ -196,7 +196,7 @@ transactionList(PoolNameOrSocket) ->
% 404使HTTP 404
% 500使HTTP 500
executeTransaction(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/transaction">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/transaction">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).

+ 5
- 5
src/agApi/agUserMgr.erl 查看文件

@ -28,7 +28,7 @@
% 403访访
% 409
newUser(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/user">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/user">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
% 访
% PUT /_api/user/{user}/database/{dbname}
@ -47,7 +47,7 @@ newUser(PoolNameOrSocket, MapData) ->
% 403访访
setUserDbAccessLevel(PoolNameOrSocket, UserName, DbName, MapData) ->
Path = <<"/_api/user/", UserName/binary, "/database/", DbName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
% 访
% PUT /_api/user/{user}/database/{dbname}/{collection}
@ -68,7 +68,7 @@ setUserDbAccessLevel(PoolNameOrSocket, UserName, DbName, MapData) ->
% 403访访
setUserCollAccessLevel(PoolNameOrSocket, UserName, DbName, CollName, MapData) ->
Path = <<"/_api/user/", UserName/binary, "/database/", DbName/binary, "/", CollName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
% 访访
% DELETE /_api/user/{user}/database/{dbname}
@ -170,7 +170,7 @@ getUserCollAccessLevel(PoolNameOrSocket, UserName, DbName, CollName) ->
% 404
replaceUser(PoolNameOrSocket, UserName, MapData) ->
Path = <<"/_api/user/", UserName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% PATCH /_api/user/{user}
@ -189,7 +189,7 @@ replaceUser(PoolNameOrSocket, UserName, MapData) ->
% 404
updateUser(PoolNameOrSocket, UserName, MapData) ->
Path = <<"/_api/user/", UserName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% DELETE /_api/user/{user}

+ 4
- 4
src/agApi/agViews.erl 查看文件

@ -64,7 +64,7 @@
% 400name或type属性丢失或无效 HTTP 400
% 409name的视图HTTP 409
newView(PoolNameOrSocket, MapData) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/view">>, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/view">>, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% GET /_api/view/{view-name}
@ -139,7 +139,7 @@ getViewProps(PoolNameOrSocket, ViewName) ->
% 404HTTP 404
changeViewAllProps(PoolNameOrSocket, ViewName, MapData) ->
Path = <<"/_api/view/", ViewName/binary, "/properties">>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
% ArangoSearch视图的属性
% PATCH /_api/view/{view-name}/properties#ArangoSearch
@ -176,7 +176,7 @@ changeViewAllProps(PoolNameOrSocket, ViewName, MapData) ->
% 404HTTP 404
changeViewPartProps(PoolNameOrSocket, ViewName, MapData) ->
Path = <<"/_api/view/", ViewName/binary, "/properties">>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% PUT /_api/view/{view-name}/rename
@ -194,7 +194,7 @@ changeViewPartProps(PoolNameOrSocket, ViewName, MapData) ->
% 404HTTP 404
renameView(PoolNameOrSocket, ViewName, MapData) ->
Path = <<"/_api/view/", ViewName/binary, "/rename">>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encodeBin(MapData)).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, ?AgDefQuery, ?AgDefHeader, eVPack:encode(MapData)).
%
% DELETE /_api/view/{view-name}

+ 5
- 5
src/agTest.erl 查看文件

@ -126,10 +126,10 @@ tcjf(N, Args1) ->
tcvp(0, _Args1) ->
Args = #{name => ffd, tet => "fdsff", <<"dfdf">> => 131245435346},
eVPack:encodeBin(Args);
eVPack:encode(Args);
tcvp(N, Args1) ->
Args = #{name => ffd, tet => "fdsff", <<"dfdf">> => 131245435346},
eVPack:encodeBin(Args),
eVPack:encode(Args),
tcvp(N - 1, Args1).
tcjx(0, _Args1) ->
@ -147,12 +147,12 @@ getBin(2) ->
<<"{\"_key\":\"01J\",\"_id\":\"airports/01J\",\"_rev\":\"_aPaBl7O--_\",\"name\":\"Hilliard Airpark\",\"city\":\"Hilliardfdfsdfdsffffffffffffffffffffffffffffffffffffffffffffffffffffffffafdsfasdfdafsdafdsfsdafdsafdsfdsfdsafdsfdsfdsfhghfghfghgfhsdsdfdsfdsfdsffdfddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddggggggggggggggggggggggggggggggggggggggggg\",\"state\":\"FL\",\"country\":\"USAjjkjkjkfgjkgjfkdjgldgjldjglfdjglfjdljljrlejtrltjewltjrelwtjrletjrletrletjlrejtjtrlwjrejwlrjjreljtljelwjrtlwjtreljrlewjrlwjrlwejrlejltkdfsafd\",\"lat\":30.6880125,\"long\":-81.90594389,\"vip\":false}">>;
getBin(3) ->
Map = jiffy:decode(getBin(1), [return_maps]),
eVPack:encodeBin(Map);
eVPack:encode(Map);
getBin(4) ->
Map = jiffy:decode(getBin(2), [return_maps]),
eVPack:encodeBin(Map);
eVPack:encode(Map);
getBin(5) ->
Header = eVPack:encodeBin([1, 2, 200, #{aaa => bbbb}]),
Header = eVPack:encode([1, 2, 200, #{aaa => bbbb}]),
<<Header/binary, (getBin(4))/binary>>.

+ 3
- 3
src/agVstCli/agVstProto.erl 查看文件

@ -14,7 +14,7 @@
-spec authInfo(User :: binary(), Password :: binary()) -> ok.
authInfo(User, Password) ->
?AgDebug('IMY******authInfo', " User:~p", [User]),
AuthInfo = eVPack:encodeBin([1, 1000, <<"plain">>, User, Password]),
AuthInfo = eVPack:encode([1, 1000, <<"plain">>, User, Password]),
MsgSize = erlang:byte_size(AuthInfo),
<<(MsgSize + ?AgHeaderSize):32/integer-little-unsigned, 3:32/integer-little-unsigned, (agVstCli:getMsgId()):64/integer-little-unsigned, MsgSize:64/integer-little-unsigned, AuthInfo/binary>>.
@ -25,9 +25,9 @@ request(IsSystem, MessageId, Method, DbName, Path, QueryPars, Headers, Body, Vst
ReqBin =
case IsSystem of
false ->
eVPack:encodeBin([1, 1, DbName, Method, Path, QueryPars, Headers]);
eVPack:encode([1, 1, DbName, Method, Path, QueryPars, Headers]);
_ ->
eVPack:encodeBin([1, 1, <<"_system">>, Method, Path, QueryPars, Headers])
eVPack:encode([1, 1, <<"_system">>, Method, Path, QueryPars, Headers])
end,
MsgBin = <<ReqBin/binary, Body/binary>>,

Loading…
取消
儲存