瀏覽代碼

适配 vst 协议

master
SisMaker 4 年之前
父節點
當前提交
83ad51defd
共有 21 個文件被更改,包括 176 次插入172 次删除
  1. +4
    -0
      include/eArango.hrl
  2. +18
    -20
      src/agApi/agAdminMonitor.erl
  3. +7
    -8
      src/agApi/agAnalyzers.erl
  4. +27
    -30
      src/agApi/agAqls.erl
  5. +8
    -9
      src/agApi/agAsyncResultHandling.erl
  6. +6
    -6
      src/agApi/agBulkImportExport.erl
  7. +6
    -6
      src/agApi/agCollections.erl
  8. +1
    -1
      src/agApi/agDbMgr.erl
  9. +18
    -18
      src/agApi/agDocuments.erl
  10. +8
    -8
      src/agApi/agFoxxServices.erl
  11. +22
    -22
      src/agApi/agGeneralGraphs.erl
  12. +5
    -5
      src/agApi/agHotBackup.erl
  13. +13
    -13
      src/agApi/agIndexes.erl
  14. +2
    -2
      src/agApi/agMiscFuns.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. +3
    -3
      src/agVstCli/agTcpAgencyIns.erl
  21. +9
    -2
      src/agVstCli/agVstCli.erl

+ 4
- 0
include/eArango.hrl 查看文件

