Disable the JSON cache due to issue 99.

This commit is contained in:
JoelKatz
2013-06-25 17:20:02 -07:00
parent 30cb990efa
commit 2bc0ef9e43

View File

@@ -1098,14 +1098,7 @@ Json::Value RPCHandler::doAccountLines (Json::Value params, LoadType* loadType,
if (lpLedger->hasAccount (raAccount)) if (lpLedger->hasAccount (raAccount))
{ {
jvResult["account"] = raAccount.humanAccountID (); jvResult["account"] = raAccount.humanAccountID ();
Json::Value& jsonLines = (jvResult["lines"] = Json::arrayValue);
boost::shared_ptr<Json::Value> jvsLines =
theApp->getOPs ().getJSONCache (JSONCache::kindLines, lpLedger->getHash (), raAccount.getAccountID ());
if (!jvsLines)
{
jvsLines = boost::make_shared<Json::Value> (Json::arrayValue);
Json::Value& jsonLines = *jvsLines;
AccountItems rippleLines (raAccount.getAccountID (), lpLedger, AccountItem::pointer (new RippleState ())); AccountItems rippleLines (raAccount.getAccountID (), lpLedger, AccountItem::pointer (new RippleState ()));
@@ -1133,14 +1126,8 @@ Json::Value RPCHandler::doAccountLines (Json::Value params, LoadType* loadType,
} }
} }
theApp->getOPs ().storeJSONCache (JSONCache::kindLines, lpLedger->getHash (),
raAccount.getAccountID (), jvsLines);
}
if (!bUnlocked) if (!bUnlocked)
MasterLockHolder.unlock (); MasterLockHolder.unlock ();
jvResult["lines"] = *jvsLines;
} }
else else
{ {
@@ -1208,21 +1195,12 @@ Json::Value RPCHandler::doAccountOffers (Json::Value params, LoadType* loadType,
if (!lpLedger->hasAccount (raAccount)) if (!lpLedger->hasAccount (raAccount))
return rpcError (rpcACT_NOT_FOUND); return rpcError (rpcACT_NOT_FOUND);
boost::shared_ptr<Json::Value> jvsOffers = Json::Value& jvsOffers = (jvResult["offers"] = Json::arrayValue);
theApp->getOPs ().getJSONCache (JSONCache::kindOffers, lpLedger->getHash (), raAccount.getAccountID ()); lpLedger->visitAccountItems (raAccount.getAccountID (), BIND_TYPE (&offerAdder, boost::ref (jvsOffers), P_1));
if (!jvsOffers)
{
jvsOffers = boost::make_shared<Json::Value> (Json::arrayValue);
lpLedger->visitAccountItems (raAccount.getAccountID (), BIND_TYPE (&offerAdder, boost::ref (*jvsOffers), P_1));
theApp->getOPs ().storeJSONCache (JSONCache::kindOffers, lpLedger->getHash (), raAccount.getAccountID (), jvsOffers);
}
if (!bUnlocked) if (!bUnlocked)
MasterLockHolder.unlock (); MasterLockHolder.unlock ();
jvResult["offers"] = *jvsOffers;
return jvResult; return jvResult;
} }