You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by ol...@apache.org on 2012/01/17 16:43:51 UTC
svn commit: r1232445 - in /incubator/directmemory/trunk/examples/src:
main/java/org/apache/directmemory/examples/solr/
test/java/org/apache/directmemory/examples/solr/
Author: olamy
Date: Tue Jan 17 15:43:51 2012
New Revision: 1232445
URL: http://svn.apache.org/viewvc?rev=1232445&view=rev
Log:
code formatting
Modified:
incubator/directmemory/trunk/examples/src/main/java/org/apache/directmemory/examples/solr/SolrOffHeapCache.java
incubator/directmemory/trunk/examples/src/test/java/org/apache/directmemory/examples/solr/SolrOffHeapCacheTest.java
incubator/directmemory/trunk/examples/src/test/java/org/apache/directmemory/examples/solr/SolrOffHeapIntegrationTest.java
Modified: incubator/directmemory/trunk/examples/src/main/java/org/apache/directmemory/examples/solr/SolrOffHeapCache.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/examples/src/main/java/org/apache/directmemory/examples/solr/SolrOffHeapCache.java?rev=1232445&r1=1232444&r2=1232445&view=diff
==============================================================================
--- incubator/directmemory/trunk/examples/src/main/java/org/apache/directmemory/examples/solr/SolrOffHeapCache.java (original)
+++ incubator/directmemory/trunk/examples/src/main/java/org/apache/directmemory/examples/solr/SolrOffHeapCache.java Tue Jan 17 15:43:51 2012
@@ -38,9 +38,11 @@ import java.util.concurrent.atomic.Atomi
* A {@link SolrCache} based on Apache DirectMemory
*/
public class SolrOffHeapCache<K, V>
- implements SolrCache<K, V> {
+ implements SolrCache<K, V>
+{
- private static class CumulativeStats {
+ private static class CumulativeStats
+ {
AtomicLong lookups = new AtomicLong();
AtomicLong hits = new AtomicLong();
@@ -73,32 +75,34 @@ public class SolrOffHeapCache<K, V>
private String description = "DM Cache";
@Override
- public Object init(Map args, Object persistence, CacheRegenerator regenerator) {
- Object buffers = args.get("buffers");
- String size = String.valueOf(args.get("size"));
- Integer capacity = Integer.parseInt(String.valueOf(args.get("initialSize")));
- Cache.init(buffers != null ? Integer.valueOf(String.valueOf(buffers)) : 1,
- Ram.Mb(Double.valueOf(size) / 512),
- Ram.Mb(Double.valueOf(capacity) / 512),
- CacheService.DEFAULT_CONCURRENCY_LEVEL);
+ public Object init( Map args, Object persistence, CacheRegenerator regenerator )
+ {
+ Object buffers = args.get( "buffers" );
+ String size = String.valueOf( args.get( "size" ) );
+ Integer capacity = Integer.parseInt( String.valueOf( args.get( "initialSize" ) ) );
+ Cache.init( buffers != null ? Integer.valueOf( String.valueOf( buffers ) ) : 1,
+ Ram.Mb( Double.valueOf( size ) / 512 ), Ram.Mb( Double.valueOf( capacity ) / 512 ),
+ CacheService.DEFAULT_CONCURRENCY_LEVEL );
state = State.CREATED;
this.regenerator = regenerator;
- name = (String) args.get("name");
+ name = (String) args.get( "name" );
String str = size;
- final int limit = str == null ? 1024 : Integer.parseInt(str);
- str = (String) args.get("initialSize");
- final int initialSize = Math.min(str == null ? 1024 : Integer.parseInt(str), limit);
- str = (String) args.get("autowarmCount");
- autowarmCount = str == null ? 0 : Integer.parseInt(str);
+ final int limit = str == null ? 1024 : Integer.parseInt( str );
+ str = (String) args.get( "initialSize" );
+ final int initialSize = Math.min( str == null ? 1024 : Integer.parseInt( str ), limit );
+ str = (String) args.get( "autowarmCount" );
+ autowarmCount = str == null ? 0 : Integer.parseInt( str );
description = "Solr OffHeap Cache(maxSize=" + limit + ", initialSize=" + initialSize;
- if (autowarmCount > 0) {
+ if ( autowarmCount > 0 )
+ {
description += ", autowarmCount=" + autowarmCount + ", regenerator=" + regenerator;
}
description += ')';
- if (persistence == null) {
+ if ( persistence == null )
+ {
// must be the first time a cache of this type is being created
persistence = new CumulativeStats();
}
@@ -109,36 +113,45 @@ public class SolrOffHeapCache<K, V>
}
@Override
- public String name() {
+ public String name()
+ {
return name;
}
@Override
- public int size() {
- return Long.valueOf(Cache.entries()).intValue();
+ public int size()
+ {
+ return Long.valueOf( Cache.entries() ).intValue();
}
@Override
- public V put(K key, V value) {
- synchronized (this) {
- if (state == State.LIVE) {
+ public V put( K key, V value )
+ {
+ synchronized ( this )
+ {
+ if ( state == State.LIVE )
+ {
stats.inserts.incrementAndGet();
}
inserts++;
- return (V) Cache.put(String.valueOf(key), value);
+ return (V) Cache.put( String.valueOf( key ), value );
}
}
@Override
- public V get(K key) {
- synchronized (this) {
- V val = (V) Cache.retrieve(String.valueOf(key));
- if (state == State.LIVE) {
+ public V get( K key )
+ {
+ synchronized ( this )
+ {
+ V val = (V) Cache.retrieve( String.valueOf( key ) );
+ if ( state == State.LIVE )
+ {
// only increment lookups and hits if we are live.
lookups++;
stats.lookups.incrementAndGet();
- if (val != null) {
+ if ( val != null )
+ {
hits++;
stats.hits.incrementAndGet();
}
@@ -148,101 +161,127 @@ public class SolrOffHeapCache<K, V>
}
@Override
- public void clear() {
- synchronized (this) {
+ public void clear()
+ {
+ synchronized ( this )
+ {
Cache.clear();
}
}
@Override
- public void setState(State state) {
+ public void setState( State state )
+ {
this.state = state;
}
@Override
- public State getState() {
+ public State getState()
+ {
return state;
}
@Override
- public void warm(SolrIndexSearcher searcher, SolrCache<K, V> old)
- throws IOException {
+ public void warm( SolrIndexSearcher searcher, SolrCache<K, V> old )
+ throws IOException
+ {
// it looks like there is no point in warming an off heap item
}
@Override
- public void close() {
+ public void close()
+ {
Cache.dump();
Monitor.dump();
}
@Override
- public String getName() {
+ public String getName()
+ {
return SolrOffHeapCache.class.getName();
}
@Override
- public String getVersion() {
+ public String getVersion()
+ {
return SolrCore.version;
}
- public String getDescription() {
+ public String getDescription()
+ {
return description;
}
- public Category getCategory() {
+ public Category getCategory()
+ {
return Category.CACHE;
}
@Override
- public String getSourceId() {
+ public String getSourceId()
+ {
return null;
}
@Override
- public String getSource() {
+ public String getSource()
+ {
return null;
}
@Override
- public URL[] getDocs() {
+ public URL[] getDocs()
+ {
return new URL[0];
}
- public NamedList getStatistics() {
+ public NamedList getStatistics()
+ {
NamedList lst = new SimpleOrderedMap();
- synchronized (this) {
- lst.add("lookups", lookups);
- lst.add("hits", hits);
- lst.add("hitratio", calcHitRatio(lookups, hits));
- lst.add("inserts", inserts);
- lst.add("evictions", evictions);
- lst.add("size", Cache.entries());
+ synchronized ( this )
+ {
+ lst.add( "lookups", lookups );
+ lst.add( "hits", hits );
+ lst.add( "hitratio", calcHitRatio( lookups, hits ) );
+ lst.add( "inserts", inserts );
+ lst.add( "evictions", evictions );
+ lst.add( "size", Cache.entries() );
}
- lst.add("warmupTime", warmupTime);
+ lst.add( "warmupTime", warmupTime );
long clookups = stats.lookups.get();
long chits = stats.hits.get();
- lst.add("cumulative_lookups", clookups);
- lst.add("cumulative_hits", chits);
- lst.add("cumulative_hitratio", calcHitRatio(clookups, chits));
- lst.add("cumulative_inserts", stats.inserts.get());
- lst.add("cumulative_evictions", stats.evictions.get());
+ lst.add( "cumulative_lookups", clookups );
+ lst.add( "cumulative_hits", chits );
+ lst.add( "cumulative_hitratio", calcHitRatio( clookups, chits ) );
+ lst.add( "cumulative_inserts", stats.inserts.get() );
+ lst.add( "cumulative_evictions", stats.evictions.get() );
return lst;
}
- private Object calcHitRatio(long clookups, long chits) {
- if (lookups == 0) return "0.00";
- if (lookups == hits) return "1.00";
- int hundredths = (int) (hits * 100 / lookups); // rounded down
- if (hundredths < 10) return "0.0" + hundredths;
+ private Object calcHitRatio( long clookups, long chits )
+ {
+ if ( lookups == 0 )
+ {
+ return "0.00";
+ }
+ if ( lookups == hits )
+ {
+ return "1.00";
+ }
+ int hundredths = (int) ( hits * 100 / lookups ); // rounded down
+ if ( hundredths < 10 )
+ {
+ return "0.0" + hundredths;
+ }
return "0." + hundredths;
}
@Override
- public String toString() {
+ public String toString()
+ {
return name + getStatistics().toString();
}
}
Modified: incubator/directmemory/trunk/examples/src/test/java/org/apache/directmemory/examples/solr/SolrOffHeapCacheTest.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/examples/src/test/java/org/apache/directmemory/examples/solr/SolrOffHeapCacheTest.java?rev=1232445&r1=1232444&r2=1232445&view=diff
==============================================================================
--- incubator/directmemory/trunk/examples/src/test/java/org/apache/directmemory/examples/solr/SolrOffHeapCacheTest.java (original)
+++ incubator/directmemory/trunk/examples/src/test/java/org/apache/directmemory/examples/solr/SolrOffHeapCacheTest.java Tue Jan 17 15:43:51 2012
@@ -35,53 +35,67 @@ import static org.junit.Assert.*;
/**
* Testcase for {@link SolrOffHeapCache}
*/
-public class SolrOffHeapCacheTest {
+public class SolrOffHeapCacheTest
+{
private SolrOffHeapCache solrOffHeapCache;
@Before
- public void setUp() {
+ public void setUp()
+ {
solrOffHeapCache = new SolrOffHeapCache();
Map<String, String> args = new HashMap<String, String>();
- args.put("size", "10000");
- args.put("initialSize", "1000");
- solrOffHeapCache.init(args, null, null);
+ args.put( "size", "10000" );
+ args.put( "initialSize", "1000" );
+ solrOffHeapCache.init( args, null, null );
}
@After
- public void tearDown() {
+ public void tearDown()
+ {
solrOffHeapCache.clear();
solrOffHeapCache.close();
}
@Test
- public void testStatisticsWhenCacheNotUsedYet() {
- try {
+ public void testStatisticsWhenCacheNotUsedYet()
+ {
+ try
+ {
NamedList stats = solrOffHeapCache.getStatistics();
- assertNotNull(stats);
- assertEquals(0l, stats.get("lookups"));
- assertEquals(0l, stats.get("evictions"));
- assertEquals(0l, stats.get("hits"));
- assertEquals(0l, stats.get("inserts"));
- } catch (Exception e) {
- fail(e.getLocalizedMessage());
+ assertNotNull( stats );
+ assertEquals( 0l, stats.get( "lookups" ) );
+ assertEquals( 0l, stats.get( "evictions" ) );
+ assertEquals( 0l, stats.get( "hits" ) );
+ assertEquals( 0l, stats.get( "inserts" ) );
+ }
+ catch ( Exception e )
+ {
+ fail( e.getLocalizedMessage() );
}
}
@Test
- public void testPut() {
- try {
- QueryResultKey queryResultKey = new QueryResultKey(new MatchAllDocsQuery(), new ArrayList<Query>(), new Sort(), 1);
- DocValues docValues = new DocValues() {
+ public void testPut()
+ {
+ try
+ {
+ QueryResultKey queryResultKey =
+ new QueryResultKey( new MatchAllDocsQuery(), new ArrayList<Query>(), new Sort(), 1 );
+ DocValues docValues = new DocValues()
+ {
@Override
- public String toString(int doc) {
+ public String toString( int doc )
+ {
return doc + "asd";
}
};
- solrOffHeapCache.put(queryResultKey, docValues);
- } catch (Exception e) {
+ solrOffHeapCache.put( queryResultKey, docValues );
+ }
+ catch ( Exception e )
+ {
e.printStackTrace();
- fail(e.getLocalizedMessage());
+ fail( e.getLocalizedMessage() );
}
}
}
Modified: incubator/directmemory/trunk/examples/src/test/java/org/apache/directmemory/examples/solr/SolrOffHeapIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/examples/src/test/java/org/apache/directmemory/examples/solr/SolrOffHeapIntegrationTest.java?rev=1232445&r1=1232444&r2=1232445&view=diff
==============================================================================
--- incubator/directmemory/trunk/examples/src/test/java/org/apache/directmemory/examples/solr/SolrOffHeapIntegrationTest.java (original)
+++ incubator/directmemory/trunk/examples/src/test/java/org/apache/directmemory/examples/solr/SolrOffHeapIntegrationTest.java Tue Jan 17 15:43:51 2012
@@ -28,39 +28,46 @@ import static org.junit.Assert.fail;
/**
*/
-public class SolrOffHeapIntegrationTest {
+public class SolrOffHeapIntegrationTest
+{
private static TestHarness h;
@BeforeClass
- public static void setUp() {
+ public static void setUp()
+ {
String data = "target/data/expand";
- String config = SolrOffHeapCache.class.getResource("/solr/config/solrconfig.xml").getFile();
- String schema = SolrOffHeapCache.class.getResource("/solr/config/schema.xml").getFile();
- h = new TestHarness(data, config, schema);
+ String config = SolrOffHeapCache.class.getResource( "/solr/config/solrconfig.xml" ).getFile();
+ String schema = SolrOffHeapCache.class.getResource( "/solr/config/schema.xml" ).getFile();
+ h = new TestHarness( data, config, schema );
}
@AfterClass
- public static void tearDown() {
+ public static void tearDown()
+ {
Cache.clear();
}
@Test
- public void testSimpleQuery() {
- try {
+ public void testSimpleQuery()
+ {
+ try
+ {
// add a doc to Solr
- h.validateAddDoc("id", "1", "text", "something is happening here");
+ h.validateAddDoc( "id", "1", "text", "something is happening here" );
// make the query
- LocalSolrQueryRequest request = h.getRequestFactory("standard", 0, 10).makeRequest("q", "something");
- String response = h.query("standard", request);
- assertTrue(response != null);
- assertTrue(!response.contains("error"));
+ LocalSolrQueryRequest request = h.getRequestFactory( "standard", 0, 10 ).makeRequest( "q", "something" );
+ String response = h.query( "standard", request );
+ assertTrue( response != null );
+ assertTrue( !response.contains( "error" ) );
// check the cache has been hit
- assertTrue(Cache.entries() > 0);
+ assertTrue( Cache.entries() > 0 );
- } catch (Throwable e) {
- fail(e.getLocalizedMessage());
+ }
+ catch ( Throwable e )
+ {
+ fail( e.getLocalizedMessage() );
}
}
}