@ -5,3 +5,7 @@
-define(AgHead, 4). %% (not used in VPP)
-define(AgPatch, 5).
-define(AgOptions, 6). %% (not used in VPP)
-define(AgDefQuery, #{}).
-define(AgDefHeader, #{}).
-define(AgDefBody, <<>>).

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

@ -34,12 +34,10 @@
% 400up或level指定了无效值
% 500
getAdminLog(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/log">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/log">>).
getAdminLog(PoolNameOrSocket, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_admin/log", QueryBinary/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/log">>, QueryPars, ?AgDefHeader, ?AgDefBody).
%
% GET /_admin/log/level
@ -48,7 +46,7 @@ getAdminLog(PoolNameOrSocket, QueryPars) ->
% 200
% 500
getAdminLogLevel(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/log/level">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/log/level">>).
%
% PUT /_admin/log/level
@ -109,8 +107,8 @@ getAdminLogLevel(PoolNameOrSocket) ->
% 405使HTTP方法时返回
% 500
modifyAdminLogLevel(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/log/level">>, [], BodyStr).
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/log/level">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
%
% GET /_admin/statistics
@ -180,7 +178,7 @@ modifyAdminLogLevel(PoolNameOrSocket, MapData) ->
% 线
% 线
getAdminProps(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/statistics">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/statistics">>).
%
%
@ -214,7 +212,7 @@ getAdminProps(PoolNameOrSocket) ->
% codeHTTP状态码
% false
getAdminStatisticsDesc(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/statistics-description">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/statistics-description">>).
% TLS
% TLS数据的摘要
@ -233,7 +231,7 @@ getAdminStatisticsDesc(PoolNameOrSocket) ->
%
% 200API将返回HTTP 200
getAdminTLS(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/server/tls">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/server/tls">>).
% TLS数据的重新加载并返回摘要永久链接
% TLS数据CA
@ -244,9 +242,9 @@ getAdminTLS(PoolNameOrSocket) ->
% 200API将返回HTTP 200
% 403使APIHTTP 403 FORBIDDEN
triggerAdminTLS(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/server/tls">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/server/tls">>).
%
% IMY-todo json也不是vpack
% GET /_admin/metrics
% Prometheus格式返回实例的当前指标Prometheus收集
% 使arangodb_或rocksdb_字符串发布
@ -255,7 +253,7 @@ triggerAdminTLS(PoolNameOrSocket) ->
% 200
% 404使--server.export-metrics-api false API API
getAdminMetrics(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/metrics">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/metrics">>).
%
@ -267,7 +265,7 @@ getAdminMetrics(PoolNameOrSocket) ->
%
% 200API将返回HTTP 200
getAdminServerMode(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/server/mode">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/server/mode">>).
% ID
% ID
@ -277,7 +275,7 @@ getAdminServerMode(PoolNameOrSocket) ->
% 200
% 500
getAdminServerId(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/server/id">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/server/id">>).
%
% GET /_admin/server/role
@ -294,7 +292,7 @@ getAdminServerId(PoolNameOrSocket) ->
% errorNum
% [ SINGLEPRIMARYSECONDARYAGENTUNDEFINED ]
getAdminServerRole(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/server/role">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/server/role">>).
%
@ -305,7 +303,7 @@ getAdminServerRole(PoolNameOrSocket) ->
% 200API将返回HTTP 200
% 503HTTP 503
getAdminServerAvailability(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/server/availability">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/server/availability">>).
% DBserver
%
@ -318,7 +316,7 @@ getAdminServerAvailability(PoolNameOrSocket) ->
% 403
getAdminClusterProps(PoolNameOrSocket, DBserver) ->
Path = <<"/_admin/clusterStatistics?DBserver=", (agMiscUtils:toBinary(DBserver))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
% Permalink
%
@ -349,7 +347,7 @@ getAdminClusterProps(PoolNameOrSocket, DBserver) ->
%
% 200
getAdminClusterHealth(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/cluster/health">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_admin/cluster/health">>).
%
% POST /_admin/routing/reload
@ -357,4 +355,4 @@ getAdminClusterHealth(PoolNameOrSocket) ->
%
% 200
reloadAdminRouting(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/routing/reload">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/routing/reload">>).

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

@ -25,8 +25,8 @@
% 400
% 403使
newAnalyzer(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/analyzer">>, [], BodyStr).
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/analyzer">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
%
% GET /_api/analyzer/{analyzer-name}
@ -42,7 +42,7 @@ newAnalyzer(PoolNameOrSocket, MapData) ->
% 404
getAnalyzer(PoolNameOrSocket, AnalyzerName) ->
Path = <<"/_api/analyzer/", AnalyzerName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
%
% GET /_api/analyzer
@ -54,7 +54,7 @@ getAnalyzer(PoolNameOrSocket, AnalyzerName) ->
%
% 200
getAnalyzerList(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/analyzer">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/analyzer">>).
%
% DELETE /_api/analyzer/{analyzer-name}
@ -74,9 +74,8 @@ getAnalyzerList(PoolNameOrSocket) ->
% 409使
delAnalyzer(PoolNameOrSocket, AnalyzerName) ->
Path = <<"/_api/analyzer/", AnalyzerName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).
delAnalyzer(PoolNameOrSocket, AnalyzerName, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/analyzer/", AnalyzerName/binary, QueryBinary/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
Path = <<"/_api/analyzer/", AnalyzerName/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars, ?AgDefHeader, ?AgDefBody).

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

@ -85,8 +85,8 @@
% 404访HTTP 404
% 405使HTTP方法HTTP 405
newCursor(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/cursor">>, [], BodyStr).
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/cursor">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
%
@ -105,7 +105,7 @@ newCursor(PoolNameOrSocket, MapData) ->
% 404使HTTP 404
nextCursor(PoolNameOrSocket, CursorId) ->
Path = <<"/_api/cursor/", (agMiscUtils:toBinary(CursorId))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path).
%
% DELETE /_api/cursor/{cursor-identifier}
@ -119,7 +119,7 @@ nextCursor(PoolNameOrSocket, CursorId) ->
% 404404使
delCursor(PoolNameOrSocket, CursorId) ->
Path = <<"/_api/cursor/", (agMiscUtils:toBinary(CursorId))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).
% AQL查询的HTTP接口
%
@ -154,8 +154,8 @@ delCursor(PoolNameOrSocket, CursorId) ->
% 400HTTP 400JSON对象中的错误详细信息HTTP 400
% 404访HTTP 404
explainQuery(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/explain">>, [], BodyStr).
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/explain">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
% AQL查询并返回有关它的信息
% POST /_api/query
@ -166,8 +166,8 @@ explainQuery(PoolNameOrSocket, MapData) ->
% 200使HTTP 200bindVars属性中返回在查询中找到的绑定参数的名称collections属性中返回查询中使用的collections的数组JSON ast属性将包含查询的抽象语法树表示形式ast的格式在将来的ArangoDB版本中可能会发生变化ArangoDB如何解释给定查询
% 400HTTP 400JSON对象中的错误详细信息
parseQuery(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/query">>, [], BodyStr).
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/query">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
%
% ArangoDB具有HTTP接口AQL查询列表和慢速AQL查询列表使APIHTTP请求的数据库中启用查询跟踪
@ -185,7 +185,7 @@ parseQuery(PoolNameOrSocket, MapData) ->
% 200
% 400HTTP 400
getQueryProps(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/query/properties">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/query/properties">>).
% AQL查询跟踪的配置
% PUT /_api/query/properties
@ -202,8 +202,8 @@ getQueryProps(PoolNameOrSocket) ->
% 200
% 400HTTP 400
changeQueryProps(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/query/properties">>, [], BodyStr).
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/query/properties">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
% AQL查询的列表
% GET /_api/query/current
@ -219,7 +219,7 @@ changeQueryProps(PoolNameOrSocket, MapData) ->
% 200
% 400HTTP 400
currentQuery(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/query/current">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/query/current">>).
% AQL查询的列表
@ -237,7 +237,7 @@ currentQuery(PoolNameOrSocket) ->
% 200
% 400HTTP 400
getSlowQuery(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/query/slow">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/query/slow">>).
% AQL查询列表
% DELETE /_api/query/slow
@ -246,7 +246,7 @@ getSlowQuery(PoolNameOrSocket) ->
% 200HTTP 200
% 400使HTTP 400
delSlowQuery(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, <<"/_api/query/slow">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, <<"/_api/query/slow">>).
%
@ -263,7 +263,7 @@ delSlowQuery(PoolNameOrSocket) ->
% 404ID的查询时HTTP 404
killQuery(PoolNameOrSocket, QueryId) ->
Path = <<"/_api/query/", (agMiscUtils:toBinary(QueryId))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).
% AQL查询结果缓存的HTTP接口
% AQL查询结果缓存的API方法
@ -284,7 +284,7 @@ killQuery(PoolNameOrSocket, QueryId) ->
% 200
% 400HTTP 400
getQueryCaches(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/query-cache/entries">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/query-cache/entries">>).
% AQL查询结果缓存中的所有结果
% DELETE /_api/query-cache
@ -293,7 +293,7 @@ getQueryCaches(PoolNameOrSocket) ->
% 200HTTP 200
% 400使HTTP 400
clearQueryCaches(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, <<"/_api/query-cache">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, <<"/_api/query-cache">>).
% AQL查询结果缓存的全局配置
% GET /_api/query-cache/properties
@ -307,7 +307,7 @@ clearQueryCaches(PoolNameOrSocket) ->
% 200
% 400HTTP 400
getQCacheProps(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/query-cache/properties">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/query-cache/properties">>).
% AQL查询结果缓存属性
% PUT /_api/query-cache/properties
@ -323,8 +323,8 @@ getQCacheProps(PoolNameOrSocket) ->
% 200
% 400HTTP 400
changeQCacheProps(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/query-cache/properties">>, [], BodyStr).
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/query-cache/properties">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
% AQL用户功能管理固定链接
% AQL用户功能的ArangoDB HTTP接口的简介AQL用户功能是一种使用用户定义的JavaScript代码扩展ArangoDB查询语言AQL
@ -353,8 +353,8 @@ changeQCacheProps(PoolNameOrSocket, MapData) ->
% errorNum
% errorMessage
newUserFun(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/aqlfunction">>, [], BodyStr).
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/aqlfunction">>, ?AgDefQuery, ?AgDefHeader, BodyStr).
% AQL用户功能
% DELETE /_api/aqlfunction/{name}
@ -381,12 +381,11 @@ newUserFun(PoolNameOrSocket, MapData) ->
% errorMessage
delUserFun(PoolNameOrSocket, UserFunName) ->
Path = <<"/_api/aqlfunction/", (agMiscUtils:toBinary(UserFunName))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).
delUserFun(PoolNameOrSocket, UserFunName, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/aqlfunction/", (agMiscUtils:toBinary(UserFunName))/binary, QueryBinary/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
Path = <<"/_api/aqlfunction/", (agMiscUtils:toBinary(UserFunName))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars, ?AgDefHeader, ?AgDefBody).
% AQL用户功能
% GET /_api/aqlfunction
@ -407,12 +406,10 @@ delUserFun(PoolNameOrSocket, UserFunName, QueryPars) ->
% errorNum
% errorMessage
getUserFuns(PoolNameOrSocket) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/aqlfunction">>, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/aqlfunction">>).
getUserFuns(PoolNameOrSocket, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/aqlfunction", QueryBinary/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, <<"/_api/aqlfunction">>, QueryPars, ?AgDefHeader, ?AgDefBody).

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

@ -68,7 +68,7 @@
% 404404x-arango-async-id HTTP标头
getAsyncJobRet(PoolNameOrSocket, JodId) ->
Path = <<"/_api/job/", (agMiscUtils:toBinary(JodId))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path).
%
@ -82,7 +82,7 @@ getAsyncJobRet(PoolNameOrSocket, JodId) ->
% 404404x-arango-async-id HTTP标头
cancelAsyncJob(PoolNameOrSocket, JodId) ->
Path = <<"/_api/job/", (agMiscUtils:toBinary(JodId))/binary, "/cancel">>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path).
%
% DELETE /_api/job/{type}#by-type
@ -100,12 +100,11 @@ cancelAsyncJob(PoolNameOrSocket, JodId) ->
% 404type为job-idid的异步作业404
delAsyncJobRet(PoolNameOrSocket, TypeOrJodId) ->
Path = <<"/_api/job/", (agMiscUtils:toBinary(TypeOrJodId))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path).
delAsyncJobRet(PoolNameOrSocket, TypeOrJodId, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/job/", (agMiscUtils:toBinary(TypeOrJodId))/binary, QueryBinary/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], undefined).
Path = <<"/_api/job/", (agMiscUtils:toBinary(TypeOrJodId))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, QueryPars, ?AgDefHeader, ?AgDefBody).
%
% GET /_api/job/{job-id}
@ -118,7 +117,7 @@ delAsyncJobRet(PoolNameOrSocket, TypeOrJodId, QueryPars) ->
% 404404
getAsyncJobStatus(PoolNameOrSocket, JodId) ->
Path = <<"/_api/job/", (agMiscUtils:toBinary(JodId))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
% ID
% GET /_api/job/{type}#by-type
@ -132,9 +131,9 @@ getAsyncJobStatus(PoolNameOrSocket, JodId) ->
% 400type或值无效
getAsyncJobList(PoolNameOrSocket, Type) ->
Path = <<"/_api/job/", (agMiscUtils:toBinary(Type))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).
getAsyncJobList(PoolNameOrSocket, Type, Count) ->
Path = <<"/_api/job/", (agMiscUtils:toBinary(Type))/binary, "?count=", (agMiscUtils:toBinary(Count))/binary>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], undefined).
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path).

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

