Page MenuHomePhabricator
Files F14863137

D10155.id.diff
No OneTemporary
Actions

D10155.id.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -75,6 +75,7 @@
'PhagePHPAgent' => 'phage/agent/PhagePHPAgent.php',
'PhagePHPAgentBootloader' => 'phage/bootloader/PhagePHPAgentBootloader.php',
'Phobject' => 'object/Phobject.php',
+ 'PhutilAPCKeyValueCache' => 'cache/PhutilAPCKeyValueCache.php',
'PhutilAWSEC2Future' => 'future/aws/PhutilAWSEC2Future.php',
'PhutilAWSException' => 'future/aws/PhutilAWSException.php',
'PhutilAWSFuture' => 'future/aws/PhutilAWSFuture.php',
@@ -138,6 +139,7 @@
'PhutilDeferredLogTestCase' => 'filesystem/__tests__/PhutilDeferredLogTestCase.php',
'PhutilDirectedScalarGraph' => 'utils/PhutilDirectedScalarGraph.php',
'PhutilDirectoryFixture' => 'filesystem/PhutilDirectoryFixture.php',
+ 'PhutilDirectoryKeyValueCache' => 'cache/PhutilDirectoryKeyValueCache.php',
'PhutilDisqusAuthAdapter' => 'auth/PhutilDisqusAuthAdapter.php',
'PhutilDivinerSyntaxHighlighter' => 'markup/syntax/highlighter/PhutilDivinerSyntaxHighlighter.php',
'PhutilDocblockParser' => 'parser/PhutilDocblockParser.php',
@@ -172,6 +174,7 @@
'PhutilHangForeverDaemon' => 'daemon/torture/PhutilHangForeverDaemon.php',
'PhutilHelpArgumentWorkflow' => 'parser/argument/workflow/PhutilHelpArgumentWorkflow.php',
'PhutilHgsprintfTestCase' => 'xsprintf/__tests__/PhutilHgsprintfTestCase.php',
+ 'PhutilInRequestKeyValueCache' => 'cache/PhutilInRequestKeyValueCache.php',
'PhutilInfrastructureTestCase' => '__tests__/PhutilInfrastructureTestCase.php',
'PhutilInteractiveEditor' => 'console/PhutilInteractiveEditor.php',
'PhutilInvisibleSyntaxHighlighter' => 'markup/syntax/highlighter/PhutilInvisibleSyntaxHighlighter.php',
@@ -185,12 +188,7 @@
'PhutilJSONTestCase' => 'parser/__tests__/PhutilJSONTestCase.php',
'PhutilJavaCodeSnippetContextFreeGrammar' => 'grammar/code/PhutilJavaCodeSnippetContextFreeGrammar.php',
'PhutilKeyValueCache' => 'cache/PhutilKeyValueCache.php',
- 'PhutilKeyValueCacheAPC' => 'cache/PhutilKeyValueCacheAPC.php',
- 'PhutilKeyValueCacheDirectory' => 'cache/PhutilKeyValueCacheDirectory.php',
- 'PhutilKeyValueCacheInRequest' => 'cache/PhutilKeyValueCacheInRequest.php',
- 'PhutilKeyValueCacheMemcache' => 'cache/PhutilKeyValueCacheMemcache.php',
'PhutilKeyValueCacheNamespace' => 'cache/PhutilKeyValueCacheNamespace.php',
- 'PhutilKeyValueCacheOnDisk' => 'cache/PhutilKeyValueCacheOnDisk.php',
'PhutilKeyValueCacheProfiler' => 'cache/PhutilKeyValueCacheProfiler.php',
'PhutilKeyValueCacheProxy' => 'cache/PhutilKeyValueCacheProxy.php',
'PhutilKeyValueCacheStack' => 'cache/PhutilKeyValueCacheStack.php',
@@ -210,6 +208,7 @@
'PhutilLunarPhaseTestCase' => 'utils/__tests__/PhutilLunarPhaseTestCase.php',
'PhutilMarkupEngine' => 'markup/PhutilMarkupEngine.php',
'PhutilMarkupTestCase' => 'markup/__tests__/PhutilMarkupTestCase.php',
+ 'PhutilMemcacheKeyValueCache' => 'cache/PhutilMemcacheKeyValueCache.php',
'PhutilMethodNotImplementedException' => 'error/PhutilMethodNotImplementedException.php',
'PhutilMetricsChannel' => 'channel/PhutilMetricsChannel.php',
'PhutilMissingSymbolException' => 'symbols/exception/PhutilMissingSymbolException.php',
@@ -220,6 +219,7 @@
'PhutilOAuth1Future' => 'future/oauth/PhutilOAuth1Future.php',
'PhutilOAuth1FutureTestCase' => 'future/oauth/__tests__/PhutilOAuth1FutureTestCase.php',
'PhutilOAuthAuthAdapter' => 'auth/PhutilOAuthAuthAdapter.php',
+ 'PhutilOnDiskKeyValueCache' => 'cache/PhutilOnDiskKeyValueCache.php',
'PhutilOpaqueEnvelope' => 'error/PhutilOpaqueEnvelope.php',
'PhutilOpaqueEnvelopeKey' => 'error/PhutilOpaqueEnvelopeKey.php',
'PhutilOpaqueEnvelopeTestCase' => 'error/__tests__/PhutilOpaqueEnvelopeTestCase.php',
@@ -519,6 +519,7 @@
'PhageAgentTestCase' => 'PhutilTestCase',
'PhagePHPAgentBootloader' => 'PhageAgentBootloader',
'Phobject' => 'Iterator',
+ 'PhutilAPCKeyValueCache' => 'PhutilKeyValueCache',
'PhutilAWSEC2Future' => 'PhutilAWSFuture',
'PhutilAWSException' => 'Exception',
'PhutilAWSFuture' => 'FutureProxy',
@@ -568,6 +569,7 @@
'PhutilDefaultSyntaxHighlighterEngineTestCase' => 'PhutilTestCase',
'PhutilDeferredLogTestCase' => 'PhutilTestCase',
'PhutilDirectedScalarGraph' => 'AbstractDirectedGraph',
+ 'PhutilDirectoryKeyValueCache' => 'PhutilKeyValueCache',
'PhutilDisqusAuthAdapter' => 'PhutilOAuthAuthAdapter',
'PhutilDocblockParserTestCase' => 'PhutilTestCase',
'PhutilEditDistanceMatrixTestCase' => 'PhutilTestCase',
@@ -591,6 +593,7 @@
'PhutilHangForeverDaemon' => 'PhutilTortureTestDaemon',
'PhutilHelpArgumentWorkflow' => 'PhutilArgumentWorkflow',
'PhutilHgsprintfTestCase' => 'PhutilTestCase',
+ 'PhutilInRequestKeyValueCache' => 'PhutilKeyValueCache',
'PhutilInfrastructureTestCase' => 'PhutilTestCase',
'PhutilJIRAAuthAdapter' => 'PhutilOAuth1AuthAdapter',
'PhutilJSONParserException' => 'Exception',
@@ -599,12 +602,7 @@
'PhutilJSONProtocolChannelTestCase' => 'PhutilTestCase',
'PhutilJSONTestCase' => 'PhutilTestCase',
'PhutilJavaCodeSnippetContextFreeGrammar' => 'PhutilCLikeCodeSnippetContextFreeGrammar',
- 'PhutilKeyValueCacheAPC' => 'PhutilKeyValueCache',
- 'PhutilKeyValueCacheDirectory' => 'PhutilKeyValueCache',
- 'PhutilKeyValueCacheInRequest' => 'PhutilKeyValueCache',
- 'PhutilKeyValueCacheMemcache' => 'PhutilKeyValueCache',
'PhutilKeyValueCacheNamespace' => 'PhutilKeyValueCacheProxy',
- 'PhutilKeyValueCacheOnDisk' => 'PhutilKeyValueCache',
'PhutilKeyValueCacheProfiler' => 'PhutilKeyValueCacheProxy',
'PhutilKeyValueCacheProxy' => 'PhutilKeyValueCache',
'PhutilKeyValueCacheStack' => 'PhutilKeyValueCache',
@@ -618,6 +616,7 @@
'PhutilLogfileChannel' => 'PhutilChannelChannel',
'PhutilLunarPhaseTestCase' => 'PhutilTestCase',
'PhutilMarkupTestCase' => 'PhutilTestCase',
+ 'PhutilMemcacheKeyValueCache' => 'PhutilKeyValueCache',
'PhutilMethodNotImplementedException' => 'Exception',
'PhutilMetricsChannel' => 'PhutilChannelChannel',
'PhutilMissingSymbolException' => 'Exception',
@@ -627,6 +626,7 @@
'PhutilOAuth1Future' => 'FutureProxy',
'PhutilOAuth1FutureTestCase' => 'PhutilTestCase',
'PhutilOAuthAuthAdapter' => 'PhutilAuthAdapter',
+ 'PhutilOnDiskKeyValueCache' => 'PhutilKeyValueCache',
'PhutilOpaqueEnvelopeTestCase' => 'PhutilTestCase',
'PhutilPHPCodeSnippetContextFreeGrammar' => 'PhutilCLikeCodeSnippetContextFreeGrammar',
'PhutilPHPFragmentLexer' => 'PhutilLexer',
diff --git a/src/cache/PhutilKeyValueCacheAPC.php b/src/cache/PhutilAPCKeyValueCache.php
rename from src/cache/PhutilKeyValueCacheAPC.php
rename to src/cache/PhutilAPCKeyValueCache.php
--- a/src/cache/PhutilKeyValueCacheAPC.php
+++ b/src/cache/PhutilAPCKeyValueCache.php
@@ -4,7 +4,7 @@
* Interface to the APC key-value cache. This is a very high-performance cache
* which is local to the current machine.
*/
-final class PhutilKeyValueCacheAPC extends PhutilKeyValueCache {
+final class PhutilAPCKeyValueCache extends PhutilKeyValueCache {
/* -( Key-Value Cache Implementation )------------------------------------- */
diff --git a/src/cache/PhutilKeyValueCacheDirectory.php b/src/cache/PhutilDirectoryKeyValueCache.php
rename from src/cache/PhutilKeyValueCacheDirectory.php
rename to src/cache/PhutilDirectoryKeyValueCache.php
--- a/src/cache/PhutilKeyValueCacheDirectory.php
+++ b/src/cache/PhutilDirectoryKeyValueCache.php
@@ -6,7 +6,7 @@
* This cache is very very slow, and most suitable for command line scripts
* which need to build large caches derived from sources like working copies
* (for example, Diviner). This cache performs better for large amounts of
- * data than @{class:PhutilKeyValueCacheOnDisk} because each key is serialized
+ * data than @{class:PhutilOnDiskKeyValueCache} because each key is serialized
* individually, but this comes at the cost of having even slower reads and
* writes.
*
@@ -21,7 +21,7 @@
* @task kvimpl Key-Value Cache Implementation
* @task storage Cache Storage
*/
-final class PhutilKeyValueCacheDirectory extends PhutilKeyValueCache {
+final class PhutilDirectoryKeyValueCache extends PhutilKeyValueCache {
private $lock;
private $cacheDirectory;
diff --git a/src/cache/PhutilKeyValueCacheInRequest.php b/src/cache/PhutilInRequestKeyValueCache.php
rename from src/cache/PhutilKeyValueCacheInRequest.php
rename to src/cache/PhutilInRequestKeyValueCache.php
--- a/src/cache/PhutilKeyValueCacheInRequest.php
+++ b/src/cache/PhutilInRequestKeyValueCache.php
@@ -13,7 +13,7 @@
* improves it significantly, it may indicate an architectural problem in your
* application.
*/
-final class PhutilKeyValueCacheInRequest extends PhutilKeyValueCache {
+final class PhutilInRequestKeyValueCache extends PhutilKeyValueCache {
private $cache = array();
private $ttl = array();
diff --git a/src/cache/PhutilKeyValueCacheMemcache.php b/src/cache/PhutilMemcacheKeyValueCache.php
rename from src/cache/PhutilKeyValueCacheMemcache.php
rename to src/cache/PhutilMemcacheKeyValueCache.php
--- a/src/cache/PhutilKeyValueCacheMemcache.php
+++ b/src/cache/PhutilMemcacheKeyValueCache.php
@@ -3,7 +3,7 @@
/**
* @task memcache Managing Memcache
*/
-final class PhutilKeyValueCacheMemcache extends PhutilKeyValueCache {
+final class PhutilMemcacheKeyValueCache extends PhutilKeyValueCache {
private $servers = array();
private $connections = array();
diff --git a/src/cache/PhutilKeyValueCacheOnDisk.php b/src/cache/PhutilOnDiskKeyValueCache.php
rename from src/cache/PhutilKeyValueCacheOnDisk.php
rename to src/cache/PhutilOnDiskKeyValueCache.php
--- a/src/cache/PhutilKeyValueCacheOnDisk.php
+++ b/src/cache/PhutilOnDiskKeyValueCache.php
@@ -15,7 +15,7 @@
* @task kvimpl Key-Value Cache Implementation
* @task storage Cache Storage
*/
-final class PhutilKeyValueCacheOnDisk extends PhutilKeyValueCache {
+final class PhutilOnDiskKeyValueCache extends PhutilKeyValueCache {
private $cache = array();
private $cacheFile;
diff --git a/src/cache/__tests__/PhutilKeyValueCacheTestCase.php b/src/cache/__tests__/PhutilKeyValueCacheTestCase.php
--- a/src/cache/__tests__/PhutilKeyValueCacheTestCase.php
+++ b/src/cache/__tests__/PhutilKeyValueCacheTestCase.php
@@ -3,13 +3,13 @@
final class PhutilKeyValueCacheTestCase extends PhutilTestCase {
public function testInRequestCache() {
- $cache = new PhutilKeyValueCacheInRequest();
+ $cache = new PhutilInRequestKeyValueCache();
$this->doCacheTest($cache);
$cache->destroyCache();
}
public function testInRequestCacheLimit() {
- $cache = new PhutilKeyValueCacheInRequest();
+ $cache = new PhutilInRequestKeyValueCache();
$cache->setLimit(4);
$cache->setKey(1, 1);
@@ -40,14 +40,14 @@
}
public function testOnDiskCache() {
- $cache = new PhutilKeyValueCacheOnDisk();
+ $cache = new PhutilOnDiskKeyValueCache();
$cache->setCacheFile(new TempFile());
$this->doCacheTest($cache);
$cache->destroyCache();
}
public function testAPCCache() {
- $cache = new PhutilKeyValueCacheAPC();
+ $cache = new PhutilAPCKeyValueCache();
if (!$cache->isAvailable()) {
$this->assertSkipped('Cache not available.');
}
@@ -55,7 +55,7 @@
}
public function testDirectoryCache() {
- $cache = new PhutilKeyValueCacheDirectory();
+ $cache = new PhutilDirectoryKeyValueCache();
$dir = Filesystem::createTemporaryDirectory();
$cache->setCacheDirectory($dir);
@@ -64,7 +64,7 @@
}
public function testDirectoryCacheSpecialDirectoryRules() {
- $cache = new PhutilKeyValueCacheDirectory();
+ $cache = new PhutilDirectoryKeyValueCache();
$dir = Filesystem::createTemporaryDirectory();
$dir = $dir.'/dircache/';
@@ -87,7 +87,7 @@
public function testNamespaceCache() {
$namespace = 'namespace'.mt_rand();
- $in_request_cache = new PhutilKeyValueCacheInRequest();
+ $in_request_cache = new PhutilInRequestKeyValueCache();
$cache = new PhutilKeyValueCacheNamespace($in_request_cache);
$cache->setNamespace($namespace);
@@ -119,10 +119,10 @@
}
public function testCacheStack() {
- $req_cache = new PhutilKeyValueCacheInRequest();
- $disk_cache = new PhutilKeyValueCacheOnDisk();
+ $req_cache = new PhutilInRequestKeyValueCache();
+ $disk_cache = new PhutilOnDiskKeyValueCache();
$disk_cache->setCacheFile(new TempFile());
- $apc_cache = new PhutilKeyValueCacheAPC();
+ $apc_cache = new PhutilAPCKeyValueCache();
$stack = array(
$req_cache,

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 8, 10:14 PM (1 h, 32 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7099918
Default Alt Text
D10155.id.diff (12 KB)

Event Timeline

Phabricator · Built by Phacility