@ -57,9 +57,9 @@
% 500500
docImport(PoolNameOrSocket, ListOfList, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/import", QueryBinary/binary>>,
BodyStr = <<<<(jiffy:encode(OneList))/binary, "\n">> || OneList <- ListOfList>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
Path = <<"/_api/import">>,
BodyStr = <<<<(eVPack:encodeBin(OneList))/binary, "\n">> || OneList <- ListOfList>>,
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, QueryPars, ?AgDefHeader, BodyStr).
% JSON导入文档
% POST /_api/import#json
@ -101,9 +101,9 @@ docImport(PoolNameOrSocket, ListOfList, QueryPars) ->
jsonImport(PoolNameOrSocket, MapDataList, QueryPars) ->
case lists:keyfind(type, 1, QueryPars) of
{type, list} ->
BodyStr = jiffy:encode(MapDataList);
BodyStr = eVPack:encodeBin(MapDataList);
{type, documents} ->
BodyStr = <<<<(jiffy:encode(OneList))/binary, "\n">> || OneList <- MapDataList>>;
BodyStr = <<<<(eVPack:encodeBin(OneList))/binary, "\n">> || OneList <- MapDataList>>;
_ ->
BodyStr = MapDataList
end,
@ -229,5 +229,5 @@ jsonImport(PoolNameOrSocket, MapDataList, QueryPars) ->
% 501API使HTTP 501
docExport(PoolNameOrSocket, CollName, MapData) ->
Path = <<"/_api/export?collection=", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).

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

@ -92,13 +92,13 @@
% HTTP 200
newColl(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/collection">>, [], BodyStr).
newColl(PoolNameOrSocket, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/collection", QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
%
@ -231,7 +231,7 @@ collFigures(PoolNameOrSocket, CollName) ->
% eg: MapData = #{'_key' => testkey, value => 23}
collResponsibleShard(PoolNameOrSocket, CollName, MapData) ->
Path = <<"/_api/collection/", CollName/binary, "/responsibleShard">>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgGet, Path, [], BodyStr).
% ID
@ -351,7 +351,7 @@ loadColl(PoolNameOrSocket, CollName) ->
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], undefined).
loadColl(PoolNameOrSocket, CollName, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/collection/", CollName/binary, "/load">>, [], BodyStr).
%
@ -421,7 +421,7 @@ collLoadIndexesIntoMemory(PoolNameOrSocket, CollName) ->
% 404 HTTP 404
collChangeProps(PoolNameOrSocket, CollName, MapData) ->
Path = <<"/_api/collection/", CollName/binary, "/properties">>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
%
@ -446,7 +446,7 @@ collChangeProps(PoolNameOrSocket, CollName, MapData) ->
% 404 HTTP 404
renameColl(PoolNameOrSocket, OldName, NewName) ->
Path = <<"/_api/collection/", OldName/binary, "/rename">>,
NameStr = jiffy:encode(NewName),
NameStr = eVPack:encodeBin(NewName),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], <<"{\"name\":", NameStr/binary, "}">>).
%

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

@ -79,7 +79,7 @@ allDbs(PoolNameOrSocket) ->
% 403_system数据库中执行
% 409
newDb(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/database">>, [], BodyStr, true).
%

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

@ -168,13 +168,13 @@ getDocHead(PoolNameOrSocket, CollName, Key, Headers) ->
% 409409
newDoc(PoolNameOrSocket, CollName, MapData) ->
Path = <<"/_api/document/", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
newDoc(PoolNameOrSocket, CollName, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/document/", CollName/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
%
@ -212,19 +212,19 @@ newDoc(PoolNameOrSocket, CollName, MapData, QueryPars) ->
% 412_rev _id和_key
replaceDoc(PoolNameOrSocket, CollName, Key, MapData) ->
Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
replaceDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
replaceDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars, Headers) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, Headers, BodyStr).
%
@ -265,19 +265,19 @@ 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>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
updateDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
updateDoc(PoolNameOrSocket, CollName, Key, MapData, QueryPars, Headers) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/document/", CollName/binary, "/", (agMiscUtils:toBinary(Key))/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, Headers, BodyStr).
%
@ -337,7 +337,7 @@ delDoc(PoolNameOrSocket, CollName, Key, QueryPars, Headers) ->
getDocs(PoolNameOrSocket, CollName, KeyOrMapDataList) ->
QueryBinary = agMiscUtils:spellQueryPars([{onlyget, true}]),
Path = <<"/_api/document/", CollName/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(KeyOrMapDataList),
BodyStr = eVPack:encodeBin(KeyOrMapDataList),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
getDocs(PoolNameOrSocket, CollName, KeyOrMapDataList, QueryPars) ->
@ -350,7 +350,7 @@ getDocs(PoolNameOrSocket, CollName, KeyOrMapDataList, QueryPars) ->
end,
QueryBinary = agMiscUtils:spellQueryPars(LastQueryPars),
Path = <<"/_api/document/", CollName/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(KeyOrMapDataList),
BodyStr = eVPack:encodeBin(KeyOrMapDataList),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
%
@ -385,13 +385,13 @@ getDocs(PoolNameOrSocket, CollName, KeyOrMapDataList, QueryPars) ->
% MapDataList的顺序返回执行结果
newDocs(PoolNameOrSocket, CollName, MapDataList) ->
Path = <<"/_api/document/", CollName/binary>>,
BodyStr = jiffy:encode(MapDataList),
BodyStr = eVPack:encodeBin(MapDataList),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
newDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/document/", CollName/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapDataList),
BodyStr = eVPack:encodeBin(MapDataList),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
%
@ -421,13 +421,13 @@ newDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
% 404
replaceDocs(PoolNameOrSocket, CollName, MapDataList) ->
Path = <<"/_api/document/", CollName/binary>>,
BodyStr = jiffy:encode(MapDataList),
BodyStr = eVPack:encodeBin(MapDataList),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
replaceDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/document/", CollName/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapDataList),
BodyStr = eVPack:encodeBin(MapDataList),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
%
@ -460,13 +460,13 @@ replaceDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
% 404
updateDocs(PoolNameOrSocket, CollName, MapDataList) ->
Path = <<"/_api/document/", CollName/binary>>,
BodyStr = jiffy:encode(MapDataList),
BodyStr = eVPack:encodeBin(MapDataList),
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
updateDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/document/", CollName/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapDataList),
BodyStr = eVPack:encodeBin(MapDataList),
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
%
@ -490,11 +490,11 @@ updateDocs(PoolNameOrSocket, CollName, MapDataList, QueryPars) ->
% 404
delDocs(PoolNameOrSocket, CollName, KeyOrMapDataList) ->
Path = <<"/_api/document/", CollName/binary, "/">>,
BodyStr = jiffy:encode(KeyOrMapDataList),
BodyStr = eVPack:encodeBin(KeyOrMapDataList),
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], BodyStr).
delDocs(PoolNameOrSocket, CollName, KeyOrMapDataList, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/document/", CollName/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(KeyOrMapDataList),
BodyStr = eVPack:encodeBin(KeyOrMapDataList),
agVstCli:callAgency(PoolNameOrSocket, ?AgDelete, Path, [], BodyStr).

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

@ -85,7 +85,7 @@ getFoxxService(PoolNameOrSocket, Mount) ->
installFoxx(PoolNameOrSocket, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/foxx", QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
%
@ -130,7 +130,7 @@ uninstallFoxx(PoolNameOrSocket, QueryPars) ->
replaceFoxx(PoolNameOrSocket, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/foxx/service", QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
%
@ -161,7 +161,7 @@ replaceFoxx(PoolNameOrSocket, MapData, QueryPars) ->
upgradeFoxx(PoolNameOrSocket, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/foxx/service", QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
% Foxx服务配置/
@ -193,7 +193,7 @@ getFoxxConfig(PoolNameOrSocket, QueryPars) ->
updateFoxxConfig(PoolNameOrSocket, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/foxx/configuration", QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
%
@ -209,7 +209,7 @@ updateFoxxConfig(PoolNameOrSocket, MapData, QueryPars) ->
replaceFoxxConfig(PoolNameOrSocket, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/foxx/configuration", QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
%
@ -239,7 +239,7 @@ getFoxxDependencies(PoolNameOrSocket, QueryPars) ->
updateFoxxDependencies(PoolNameOrSocket, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/foxx/dependencies", QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
%
@ -255,7 +255,7 @@ updateFoxxDependencies(PoolNameOrSocket, MapData, QueryPars) ->
replaceFoxxDependencies(PoolNameOrSocket, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/foxx/dependencies", QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
% Foxx服务杂项
@ -288,7 +288,7 @@ getFoxxScripts(PoolNameOrSocket, QueryPars) ->
runFoxxScripts(PoolNameOrSocket, ScriptName, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/foxx/scripts/", ScriptName/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
%

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

@ -77,13 +77,13 @@ graphList(PoolNameOrSocket) ->
% errorNumArangoDB错误号
% errorMessage
newGraph(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/gharial">>, [], BodyStr).
newGraph(PoolNameOrSocket, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/gharial", QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
%
@ -185,7 +185,7 @@ vertexCollList(PoolNameOrSocket, GraphName) ->
%% MapData = #{"collection" => "otherVertices"}
addVertexColl(PoolNameOrSocket, GraphName, MapData) ->
Path = <<"/_api/gharial/", GraphName/binary, "/vertex">>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
%
@ -283,7 +283,7 @@ edgeDefList(PoolNameOrSocket, GraphName) ->
% errorMessage
addEdgeDef(PoolNameOrSocket, GraphName, MapData) ->
Path = <<"/_api/gharial/", GraphName/binary, "/edge">>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
%
@ -327,13 +327,13 @@ addEdgeDef(PoolNameOrSocket, GraphName, MapData) ->
% EdgeDefName MapData中的collection from to
replaceEdgeDef(PoolNameOrSocket, GraphName, EdgeDefName, MapData) ->
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", EdgeDefName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
replaceEdgeDef(PoolNameOrSocket, GraphName, EdgeDefName, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", EdgeDefName/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
%
@ -409,13 +409,13 @@ delEdgeDef(PoolNameOrSocket, GraphName, EdgeDefName, QueryPars) ->
% errorMessage
newVertex(PoolNameOrSocket, GraphName, CollName, MapData) ->
Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
newVertex(PoolNameOrSocket, GraphName, CollName, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
%
@ -523,19 +523,19 @@ 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>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
updateVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
updateVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPars, Headers) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, Headers, BodyStr).
%
@ -588,19 +588,19 @@ 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>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
replaceVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
replaceVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, MapData, QueryPars, Headers) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/gharial/", GraphName/binary, "/vertex/", CollName/binary, "/", (agMiscUtils:toBinary(VertexKey))/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, Headers, BodyStr).
%
@ -704,13 +704,13 @@ delVertex(PoolNameOrSocket, GraphName, CollName, VertexKey, QueryPars, Headers)
% errorMessage
newEdge(PoolNameOrSocket, GraphName, CollName, MapData) ->
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
newEdge(PoolNameOrSocket, GraphName, CollName, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
%
@ -819,19 +819,19 @@ 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>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
updateEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
updateEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, Headers, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, Headers, BodyStr).
@ -887,19 +887,19 @@ 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>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
replaceEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
replaceEdge(PoolNameOrSocket, GraphName, CollName, EdgeKey, MapData, QueryPars, Headers) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
Path = <<"/_api/gharial/", GraphName/binary, "/edge/", CollName/binary, "/", (agMiscUtils:toBinary(EdgeKey))/binary, QueryBinary/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, Headers, BodyStr).
%

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

@ -30,7 +30,7 @@
% 400使HTTP方法调用了create命令POSTHTTP 400
% 408HTTP 408
newBackup(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/create">>, [], BodyStr).
%
@ -42,7 +42,7 @@ newBackup(PoolNameOrSocket, MapData) ->
% 200
% 400使HTTP方法调用了restore命令POSTHTTP 400
restoreBackup(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/restore">>, [], BodyStr).
%
@ -55,7 +55,7 @@ restoreBackup(PoolNameOrSocket, MapData) ->
% 400使HTTP方法调用delete命令POSTHTTP 400
% 404id找不到与该标识符相对应的备份
delBackup(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/delete">>, [], BodyStr).
%
@ -93,7 +93,7 @@ getBackupList(PoolNameOrSocket) ->
% 401HTTP 400
% 404id uploadId
uploadBackup(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/upload">>, [], BodyStr).
%
@ -112,5 +112,5 @@ uploadBackup(PoolNameOrSocket, MapData) ->
% 401HTTP 401
% 404id downloadId
downloadBackup(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/backup/download">>, [], BodyStr).

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

@ -87,7 +87,7 @@ getIndexInfo(PoolNameOrSocket, IndexId) ->
% 404HTTP 404
newIndex(PoolNameOrSocket, CollName, MapData) ->
Path = <<"/_api/index?collection=", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr).
%
@ -139,11 +139,11 @@ newIndexOfHash(PoolNameOrSocket, CollName, MapData) ->
case MapData of
#{type := <<"hash">>} ->
Path = <<"/_api/index?collection=", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
#{<<"type">> := <<"hash">>} ->
Path = <<"/_api/index?collection=", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
_ ->
{error, param}
@ -208,11 +208,11 @@ newIndexOfSkipList(PoolNameOrSocket, CollName, MapData) ->
case MapData of
#{type := <<"skiplist">>} ->
Path = <<"/_api/index?collection=", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
#{<<"type">> := <<"skiplist">>} ->
Path = <<"/_api/index?collection=", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
_ ->
{error, param}
@ -243,11 +243,11 @@ newIndexOfPersistent(PoolNameOrSocket, CollName, MapData) ->
case MapData of
#{type := <<"persistent">>} ->
Path = <<"/_api/index?collection=", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
#{<<"type">> := <<"persistent">>} ->
Path = <<"/_api/index?collection=", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
_ ->
{error, param}
@ -273,11 +273,11 @@ newIndexOfTtl(PoolNameOrSocket, CollName, MapData) ->
case MapData of
#{type := <<"ttl">>} ->
Path = <<"/_api/index?collection=", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
#{<<"type">> := <<"ttl">>} ->
Path = <<"/_api/index?collection=", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
_ ->
{error, param}
@ -305,11 +305,11 @@ newIndexOfGeo(PoolNameOrSocket, CollName, MapData) ->
case MapData of
#{type := <<"geo">>} ->
Path = <<"/_api/index?collection=", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
#{<<"type">> := <<"geo">>} ->
Path = <<"/_api/index?collection=", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
_ ->
{error, param}
@ -377,11 +377,11 @@ newIndexOfFulltext(PoolNameOrSocket, CollName, MapData) ->
case MapData of
#{type := <<"fulltext">>} ->
Path = <<"/_api/index?collection=", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
#{<<"type">> := <<"fulltext">>} ->
Path = <<"/_api/index?collection=", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, Path, [], BodyStr);
_ ->
{error, param}

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

@ -115,7 +115,7 @@ getWalProps(PoolNameOrSocket) ->
% 200
% 405使HTTP方法时返回
setWalProps(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_admin/wal/properties">>, BodyStr, undefined).
%
@ -171,7 +171,7 @@ curDbTime(PoolNameOrSocket) ->
% path
% rawRequestBody
echo(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_admin/echo">>, [], BodyStr).
%

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

@ -72,7 +72,7 @@ getRepInventory(PoolNameOrSocket, QueryPars) ->
% 400ttl值无效Coordinator上未指定DBserver属性或该属性非法400
% 405使HTTP方法时返回
newRepBatch(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/replication/batch">>, [], BodyStr).
%
@ -111,7 +111,7 @@ delRepBatch(PoolNameOrSocket, BatchId) ->
% 使
prolongRepBatch(PoolNameOrSocket, BatchId, MapData) ->
Path = <<"/_api/replication/batch/", (agMiscUtils:toBinary(BatchId))/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
%
@ -277,7 +277,7 @@ getRepDoc(PoolNameOrSocket, QueryPars) ->
% 500
% 501
startRepSync(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/sync">>, [], BodyStr).
%
@ -474,12 +474,12 @@ getRepApplierConfig(PoolNameOrSocket, QueryPars) ->
% 405使HTTP方法时返回
% 500500
setRepApplierConfig(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-config">>, [], BodyStr).
setRepApplierConfig(PoolNameOrSocket, MapData, QueryPars) ->
QueryBinary = agMiscUtils:spellQueryPars(QueryPars),
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/applier-config", QueryBinary/binary>>, [], BodyStr).
%
@ -631,7 +631,7 @@ getRepApplierState(PoolNameOrSocket, QueryPars) ->
% 500
% 501
changeRepMakeSlave(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, <<"/_api/replication/make-slave">>, [], BodyStr).
%

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

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

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

@ -79,7 +79,7 @@
% 400使HTTP 400
% 404使HTTP 404
beginTransaction(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/transaction/begin">>, [], BodyStr).
%
@ -197,7 +197,7 @@ getTransactionList(PoolNameOrSocket) ->
% 404使HTTP 404
% 500使HTTP 500
executeTransaction(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/transaction">>, [], BodyStr).

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

@ -28,7 +28,7 @@
% 403访访
% 409
newUser(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/user">>, [], BodyStr).
% 访
@ -48,7 +48,7 @@ newUser(PoolNameOrSocket, MapData) ->
% 403访访
setUserDbAccessLevel(PoolNameOrSocket, UserName, DbName, MapData) ->
Path = <<"/_api/user/", UserName/binary, "/database/", DbName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
% 访
@ -70,7 +70,7 @@ setUserDbAccessLevel(PoolNameOrSocket, UserName, DbName, MapData) ->
% 403访访
setUserCollAccessLevel(PoolNameOrSocket, UserName, DbName, CollName, MapData) ->
Path = <<"/_api/user/", UserName/binary, "/database/", DbName/binary, "/", CollName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
% 访访
@ -174,7 +174,7 @@ getUserCollAccessLevel(PoolNameOrSocket, UserName, DbName, CollName) ->
% 404
replaceUser(PoolNameOrSocket, UserName, MapData) ->
Path = <<"/_api/user/", UserName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
%
@ -194,7 +194,7 @@ replaceUser(PoolNameOrSocket, UserName, MapData) ->
% 404
updateUser(PoolNameOrSocket, UserName, MapData) ->
Path = <<"/_api/user/", UserName/binary>>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
%

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

@ -64,7 +64,7 @@
% 400name或type属性丢失或无效 HTTP 400
% 409name的视图HTTP 409
newView(PoolNameOrSocket, MapData) ->
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPost, <<"/_api/view">>, [], BodyStr).
%
@ -140,7 +140,7 @@ getViewProps(PoolNameOrSocket, ViewName) ->
% 404HTTP 404
changeViewAllProps(PoolNameOrSocket, ViewName, MapData) ->
Path = <<"/_api/view/", ViewName/binary, "/properties">>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], BodyStr).
% ArangoSearch视图的属性
@ -178,7 +178,7 @@ changeViewAllProps(PoolNameOrSocket, ViewName, MapData) ->
% 404HTTP 404
changeViewPartProps(PoolNameOrSocket, ViewName, MapData) ->
Path = <<"/_api/view/", ViewName/binary, "/properties">>,
BodyStr = jiffy:encode(MapData),
BodyStr = eVPack:encodeBin(MapData),
agVstCli:callAgency(PoolNameOrSocket, ?AgPatch, Path, [], BodyStr).
%
@ -197,7 +197,7 @@ changeViewPartProps(PoolNameOrSocket, ViewName, MapData) ->
% 404HTTP 404
renameView(PoolNameOrSocket, ViewName, NewViewName) ->
Path = <<"/_api/view/", ViewName/binary, "/rename">>,
NameStr = jiffy:encode(NewViewName),
NameStr = eVPack:encodeBin(NewViewName),
agVstCli:callAgency(PoolNameOrSocket, ?AgPut, Path, [], <<"{\"name\":", NameStr/binary, "}">>).
%

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

@ -52,9 +52,9 @@ handleMsg(#agReq{method = Method, path = Path, queryPars = QueryPars, headers =
end
end
end;
handleMsg({tcp, _Socket, Data}, SrvState,
#cliState{revStatus = RevStatus, backlogNum = BacklogNum, messageId = MessageId, chunkIdx = ChunkIdx, chunkSize = ChunkSize, chunkBuffer = ChunkBuffer} = CliState) ->
case agVstProto:response(RevStatus, 0, MessageId, ChunkIdx, ChunkSize, ChunkBuffer, Data) of
handleMsg({tcp, _Socket, DataBuffer}, SrvState,
#cliState{revStatus = RevStatus, backlogNum = BacklogNum, messageId = OldMessageId, chunkIdx = OldChunkIdx, chunkSize = OldChunkSize, chunkBuffer = OldChunkBuffer} = CliState) ->
case agVstProto:response(RevStatus, 0, OldMessageId, OldChunkIdx, OldChunkSize, OldChunkBuffer, DataBuffer) of
{?AgUndef, DoneCnt} ->
{ok, SrvState, CliState#cliState{revStatus = ?AgUndef, backlogNum = BacklogNum - DoneCnt, chunkBuffer = <<>>}};
{?AgCBodyStart, DoneCnt, MessageId, ChunkIdx, ChunkSize, ChunkBuffer} ->

+ 9
- 2
src/agVstCli/agVstCli.erl 查看文件

@ -7,7 +7,8 @@
-export([
%% Common Request API
callAgency/6
callAgency/3
, callAgency/6
, callAgency/7
, callAgency/8
, castAgency/6
@ -33,6 +34,11 @@
, receiveSslData/2
]).
-spec callAgency(poolNameOrSocket(), method(), path()) -> term() | {error, term()}.
callAgency(PoolNameOrSocket, Method, Path) ->
callAgency(PoolNameOrSocket, Method, Path, #{}, #{}, <<>>, false, ?AgDefTimeout).
-spec callAgency(poolNameOrSocket(), method(), path(), queryPars(), headers(), body()) -> term() | {error, term()}.
callAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body) ->
callAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, false, ?AgDefTimeout).
@ -43,7 +49,7 @@ callAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, IsSystem) -
-spec callAgency(poolNameOrSocket(), method(), path(), queryPars(), headers(), body(), boolean(), timeout()) -> term() | {error, atom()}.
callAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, IsSystem, Timeout) ->
case castAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, self(), IsSystem, Timeout) of
case castAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, eVPack:encodeBin(Body), self(), IsSystem, Timeout) of
{waitRRT, RequestId, MonitorRef} ->
receiveReqRet(RequestId, MonitorRef);
{error, _Reason} = Err ->
@ -123,6 +129,7 @@ receiveReqRet(RequestId, MonitorRef) ->
{error, Err} ->
Err;
_ ->
?AgWarn(tt, "IMY*************~p~n", [Reply]),
{[1, 2, StatusCode, HeaderMap], BodyMap} = eVPack:decodeAll(Reply),
{StatusCode, BodyMap, HeaderMap}
end;

Loading…
取消
儲存