@@ -1,4 +1,4 @@ -#Fri Nov 28 00:09:45 PST 2008 +#Tue Jan 13 14:27:58 PST 2009 cleanup.add_default_serial_version_id=true cleanup.add_generated_serial_version_id=false cleanup.add_missing_annotations=true @@ -64,7 +64,7 @@ org.eclipse.jdt.ui.keywordthis=false org.eclipse.jdt.ui.ondemandthreshold=99 org.eclipse.jdt.ui.overrideannotation=true org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"></template><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"></template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"></template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"></template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"></template><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"></template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\n * Copyright 2008-2009 LinkedIn, Inc\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"></template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=true .settings/org.eclipse.jdt.ui.prefs @@ -175,7 +175,18 @@ END OF TERMS AND CONDITIONS - Copyright 2009 LinkedIn, Inc. + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -188,3 +199,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + LICENSE @@ -1,6 +1,6 @@ #Build Number for ANT. Do not edit! -#Tue Jan 13 13:36:23 PST 2009 -build.number=142 +#Tue Jan 13 14:19:40 PST 2009 +build.number=143 >>>>>>>=1.8 -<<<<<<<=build_number.txt =\=\=\=\=\=\= +<<<<<<<=build_number.txt build_number.txt @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.examples; import voldemort.client.SocketStoreClientFactory; @@ -8,31 +24,30 @@ import voldemort.versioning.Versioned; public class ClientExample { public static void main(String[] args) { - - // In real life this stuff would get wired in - int numThreads = 10; + + // In real life this stuff would get wired in + int numThreads = 10; int maxQueuedRequests = 10; - int maxConnectionsPerNode = 10; + int maxConnectionsPerNode = 10; int maxTotalConnections = 100; String bootstrapUrl = "tcp://localhost:6666"; - StoreClientFactory factory = - new SocketStoreClientFactory(numThreads, - numThreads, - maxQueuedRequests, - maxConnectionsPerNode, - maxTotalConnections, - bootstrapUrl); - - StoreClient<String,String> client = factory.getStoreClient("my_store_name"); - + StoreClientFactory factory = new SocketStoreClientFactory(numThreads, + numThreads, + maxQueuedRequests, + maxConnectionsPerNode, + maxTotalConnections, + bootstrapUrl); + + StoreClient<String, String> client = factory.getStoreClient("my_store_name"); + // get the value Versioned<String> version = client.get("some_key"); - + // modify the value version.setObject("new_value"); - + // update the value client.put("some_key", version); } - + } example/java/voldemort/examples/ClientExample.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort; import java.io.BufferedReader; src/java/voldemort/VoldemortClientShell.java @@ -1,33 +1,49 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort; /** * Base exception - * + * * @author jay - * + * */ public class VoldemortException extends RuntimeException { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; + + public VoldemortException() { + super(); + } - public VoldemortException() { - super(); - } - - public short getId() { - return 1; - } + public short getId() { + return 1; + } - public VoldemortException(String s, Throwable t) { - super(s, t); - } + public VoldemortException(String s, Throwable t) { + super(s, t); + } - public VoldemortException(String s) { - super(s); - } + public VoldemortException(String s) { + super(s); + } - public VoldemortException(Throwable t) { - super(t); - } + public VoldemortException(Throwable t) { + super(t); + } } src/java/voldemort/VoldemortException.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.annotations.concurrency; /** src/java/voldemort/annotations/concurrency/Immutable.java @@ -1,13 +1,29 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.annotations.concurrency; /** * Indicates the lock that protects a given variable * * @author jay - * + * */ public @interface LockedBy { - - String value(); + + String value(); } src/java/voldemort/annotations/concurrency/LockedBy.java @@ -1,11 +1,27 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.annotations.concurrency; /** - * Indicates that a class is not threadsafe, or tells implementors of an interface that their class - * need not be threadsafe + * Indicates that a class is not threadsafe, or tells implementors of an + * interface that their class need not be threadsafe * * @author jay - * + * */ public @interface NotThreadsafe { src/java/voldemort/annotations/concurrency/NotThreadsafe.java @@ -1,11 +1,27 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.annotations.concurrency; /** - * Claims that a class is threadsafe or admonishes implementors of an interface to ensure that - * their implementation is threadsafe. + * Claims that a class is threadsafe or admonishes implementors of an interface + * to ensure that their implementation is threadsafe. * * @author jay - * + * */ public @interface Threadsafe { src/java/voldemort/annotations/concurrency/Threadsafe.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.annotations.jmx; import java.lang.annotation.ElementType; src/java/voldemort/annotations/jmx/JmxGetter.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.annotations.jmx; import java.lang.annotation.ElementType; src/java/voldemort/annotations/jmx/JmxManaged.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.annotations.jmx; import java.lang.annotation.ElementType; src/java/voldemort/annotations/jmx/JmxOperation.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.annotations.jmx; import java.lang.annotation.ElementType; src/java/voldemort/annotations/jmx/JmxParam.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.annotations.jmx; import java.lang.annotation.ElementType; src/java/voldemort/annotations/jmx/JmxSetter.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.client; import java.io.StringReader; src/java/voldemort/client/AbstractStoreClientFactory.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.client; import voldemort.VoldemortException; src/java/voldemort/client/BootstrapFailureException.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.client; import java.util.List; @@ -35,7 +51,7 @@ public class DefaultStoreClient<K, V> implements StoreClient<K, V> { public boolean delete(K key) { Versioned<V> versioned = get(key); - if (versioned == null) + if(versioned == null) return false; return store.delete(key, versioned.getVersion()); } @@ -50,7 +66,7 @@ public class DefaultStoreClient<K, V> implements StoreClient<K, V> { public V getValue(K key) { Versioned<V> returned = get(key, null); - if (returned == null) + if(returned == null) return null; else return returned.getValue(); @@ -58,13 +74,13 @@ public class DefaultStoreClient<K, V> implements StoreClient<K, V> { public Versioned<V> get(K key, Versioned<V> defaultValue) { List<Versioned<V>> items = store.get(key); - if (items.size() == 0) + if(items.size() == 0) return defaultValue; - else if (items.size() == 1) + else if(items.size() == 1) return items.get(0); else throw new InconsistentDataException("Unresolved versions returned from get(" + key - + ") = " + items, items); + + ") = " + items, items); } public Versioned<V> get(K key) { @@ -73,7 +89,7 @@ public class DefaultStoreClient<K, V> implements StoreClient<K, V> { public void put(K key, V value) { Versioned<V> versioned = get(key, NOT_FOUND); - if (versioned == NOT_FOUND) + if(versioned == NOT_FOUND) versioned = new Versioned<V>(value, new VectorClock()); versioned.setObject(value); store.put(key, versioned); @@ -83,7 +99,7 @@ public class DefaultStoreClient<K, V> implements StoreClient<K, V> { try { store.put(key, versioned); return true; - } catch (ObsoleteVersionException e) { + } catch(ObsoleteVersionException e) { return false; } } @@ -99,17 +115,17 @@ public class DefaultStoreClient<K, V> implements StoreClient<K, V> { public boolean applyUpdate(UpdateAction<K, V> action, int maxTries) { boolean success = false; try { - for (int i = 0; i < maxTries; i++) { + for(int i = 0; i < maxTries; i++) { try { action.update(this); success = true; return success; - } catch (ObsoleteVersionException e) { + } catch(ObsoleteVersionException e) { // ignore for now } } } finally { - if (!success) + if(!success) action.rollback(); } @@ -127,7 +143,7 @@ public class DefaultStoreClient<K, V> implements StoreClient<K, V> { } public List<Node> getResponsibleNodes(K key) { - if (this.routingStragy == null) + if(this.routingStragy == null) throw new UnsupportedOperationException("This store client has no routing strategy."); return this.routingStragy.routeRequest(keySerializer.toBytes(key)); } src/java/voldemort/client/DefaultStoreClient.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.client; import java.net.URI; @@ -123,9 +139,12 @@ public class HttpStoreClientFactory extends AbstractStoreClientFactory { @Override protected void validateUrl(URI url) { - if (!URL_SCHEME.equals(url.getScheme())) + if(!URL_SCHEME.equals(url.getScheme())) throw new IllegalArgumentException("Illegal scheme in bootstrap URL for HttpStoreClientFactory:" - + " expected '" + URL_SCHEME + "' but found '" + url.getScheme() + "'."); + + " expected '" + + URL_SCHEME + + "' but found '" + + url.getScheme() + "'."); } } src/java/voldemort/client/HttpStoreClientFactory.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.client; import voldemort.serialization.Serializer; src/java/voldemort/client/MockStoreClientFactory.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.client; public enum RoutingTier { @@ -11,8 +27,8 @@ public enum RoutingTier { } public static RoutingTier fromDisplay(String type) { - for (RoutingTier t : RoutingTier.values()) - if (t.toDisplay().equals(type)) + for(RoutingTier t: RoutingTier.values()) + if(t.toDisplay().equals(type)) return t; throw new IllegalArgumentException("No RoutingPolicy " + type + " exists."); } src/java/voldemort/client/RoutingTier.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.client; import java.net.URI; @@ -123,9 +139,12 @@ public class SocketStoreClientFactory extends AbstractStoreClientFactory { @Override protected void validateUrl(URI url) { - if (!URL_SCHEME.equals(url.getScheme())) + if(!URL_SCHEME.equals(url.getScheme())) throw new IllegalArgumentException("Illegal scheme in bootstrap URL for SocketStoreClientFactory:" - + " expected '" + URL_SCHEME + "' but found '" + url.getScheme() + "'."); + + " expected '" + + URL_SCHEME + + "' but found '" + + url.getScheme() + "'."); } } src/java/voldemort/client/SocketStoreClientFactory.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.client; import voldemort.store.ObsoleteVersionException; src/java/voldemort/client/StoreClient.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.client; import voldemort.versioning.InconsistencyResolver; src/java/voldemort/client/StoreClientFactory.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.client; /** src/java/voldemort/client/UpdateAction.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.client; public enum VoldemortProtocol { src/java/voldemort/client/VoldemortProtocol.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.cluster; import java.io.Serializable; @@ -34,8 +50,8 @@ public class Cluster implements Serializable { public Cluster(String name, List<Node> nodes) { this.name = Objects.nonNull(name); this.nodesById = new LinkedHashMap<Integer, Node>(nodes.size()); - for (Node node : nodes) { - if (nodesById.containsKey(node.getId())) + for(Node node: nodes) { + if(nodesById.containsKey(node.getId())) throw new IllegalArgumentException("Node id " + node.getId() + " appears twice in the node list."); nodesById.put(node.getId(), node); @@ -45,11 +61,11 @@ public class Cluster implements Serializable { private int getNumberOfTags(List<Node> nodes) { List<Integer> tags = new ArrayList<Integer>(); - for (Node node : nodes) + for(Node node: nodes) tags.addAll(node.getPartitionIds()); Collections.sort(tags); - for (int i = 0; i < numberOfTags; i++) { - if (tags.get(i).longValue() != i) + for(int i = 0; i < numberOfTags; i++) { + if(tags.get(i).longValue() != i) throw new IllegalArgumentException("Invalid tag assignment."); } return tags.size(); @@ -66,7 +82,7 @@ public class Cluster implements Serializable { public Node getNodeById(int id) { Node node = nodesById.get(id); - if (node == null) + if(node == null) throw new VoldemortException("No such node in cluster: " + id); return node; } @@ -86,7 +102,7 @@ public class Cluster implements Serializable { builder.append("Cluster('"); builder.append(getName()); builder.append("', ["); - for (Node n : getNodes()) { + for(Node n: getNodes()) { builder.append(n.toString()); builder.append(", "); } src/java/voldemort/cluster/Cluster.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.cluster; import java.io.Serializable; @@ -77,7 +93,7 @@ public class Node implements Serializable { public URI getHttpUrl() { try { return new URI("http://" + getHost() + ":" + getHttpPort()); - } catch (URISyntaxException e) { + } catch(URISyntaxException e) { throw new IllegalStateException("Invalid host format for node " + id + "."); } } @@ -85,7 +101,7 @@ public class Node implements Serializable { public URI getSocketUrl() { try { return new URI("tcp://" + getHost() + ":" + getSocketPort()); - } catch (URISyntaxException e) { + } catch(URISyntaxException e) { throw new IllegalStateException("Invalid host format for node " + id + "."); } } @@ -97,9 +113,9 @@ public class Node implements Serializable { @Override public boolean equals(Object o) { - if (this == o) + if(this == o) return true; - if (!(o instanceof Node)) + if(!(o instanceof Node)) return false; Node n = (Node) o; src/java/voldemort/cluster/Node.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.cluster; import java.io.Serializable; src/java/voldemort/cluster/NodeStatus.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.routing; import java.util.ArrayList; @@ -40,9 +56,9 @@ public class ConsistentRoutingStrategy implements RoutingStrategy { this.numResults = numReplicas; this.hash = hash; SortedMap<Integer, Node> m = new TreeMap<Integer, Node>(); - for (Node n : nodes) { - for (Integer partition : n.getPartitionIds()) { - if (m.containsKey(partition)) + for(Node n: nodes) { + for(Integer partition: n.getPartitionIds()) { + if(m.containsKey(partition)) throw new IllegalArgumentException("Duplicate partition id " + partition + " in cluster configuration."); m.put(partition, n); @@ -50,8 +66,8 @@ public class ConsistentRoutingStrategy implements RoutingStrategy { } this.partitionToNode = new Node[m.size()]; - for (int i = 0; i < m.size(); i++) { - if (!m.containsKey(i)) + for(int i = 0; i < m.size(); i++) { + if(!m.containsKey(i)) throw new IllegalArgumentException("Missing tag " + i); this.partitionToNode[i] = m.get(i); } @@ -60,13 +76,13 @@ public class ConsistentRoutingStrategy implements RoutingStrategy { public List<Node> routeRequest(byte[] key) { List<Node> preferenceList = new ArrayList<Node>(numResults); int index = Math.abs(hash.hash(key)) % this.partitionToNode.length; - for (int i = 0; i < partitionToNode.length; i++) { + for(int i = 0; i < partitionToNode.length; i++) { // add this one if we haven't already - if (!preferenceList.contains(partitionToNode[index])) + if(!preferenceList.contains(partitionToNode[index])) preferenceList.add(partitionToNode[index]); // if we have enough, go home - if (preferenceList.size() >= numResults) + if(preferenceList.size() >= numResults) return preferenceList; // move to next clockwise slot on the ring index = (index + 1) % partitionToNode.length; @@ -78,7 +94,7 @@ public class ConsistentRoutingStrategy implements RoutingStrategy { public Set<Node> getNodes() { Set<Node> s = new HashSet<Node>(); - for (Node n : this.partitionToNode) + for(Node n: this.partitionToNode) s.add(n); return s; } @@ -89,8 +105,8 @@ public class ConsistentRoutingStrategy implements RoutingStrategy { Set<Integer> getPartitionsByNode(Node n) { Set<Integer> tags = new HashSet<Integer>(); - for (int i = 0; i < partitionToNode.length; i++) - if (partitionToNode[i].equals(n)) + for(int i = 0; i < partitionToNode.length; i++) + if(partitionToNode[i].equals(n)) tags.add(i); return tags; } src/java/voldemort/routing/ConsistentRoutingStrategy.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.routing; import java.util.ArrayList; src/java/voldemort/routing/RouteToAllStrategy.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.routing; import java.util.List; src/java/voldemort/routing/RoutingStrategy.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization; import java.util.HashMap; src/java/voldemort/serialization/DefaultSerializerFactory.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization; /** src/java/voldemort/serialization/IdentitySerializer.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization; import java.io.ByteArrayInputStream; @@ -28,7 +44,7 @@ public class ObjectSerializer<T> implements Serializer<T> { ObjectOutputStream out = new ObjectOutputStream(stream); out.writeObject(object); return stream.toByteArray(); - } catch (IOException e) { + } catch(IOException e) { throw new SerializationException(e); } } @@ -43,9 +59,9 @@ public class ObjectSerializer<T> implements Serializer<T> { public T toObject(byte[] bytes) { try { return (T) new ObjectInputStream(new ByteArrayInputStream(bytes)).readObject(); - } catch (IOException e) { + } catch(IOException e) { throw new SerializationException(e); - } catch (ClassNotFoundException c) { + } catch(ClassNotFoundException c) { throw new SerializationException(c); } } src/java/voldemort/serialization/ObjectSerializer.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization; import voldemort.VoldemortException; src/java/voldemort/serialization/SerializationException.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization; /** src/java/voldemort/serialization/Serializer.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization; import java.util.Arrays; src/java/voldemort/serialization/SerializerDefinition.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization; /** src/java/voldemort/serialization/SerializerFactory.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization; import java.io.ByteArrayInputStream; @@ -26,7 +42,7 @@ public class SlopSerializer implements Serializer<Slop> { data.writeUTF(slop.getOperation().toString()); data.writeInt(slop.getKey().length); data.write(slop.getKey()); - if (slop.getValue() == null) { + if(slop.getValue() == null) { data.writeInt(-1); } else { data.writeInt(slop.getValue().length); @@ -35,7 +51,7 @@ public class SlopSerializer implements Serializer<Slop> { data.writeInt(slop.getNodeId()); data.writeLong(slop.getArrived().getTime()); return byteOutput.toByteArray(); - } catch (IOException e) { + } catch(IOException e) { throw new SerializationException(e); } } @@ -50,14 +66,14 @@ public class SlopSerializer implements Serializer<Slop> { ByteUtils.read(input, key); int size = input.readInt(); byte[] value = null; - if (size >= 0) { + if(size >= 0) { value = new byte[size]; ByteUtils.read(input, value); } int nodeId = input.readInt(); Date arrived = new Date(input.readLong()); return new Slop(storeName, op, key, value, nodeId, arrived); - } catch (IOException e) { + } catch(IOException e) { throw new SerializationException(e); } } src/java/voldemort/serialization/SlopSerializer.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization; import voldemort.utils.ByteUtils; src/java/voldemort/serialization/StringSerializer.java @@ -1,45 +1,60 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization; import voldemort.utils.ByteUtils; -import voldemort.utils.Utils; import voldemort.versioning.VectorClock; import voldemort.versioning.Versioned; /** - * A Serializer that removes the Versioned wrapper and delegates to a user-supplied - * serializer to deal with the remaining bytes + * A Serializer that removes the Versioned wrapper and delegates to a + * user-supplied serializer to deal with the remaining bytes * * @author jay - * + * * @param <T> The Versioned type */ public class VersionedSerializer<T> implements Serializer<Versioned<T>> { - - private final Serializer<T> innerSerializer; - - public VersionedSerializer(Serializer<T> innerSerializer) { - this.innerSerializer = innerSerializer; - } - - public byte[] toBytes(Versioned<T> versioned) { - byte[] versionBytes = null; - if(versioned.getVersion() == null) - versionBytes = new byte[]{-1}; - else - versionBytes = ((VectorClock) versioned.getVersion()).toBytes(); - byte[] objectBytes = innerSerializer.toBytes(versioned.getValue()); - return ByteUtils.cat(versionBytes, objectBytes); - } - - public Versioned<T> toObject(byte[] bytes) { - VectorClock clock = null; - int size = 1; - if(bytes[0] >= 0) { - clock = new VectorClock(bytes); - size = clock.sizeInBytes(); - } - T t = innerSerializer.toObject(ByteUtils.copy(bytes, size, bytes.length)); - return new Versioned<T>(t, clock); - } + + private final Serializer<T> innerSerializer; + + public VersionedSerializer(Serializer<T> innerSerializer) { + this.innerSerializer = innerSerializer; + } + + public byte[] toBytes(Versioned<T> versioned) { + byte[] versionBytes = null; + if(versioned.getVersion() == null) + versionBytes = new byte[] { -1 }; + else + versionBytes = ((VectorClock) versioned.getVersion()).toBytes(); + byte[] objectBytes = innerSerializer.toBytes(versioned.getValue()); + return ByteUtils.cat(versionBytes, objectBytes); + } + + public Versioned<T> toObject(byte[] bytes) { + VectorClock clock = null; + int size = 1; + if(bytes[0] >= 0) { + clock = new VectorClock(bytes); + size = clock.sizeInBytes(); + } + T t = innerSerializer.toObject(ByteUtils.copy(bytes, size, bytes.length)); + return new Versioned<T>(t, clock); + } } src/java/voldemort/serialization/VersionedSerializer.java @@ -1,6 +1,23 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization; public class VoldemortOpCode { + public static final byte GET_OP_CODE = 1; public static final byte PUT_OP_CODE = 2; public static final byte DELETE_OP_CODE = 3; src/java/voldemort/serialization/VoldemortOpCode.java @@ -1,8 +1,30 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; -import voldemort.versioning.*; +import voldemort.versioning.VectorClock; +import voldemort.versioning.Version; +import voldemort.versioning.Versioned; public final class VoldemortOperation { @@ -10,14 +32,14 @@ public final class VoldemortOperation { private final String key; private final byte[] value; private final VectorClock version; - + private VoldemortOperation(byte opCode, String key, byte[] value, VectorClock version) { this.opCode = opCode; this.key = key; this.value = value; this.version = version; } - + public VoldemortOperation(byte[] bytes) { if(bytes == null || bytes.length <= 1) throw new SerializationException("Not enough bytes to serialize"); @@ -49,13 +71,13 @@ public final class VoldemortOperation { throw new SerializationException(e); } } - + public byte[] getBytes() { try { ByteArrayOutputStream byteOutput = new ByteArrayOutputStream(); DataOutputStream output = new DataOutputStream(byteOutput); output.writeByte(opCode); - if(opCode != VoldemortOpCode.GET_OP_CODE) + if(opCode != VoldemortOpCode.GET_OP_CODE) output.write(version.toBytes()); output.writeUTF(key); if(opCode == VoldemortOpCode.PUT_OP_CODE) { @@ -67,17 +89,23 @@ public final class VoldemortOperation { throw new SerializationException(e); } } - + public VoldemortOperation makeGetOperation(String key) { return new VoldemortOperation(VoldemortOpCode.GET_OP_CODE, key, null, null); } - + public VoldemortOperation makePutOperation(String key, Versioned<byte[]> versioned) { - return new VoldemortOperation(VoldemortOpCode.PUT_OP_CODE, key, versioned.getValue(), (VectorClock) versioned.getVersion()); + return new VoldemortOperation(VoldemortOpCode.PUT_OP_CODE, + key, + versioned.getValue(), + (VectorClock) versioned.getVersion()); } - + public VoldemortOperation makeDeleteOperation(String key, Version version) { - return new VoldemortOperation(VoldemortOpCode.DELETE_OP_CODE, key, null, (VectorClock) version); + return new VoldemortOperation(VoldemortOpCode.DELETE_OP_CODE, + key, + null, + (VectorClock) version); } - + } src/java/voldemort/serialization/VoldemortOperation.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization.json; import voldemort.serialization.SerializationException; src/java/voldemort/serialization/json/EndOfFileException.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization.json; import java.io.IOException; src/java/voldemort/serialization/json/JsonReader.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization.json; import java.io.Serializable; src/java/voldemort/serialization/json/JsonTypeDefinition.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization.json; import java.io.ByteArrayInputStream; src/java/voldemort/serialization/json/JsonTypeSerializer.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization.json; import voldemort.serialization.SerializationException; @@ -31,8 +47,8 @@ public enum JsonTypes { } public static JsonTypes fromDisplay(String name) { - for (JsonTypes t : JsonTypes.values()) - if (t.toDisplay().equals(name)) + for(JsonTypes t: JsonTypes.values()) + if(t.toDisplay().equals(name)) return t; throw new SerializationException(name + " is not a valid display for any SimpleType."); } src/java/voldemort/serialization/json/JsonTypes.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server; import java.util.concurrent.atomic.AtomicBoolean; @@ -39,7 +55,7 @@ public abstract class AbstractService implements VoldemortService { @JmxOperation(description = "Start the service.", impact = MBeanOperationInfo.ACTION) public void start() { boolean isntStarted = isStarted.compareAndSet(false, true); - if (!isntStarted) + if(!isntStarted) throw new IllegalStateException("Server is already started!"); logger.info("Starting " + getName()); @@ -49,8 +65,8 @@ public abstract class AbstractService implements VoldemortService { @JmxOperation(description = "Stop the service.", impact = MBeanOperationInfo.ACTION) public void stop() { logger.info("Stopping " + getName()); - synchronized (this) { - if (!isStarted()) { + synchronized(this) { + if(!isStarted()) { logger.info("The service is already stopped, ignoring duplicate attempt."); } src/java/voldemort/server/AbstractService.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server; import java.io.File; @@ -553,7 +569,7 @@ public class VoldemortConfig implements Serializable { public boolean isCacheEngineEnabled() { return enableCacheEngine; } - + public void setEnableCacheEngine(boolean enableCacheEngine) { this.enableCacheEngine = enableCacheEngine; } src/java/voldemort/server/VoldemortConfig.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server; import static voldemort.utils.Utils.croak; src/java/voldemort/server/VoldemortServer.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server; /** src/java/voldemort/server/VoldemortService.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server.http; import org.mortbay.jetty.Connector; @@ -61,7 +77,7 @@ public class HttpService extends AbstractService { this.context = context; this.httpServer = httpServer; this.httpServer.start(); - } catch (Exception e) { + } catch(Exception e) { throw new VoldemortException(e); } } @@ -71,7 +87,7 @@ public class HttpService extends AbstractService { try { httpServer.stop(); context.destroy(); - } catch (Exception e) { + } catch(Exception e) { throw new VoldemortException(e); } this.httpServer = null; src/java/voldemort/server/http/HttpService.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server.http; import java.io.DataOutputStream; @@ -57,7 +73,7 @@ public class StoreServlet extends HttpServlet { super.init(); // if we don't already have a stores map, attempt to initialize from the // servlet context - if (this.stores == null) { + if(this.stores == null) { ServletContext context = this.getServletContext(); VoldemortServer server = (VoldemortServer) Objects.nonNull(context.getAttribute(VoldemortServletContextListener.SERVER_CONFIG_KEY)); this.stores = server.getStoreMap(); @@ -66,7 +82,7 @@ public class StoreServlet extends HttpServlet { private Store<byte[], byte[]> getStore(String name) { Store<byte[], byte[]> store = stores.get(name); - if (store == null) + if(store == null) throw new VoldemortException("No store named '" + name + "'."); return store; } @@ -81,14 +97,14 @@ public class StoreServlet extends HttpServlet { DataOutputStream stream = new DataOutputStream(response.getOutputStream()); try { List<Versioned<byte[]>> values = store.get(key); - for (Versioned<byte[]> versioned : values) { + for(Versioned<byte[]> versioned: values) { byte[] clock = ((VectorClock) versioned.getVersion()).toBytes(); byte[] value = versioned.getValue(); stream.writeInt(clock.length + value.length); stream.write(clock); stream.write(value); } - } catch (VoldemortException v) { + } catch(VoldemortException v) { HttpResponseCodeErrorMapper.ResponseCode code = httpResponseCodeErrorMapper.mapErrorToResponseCode(v); response.setContentType("text/xml"); response.sendError(code.getCode(), errorXml(v, code.getText())); @@ -109,7 +125,7 @@ public class StoreServlet extends HttpServlet { VectorClock clock = new VectorClock(Base64.decodeBase64(request.getHeader(VERSION_EXTENSION) .getBytes())); store.put(key, new Versioned<byte[]>(contents, clock)); - } catch (VoldemortException v) { + } catch(VoldemortException v) { HttpResponseCodeErrorMapper.ResponseCode code = httpResponseCodeErrorMapper.mapErrorToResponseCode(v); response.setContentType("text/xml"); response.sendError(code.getCode(), errorXml(v, code.getText())); @@ -127,9 +143,9 @@ public class StoreServlet extends HttpServlet { byte[] versionBytes = ByteUtils.getBytes(request.getHeader(VERSION_EXTENSION), "UTF-8"); VectorClock clock = new VectorClock(Base64.decodeBase64(versionBytes)); boolean succeeded = store.delete(key, clock); - if (!succeeded) + if(!succeeded) response.sendError(HttpURLConnection.HTTP_NOT_FOUND); - } catch (VoldemortException v) { + } catch(VoldemortException v) { HttpResponseCodeErrorMapper.ResponseCode code = httpResponseCodeErrorMapper.mapErrorToResponseCode(v); response.setContentType("text/xml"); response.sendError(code.getCode(), errorXml(v, code.getText())); @@ -148,7 +164,7 @@ public class StoreServlet extends HttpServlet { } private byte[] getKey(String[] urlPieces) { - if (urlPieces.length < 2) + if(urlPieces.length < 2) throw new VoldemortException("Invalid request for " + Join.join(".", urlPieces) + ": must specify both a store and key."); @@ -156,13 +172,13 @@ public class StoreServlet extends HttpServlet { try { byte[] key = ByteUtils.getBytes(keyStr, "UTF-8"); return urlCodec.decode(key); - } catch (DecoderException e) { + } catch(DecoderException e) { throw new VoldemortException("Corrupt key format."); } } private String getStoreName(String[] urlPieces) { - if (urlPieces.length < 2) + if(urlPieces.length < 2) throw new VoldemortException("Invalid request for " + Join.join("/", urlPieces) + ": must specify both a store and key."); return urlPieces[urlPieces.length - 2]; src/java/voldemort/server/http/StoreServlet.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server.http; import javax.servlet.ServletContextEvent; @@ -30,7 +46,7 @@ public class VoldemortServletContextListener implements ServletContextListener { logger.info("Calling application shutdown..."); VoldemortServer server = (VoldemortServer) event.getServletContext() .getAttribute(SERVER_CONFIG_KEY); - if (server != null) + if(server != null) server.stop(); logger.info("Destroying application..."); event.getServletContext().removeAttribute(SERVER_KEY); @@ -48,10 +64,10 @@ public class VoldemortServletContextListener implements ServletContextListener { new VelocityEngine(VOLDEMORT_TEMPLATE_DIR)); server.start(); logger.info("Application created."); - } catch (ConfigurationException e) { + } catch(ConfigurationException e) { logger.info("Error loading voldemort server:", e); throw e; - } catch (Exception e) { + } catch(Exception e) { logger.error("Error loading voldemort server:", e); throw new ConfigurationException(e); } src/java/voldemort/server/http/VoldemortServletContextListener.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server.http.gui; import java.io.IOException; src/java/voldemort/server/http/gui/AdminServlet.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server.http.gui; import java.io.IOException; @@ -72,15 +88,15 @@ public class QueryServlet extends HttpServlet { } private Object parseKey(String keyType, String key) { - if ("int8".equals(keyType)) + if("int8".equals(keyType)) return Byte.valueOf(key); - else if ("int16".equals(keyType)) + else if("int16".equals(keyType)) return Short.valueOf(key); - else if ("int32".equals(keyType)) + else if("int32".equals(keyType)) return Integer.valueOf(key); - else if ("int64".equals(keyType)) + else if("int64".equals(keyType)) return Long.valueOf(key); - else if ("string".equals(keyType)) + else if("string".equals(keyType)) return key; else throw new IllegalArgumentException("Unsupported key type: " + keyType); src/java/voldemort/server/http/gui/QueryServlet.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server.http.gui; import java.io.OutputStream; @@ -48,7 +64,7 @@ public class VelocityEngine { try { engine.mergeTemplate(baseTemplateDir + "/" + template, "UTF-8", context, writer); writer.flush(); - } catch (Exception e) { + } catch(Exception e) { throw new VoldemortException(e); } } src/java/voldemort/server/http/gui/VelocityEngine.java @@ -1,3 +1,19 @@ +## +## Copyright 2008-2009 LinkedIn, Inc +## +## Licensed under the Apache License, Version 2.0 (the "License"); you may not +## use this file except in compliance with the License. You may obtain a copy of +## the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +## License for the specific language governing permissions and limitations under +## the License. +## + <html> <head> <title>Voldemort Administration</title> src/java/voldemort/server/http/gui/templates/admin.vm @@ -1,3 +1,19 @@ +## +## Copyright 2008-2009 LinkedIn, Inc +## +## Licensed under the Apache License, Version 2.0 (the "License"); you may not +## use this file except in compliance with the License. You may obtain a copy of +## the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +## License for the specific language governing permissions and limitations under +## the License. +## + <html> <head> <title>Voldemort Administration</title> src/java/voldemort/server/http/gui/templates/query.vm @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server.jmx; import java.lang.management.ManagementFactory; @@ -55,11 +71,11 @@ public class JmxService extends AbstractService { protected void startInner() { registerBean(server, JmxUtils.createObjectName(VoldemortServer.class)); registerBean(cluster, JmxUtils.createObjectName(Cluster.class)); - for (VoldemortService service : services) { + for(VoldemortService service: services) { logger.debug("Registering mbean for service '" + service.getName() + "'."); registerBean(service, JmxUtils.createObjectName(service.getClass())); } - for (Store<byte[], byte[]> store : storeMap.values()) { + for(Store<byte[], byte[]> store: storeMap.values()) { logger.info("Registering mbean for store '" + store.getName() + "'."); registerBean(store, JmxUtils.createObjectName(JmxUtils.getPackageName(store.getClass()), @@ -69,14 +85,14 @@ public class JmxService extends AbstractService { @Override protected void stopInner() { - for (ObjectName name : registeredBeans) + for(ObjectName name: registeredBeans) JmxUtils.unregisterMbean(mbeanServer, name); registeredBeans.clear(); } private void registerBean(Object o, ObjectName name) { - synchronized (registeredBeans) { - if (mbeanServer.isRegistered(name)) { + synchronized(registeredBeans) { + if(mbeanServer.isRegistered(name)) { logger.warn("Overwriting mbean " + name); JmxUtils.unregisterMbean(mbeanServer, name); } src/java/voldemort/server/jmx/JmxService.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server.scheduler; import java.util.concurrent.Semaphore; src/java/voldemort/server/scheduler/DataCleanupJob.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server.scheduler; import java.util.List; src/java/voldemort/server/scheduler/RebalancingJob.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server.scheduler; import java.lang.Thread.UncaughtExceptionHandler; src/java/voldemort/server/scheduler/SchedulerService.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server.scheduler; import java.util.Map; @@ -31,7 +47,7 @@ public class SlopPusherJob implements Runnable { private final ConcurrentMap<Integer, Store<byte[], byte[]>> stores; public SlopPusherJob(StorageEngine<byte[], Slop> slop, - Map<Integer, ? extends Store<byte[], byte[]>> stores) { + Map<Integer, ? extends Store<byte[], byte[]>> stores) { this.slopStore = slop; this.stores = new ConcurrentHashMap<Integer, Store<byte[], byte[]>>(stores); } src/java/voldemort/server/scheduler/SlopPusherJob.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server.socket; import java.io.BufferedInputStream; src/java/voldemort/server/socket/SocketServer.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server.socket; import java.util.concurrent.ConcurrentMap; src/java/voldemort/server/socket/SocketService.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server.socket; import java.io.DataInputStream; src/java/voldemort/server/socket/StreamStoreRequestHandler.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server.storage; import java.util.Calendar; @@ -96,9 +112,10 @@ public class StorageService extends AbstractService { configs.put(StorageEngineType.MEMORY, new InMemoryStorageConfiguration()); if(config.isCacheEngineEnabled()) configs.put(StorageEngineType.CACHE, new CacheStorageConfiguration()); - if(config.isReadOnlyEngineEnabled()) - configs.put(StorageEngineType.READONLY, new RandomAccessFileStorageConfiguration(config)); - + if(config.isReadOnlyEngineEnabled()) + configs.put(StorageEngineType.READONLY, + new RandomAccessFileStorageConfiguration(config)); + if(configs.size() == 0) throw new ConfigurationException("No storage engine has been enabled!"); src/java/voldemort/server/storage/StorageService.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import java.util.List; src/java/voldemort/store/DelegatingStore.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import com.google.common.base.Objects; @@ -30,11 +46,11 @@ public class Entry<K, V> { @Override public boolean equals(Object obj) { - if (this == obj) + if(this == obj) return true; - if (obj == null) + if(obj == null) return false; - if (!(obj instanceof Entry)) + if(!(obj instanceof Entry)) return false; Entry<?, ?> e = (Entry<?, ?>) obj; return Objects.equal(key, e.getKey()) && Objects.equal(value, e.getValue()); src/java/voldemort/store/Entry.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import voldemort.VoldemortException; @@ -30,7 +46,7 @@ public class ErrorCodeMapper { public VoldemortException getError(short code, String message) { Class<? extends VoldemortException> klass = mapping.get(code); - if (klass == null) + if(klass == null) return new UnknownFailure(Integer.toString(code)); else return ReflectUtils.construct(klass, new Object[] { message }); @@ -38,7 +54,7 @@ public class ErrorCodeMapper { public short getCode(VoldemortException e) { Short code = mapping.inverse().get(e.getClass()); - if (code == null) + if(code == null) throw new IllegalArgumentException("No mapping code for " + e.getClass()); else return code; src/java/voldemort/store/ErrorCodeMapper.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import java.util.Collection; src/java/voldemort/store/InsufficientOperationalNodesException.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import com.google.common.base.Objects; @@ -22,9 +38,9 @@ public class KeyWrapper { @Override public boolean equals(Object o) { - if (this == o) + if(this == o) return true; - if (!(o instanceof KeyWrapper)) + if(!(o instanceof KeyWrapper)) return false; KeyWrapper key = (KeyWrapper) o; src/java/voldemort/store/KeyWrapper.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; /** src/java/voldemort/store/ObsoleteVersionException.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import voldemort.VoldemortException; src/java/voldemort/store/PersistenceFailureException.java @@ -1,35 +1,52 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; /** * An abstraction that represents the shared resources of a persistence engine. * This could include file handles, db connection pools, caches, etc. * - * For example for BDB it holds the various environments, - * for jdbc it holds a connection pool reference + * For example for BDB it holds the various environments, for jdbc it holds a + * connection pool reference * - * This should be called StorageEngineFactory but that would leave us with the indignity of - * having a StorageEngineFactoryFactory to handle the mapping of store type => factory. - * And we can't have that. + * This should be called StorageEngineFactory but that would leave us with the + * indignity of having a StorageEngineFactoryFactory to handle the mapping of + * store type => factory. And we can't have that. * * @author jay - * + * */ public interface StorageConfiguration { - - /** - * Get an initialized storage implementation - * @param name The name of the storage - * @return The storage engine - */ - public StorageEngine<byte[], byte[]> getStore(String name); - - /** - * Get the type of stores returned by this configuration - */ - public StorageEngineType getType(); - /** - * Close the storage configuration - */ - public void close(); + /** + * Get an initialized storage implementation + * + * @param name The name of the storage + * @return The storage engine + */ + public StorageEngine<byte[], byte[]> getStore(String name); + + /** + * Get the type of stores returned by this configuration + */ + public StorageEngineType getType(); + + /** + * Close the storage configuration + */ + public void close(); } src/java/voldemort/store/StorageConfiguration.java @@ -1,29 +1,52 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import voldemort.utils.ClosableIterator; import voldemort.versioning.Versioned; /** - * A base storage class which is actually responsible for data persistence. This interface implies - * all the usual responsibilities of a Store implementation, and in addition - * 1. The implementation MUST throw an ObsoleteVersionException if the user attempts - * to put a version which is strictly before an existing version (concurrent is okay) - * 2. The implementation MUST increment this version number when the value is stored. - * 3. The implementation MUST contain an ID identifying it as part of the cluster + * A base storage class which is actually responsible for data persistence. This + * interface implies all the usual responsibilities of a Store implementation, + * and in addition + * <ol> + * <li>The implementation MUST throw an ObsoleteVersionException if the user + * attempts to put a version which is strictly before an existing version + * (concurrent is okay)</li> + * <li>The implementation MUST increment this version number when the value is + * stored.</li> + * <li>The implementation MUST contain an ID identifying it as part of the + * cluster</li> + * </ol> * * A hash value can be produced for known subtrees of a StorageEngine * * @author jay - * + * * @param <K> The type of the key being stored * @param <V> The type of the value being stored * */ -public interface StorageEngine<K,V> extends Store<K,V> { - +public interface StorageEngine<K, V> extends Store<K, V> { + /** - * @return An iterator over the entries in this StorageEngine. Note that the iterator MUST be closed after use. + * @return An iterator over the entries in this StorageEngine. Note that the + * iterator MUST be closed after use. */ - public ClosableIterator<Entry<K,Versioned<V>>> entries(); + public ClosableIterator<Entry<K, Versioned<V>>> entries(); } src/java/voldemort/store/StorageEngine.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; /** src/java/voldemort/store/StorageEngineType.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import voldemort.VoldemortException; src/java/voldemort/store/StorageInitializationException.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import java.util.List; src/java/voldemort/store/Store.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import java.io.Serializable; src/java/voldemort/store/StoreDefinition.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import voldemort.VoldemortException; src/java/voldemort/store/StoreOperationFailureException.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; /** @@ -9,7 +25,7 @@ package voldemort.store; public class StoreUtils { public static <K> void assertValidKey(K key) { - if (key == null) + if(key == null) throw new IllegalArgumentException("Key cannot be null."); } src/java/voldemort/store/StoreUtils.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import voldemort.VoldemortException; src/java/voldemort/store/UnknownFailure.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import voldemort.VoldemortException; src/java/voldemort/store/UnreachableStoreException.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.bdb; import java.io.File; @@ -52,20 +68,20 @@ public class BdbStorageConfiguration implements StorageConfiguration { databaseConfig.setNodeMaxEntries(config.getBdbBtreeFanout()); databaseConfig.setTransactional(true); File bdbDir = new File(config.getBdbDataDirectory()); - if (!bdbDir.exists()) + if(!bdbDir.exists()) bdbDir.mkdir(); environment = new Environment(bdbDir, environmentConfig); isInitialized = true; - } catch (DatabaseException e) { + } catch(DatabaseException e) { throw new StorageInitializationException(e); } } public synchronized StorageEngine<byte[], byte[]> getStore(String storeName) { - if (!isInitialized) + if(!isInitialized) throw new StorageInitializationException("Attempt to get store for uninitialized storage configuration!"); - if (stores.containsKey(storeName)) { + if(stores.containsKey(storeName)) { return stores.get(storeName); } else { try { @@ -73,7 +89,7 @@ public class BdbStorageConfiguration implements StorageConfiguration { BdbStorageEngine engine = new BdbStorageEngine(storeName, environment, db); stores.put(storeName, engine); return engine; - } catch (DatabaseException d) { + } catch(DatabaseException d) { throw new StorageInitializationException(d); } } @@ -87,7 +103,7 @@ public class BdbStorageConfiguration implements StorageConfiguration { try { this.environment.sync(); this.environment.close(); - } catch (DatabaseException e) { + } catch(DatabaseException e) { throw new VoldemortException(e); } } src/java/voldemort/store/bdb/BdbStorageConfiguration.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.bdb; import static voldemort.utils.Utils.assertNotNull; @@ -65,7 +81,7 @@ public class BdbStorageEngine implements StorageEngine<byte[], byte[]> { try { Cursor cursor = bdbDatabase.openCursor(null, null); return new BdbStoreIterator(cursor); - } catch (DatabaseException e) { + } catch(DatabaseException e) { throw new PersistenceFailureException(e); } } @@ -76,7 +92,7 @@ public class BdbStorageEngine implements StorageEngine<byte[], byte[]> { byte[] keyBytes = new byte[2 + key.length + clockSize]; ByteUtils.writeShort(keyBytes, (short) key.length, 0); System.arraycopy(key, 0, keyBytes, 2, key.length); - if (clock != null) + if(clock != null) System.arraycopy(clock.toBytes(), 0, keyBytes, key.length + 2, clockSize); return keyBytes; } @@ -84,25 +100,25 @@ public class BdbStorageEngine implements StorageEngine<byte[], byte[]> { static byte[] getObjKey(byte[] bytes) { short size = ByteUtils.readShort(bytes, 0); byte[] dest = new byte[size]; - if (size > 0) + if(size > 0) System.arraycopy(bytes, 2, dest, 0, size); return dest; } static VectorClock getVersion(byte[] bytes) { short size = ByteUtils.readShort(bytes, 0); - if (size >= bytes.length - 2) + if(size >= bytes.length - 2) return null; else return new VectorClock(ByteUtils.copy(bytes, size + 2, bytes.length)); } static boolean isPrefix(byte[] prefix, byte[] complete) { - if (prefix.length > complete.length) + if(prefix.length > complete.length) return false; - for (int i = 0; i < prefix.length; i++) - if (complete[i] != prefix[i]) + for(int i = 0; i < prefix.length; i++) + if(complete[i] != prefix[i]) return false; return true; @@ -110,9 +126,9 @@ public class BdbStorageEngine implements StorageEngine<byte[], byte[]> { private static void attemptClose(Cursor cursor) { try { - if (cursor != null) + if(cursor != null) cursor.close(); - } catch (DatabaseException e) { + } catch(DatabaseException e) { logger.error("Error closing cursor.", e); throw new PersistenceFailureException(e.getMessage(), e); } @@ -132,13 +148,13 @@ public class BdbStorageEngine implements StorageEngine<byte[], byte[]> { DatabaseEntry valueEntry = new DatabaseEntry(); List<Versioned<byte[]>> results = new ArrayList<Versioned<byte[]>>(); cursor = bdbDatabase.openCursor(null, null); - for (OperationStatus status = cursor.getSearchKey(keyEntry, valueEntry, lockMode); status == OperationStatus.SUCCESS; status = cursor.getNextDup(keyEntry, - valueEntry, - lockMode)) { + for(OperationStatus status = cursor.getSearchKey(keyEntry, valueEntry, lockMode); status == OperationStatus.SUCCESS; status = cursor.getNextDup(keyEntry, + valueEntry, + lockMode)) { results.add(serializer.toObject(valueEntry.getData())); } return results; - } catch (DatabaseException e) { + } catch(DatabaseException e) { throw new PersistenceFailureException(e); } finally { attemptClose(cursor); @@ -160,17 +176,17 @@ public class BdbStorageEngine implements StorageEngine<byte[], byte[]> { // if there is a version later than this one, throw an exception DatabaseEntry valueEntry = new DatabaseEntry(); cursor = bdbDatabase.openCursor(transaction, null); - for (OperationStatus status = cursor.getSearchKey(keyEntry, valueEntry, LockMode.RMW); status == OperationStatus.SUCCESS; status = cursor.getNextDup(keyEntry, - valueEntry, - LockMode.RMW)) { + for(OperationStatus status = cursor.getSearchKey(keyEntry, valueEntry, LockMode.RMW); status == OperationStatus.SUCCESS; status = cursor.getNextDup(keyEntry, + valueEntry, + LockMode.RMW)) { VectorClock clock = new VectorClock(valueEntry.getData()); Occured occured = value.getVersion().compare(clock); - if (occured == Occured.BEFORE) + if(occured == Occured.BEFORE) throw new ObsoleteVersionException("Key '" + new String(hexCodec.encode(key)) + "' " + value.getVersion().toString() + " is obsolete," + " current version is " + clock + "."); - else if (occured == Occured.AFTER) + else if(occured == Occured.AFTER) // best effort delete of obsolete previous value! cursor.delete(); } @@ -179,15 +195,15 @@ public class BdbStorageEngine implements StorageEngine<byte[], byte[]> { // in valueEntry = new DatabaseEntry(serializer.toBytes(value)); OperationStatus status = cursor.put(keyEntry, valueEntry); - if (status != OperationStatus.SUCCESS) + if(status != OperationStatus.SUCCESS) throw new PersistenceFailureException("Put operation failed with status: " + status); succeeded = true; - } catch (DatabaseException e) { + } catch(DatabaseException e) { throw new PersistenceFailureException(e); } finally { attemptClose(cursor); - if (succeeded) + if(succeeded) attemptCommit(transaction); else attemptAbort(transaction); @@ -204,17 +220,17 @@ public class BdbStorageEngine implements StorageEngine<byte[], byte[]> { DatabaseEntry keyEntry = new DatabaseEntry(key); DatabaseEntry valueEntry = new DatabaseEntry(); cursor = bdbDatabase.openCursor(transaction, null); - for (OperationStatus status = cursor.getSearchKey(keyEntry, valueEntry, null); status == OperationStatus.SUCCESS; status = cursor.getNextDup(keyEntry, - valueEntry, - null)) { + for(OperationStatus status = cursor.getSearchKey(keyEntry, valueEntry, null); status == OperationStatus.SUCCESS; status = cursor.getNextDup(keyEntry, + valueEntry, + null)) { // if version is null no comparison is necessary - if (new VectorClock(valueEntry.getData()).compare(version) == Occured.BEFORE) { + if(new VectorClock(valueEntry.getData()).compare(version) == Occured.BEFORE) { cursor.delete(); deletedSomething = true; } } return deletedSomething; - } catch (DatabaseException e) { + } catch(DatabaseException e) { throw new PersistenceFailureException(e); } finally { try { @@ -232,7 +248,7 @@ public class BdbStorageEngine implements StorageEngine<byte[], byte[]> { @SuppressWarnings("unchecked") public boolean equals(Object o) { - if (o == null || !Store.class.equals(o.getClass())) + if(o == null || !Store.class.equals(o.getClass())) return false; Store s = (Store) o; return s.getName().equals(o); @@ -241,7 +257,7 @@ public class BdbStorageEngine implements StorageEngine<byte[], byte[]> { public void close() throws PersistenceFailureException { try { this.bdbDatabase.close(); - } catch (DatabaseException e) { + } catch(DatabaseException e) { throw new PersistenceFailureException("Shutdown failed.", e); } } @@ -249,7 +265,7 @@ public class BdbStorageEngine implements StorageEngine<byte[], byte[]> { private void attemptAbort(Transaction transaction) { try { transaction.abort(); - } catch (Exception e) { + } catch(Exception e) { logger.error("Abort failed!", e); } } @@ -257,7 +273,7 @@ public class BdbStorageEngine implements StorageEngine<byte[], byte[]> { private void attemptCommit(Transaction transaction) { try { transaction.commit(); - } catch (DatabaseException e) { + } catch(DatabaseException e) { logger.error("Transaction commit failed!", e); attemptAbort(transaction); throw new PersistenceFailureException(e); @@ -277,14 +293,14 @@ public class BdbStorageEngine implements StorageEngine<byte[], byte[]> { DatabaseEntry valueEntry = new DatabaseEntry(); try { cursor.getFirst(keyEntry, valueEntry, null); - } catch (DatabaseException e) { + } catch(DatabaseException e) { throw new PersistenceFailureException(e); } current = getEntry(keyEntry, valueEntry); } private Entry<byte[], Versioned<byte[]>> getEntry(DatabaseEntry key, DatabaseEntry value) { - if (key == null || key.getData() == null) { + if(key == null || key.getData() == null) { return null; } else { VectorClock clock = new VectorClock(value.getData()); @@ -301,18 +317,18 @@ public class BdbStorageEngine implements StorageEngine<byte[], byte[]> { } public Entry<byte[], Versioned<byte[]>> next() { - if (!isOpen) + if(!isOpen) throw new PersistenceFailureException("Call to next() on a closed iterator."); DatabaseEntry keyEntry = new DatabaseEntry(); DatabaseEntry valueEntry = new DatabaseEntry(); try { cursor.getNext(keyEntry, valueEntry, null); - } catch (DatabaseException e) { + } catch(DatabaseException e) { throw new PersistenceFailureException(e); } Entry<byte[], Versioned<byte[]>> previous = current; - if (keyEntry.getData() == null) + if(keyEntry.getData() == null) current = null; else current = getEntry(keyEntry, valueEntry); @@ -328,14 +344,14 @@ public class BdbStorageEngine implements StorageEngine<byte[], byte[]> { try { cursor.close(); isOpen = false; - } catch (DatabaseException e) { + } catch(DatabaseException e) { throw new PersistenceFailureException(e); } } @Override public void finalize() { - if (isOpen) { + if(isOpen) { logger.error("Failure to close cursor, will be forcably closed."); close(); } src/java/voldemort/store/bdb/BdbStorageEngine.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.filesystem; import java.io.File; @@ -29,10 +45,10 @@ public class FilesystemStorageEngine implements StorageEngine<String, String> { public FilesystemStorageEngine(String name, String directory) { this.name = name; this.directory = new File(directory); - if (this.directory.listFiles() == null) + if(this.directory.listFiles() == null) throw new IllegalArgumentException("No configuration found in " + this.directory.getAbsolutePath() + "."); - if (!this.directory.exists() && this.directory.canRead()) + if(!this.directory.exists() && this.directory.canRead()) throw new IllegalArgumentException("Directory " + this.directory.getAbsolutePath() + " does not exist or can not be read."); } @@ -49,10 +65,10 @@ public class FilesystemStorageEngine implements StorageEngine<String, String> { StoreUtils.assertValidKey(key); File[] files = this.directory.listFiles(); boolean deletedSomething = false; - for (File file : files) { - if (file.getName().startsWith(key)) { + for(File file: files) { + if(file.getName().startsWith(key)) { VectorClock clock = getVersion(file); - if (clock.compare(version) == Occured.BEFORE) + if(clock.compare(version) == Occured.BEFORE) deletedSomething |= file.delete(); } } @@ -64,15 +80,15 @@ public class FilesystemStorageEngine implements StorageEngine<String, String> { File[] files = this.directory.listFiles(); List<Versioned<String>> found = new ArrayList<Versioned<String>>(); try { - for (File file : files) { - if (file.getName().startsWith(key)) { + for(File file: files) { + if(file.getName().startsWith(key)) { VectorClock clock = getVersion(file); found.add(new Versioned<String>(FileUtils.readFileToString(file, "UTF-8"), clock)); } } return found; - } catch (IOException e) { + } catch(IOException e) { throw new VoldemortException(e); } } @@ -85,10 +101,10 @@ public class FilesystemStorageEngine implements StorageEngine<String, String> { StoreUtils.assertValidKey(key); // Check for obsolete version File[] files = this.directory.listFiles(); - for (File file : files) { - if (file.getName().startsWith(key)) { + for(File file: files) { + if(file.getName().startsWith(key)) { VectorClock clock = getVersion(file); - if (clock.compare(value.getVersion()) == Occured.AFTER) + if(clock.compare(value.getVersion()) == Occured.AFTER) throw new ObsoleteVersionException("A successor version to this exists."); } } @@ -98,10 +114,10 @@ public class FilesystemStorageEngine implements StorageEngine<String, String> { + new String(Hex.encodeHex(clock.toBytes())); File newFile = new File(path); try { - if (!newFile.createNewFile()) + if(!newFile.createNewFile()) throw new ObsoleteVersionException("File " + path + " already exists."); FileUtils.writeStringToFile(newFile, value.getValue(), "UTF-8"); - } catch (IOException e) { + } catch(IOException e) { throw new VoldemortException(e); } } @@ -109,13 +125,13 @@ public class FilesystemStorageEngine implements StorageEngine<String, String> { private VectorClock getVersion(File file) { try { int index = file.getName().lastIndexOf('-'); - if (index <= 0) + if(index <= 0) return new VectorClock(); else return new VectorClock(Hex.decodeHex(file.getName() .substring(index + 1) .toCharArray())); - } catch (DecoderException e) { + } catch(DecoderException e) { throw new VoldemortException(e); } } @@ -140,9 +156,9 @@ public class FilesystemStorageEngine implements StorageEngine<String, String> { } public Entry<String, Versioned<String>> next() { - synchronized (FilesystemStorageEngine.this) { - while (true) { - if (!hasNext()) + synchronized(FilesystemStorageEngine.this) { + while(true) { + if(!hasNext()) throw new NoSuchElementException("No more elements in iterator!"); try { @@ -155,7 +171,7 @@ public class FilesystemStorageEngine implements StorageEngine<String, String> { return new Entry<String, Versioned<String>>(key, new Versioned<String>(value, clock)); - } catch (IOException e) { + } catch(IOException e) { // probably the file has been removed or something, skip // it } src/java/voldemort/store/filesystem/FilesystemStorageEngine.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.gzip; import java.io.ByteArrayInputStream; @@ -30,10 +46,10 @@ public class GzipStore<K> extends DelegatingStore<K, byte[]> implements Store<K, List<Versioned<byte[]>> found = getInnerStore().get(key); List<Versioned<byte[]>> results = new ArrayList<Versioned<byte[]>>(found.size()); try { - for (Versioned<byte[]> item : found) + for(Versioned<byte[]> item: found) results.add(new Versioned<byte[]>(IOUtils.toByteArray(new GZIPInputStream(new ByteArrayInputStream(item.getValue()))), (VectorClock) item.getVersion())); - } catch (IOException e) { + } catch(IOException e) { throw new VoldemortException(e); } @@ -45,7 +61,7 @@ public class GzipStore<K> extends DelegatingStore<K, byte[]> implements Store<K, getInnerStore().put(key, new Versioned<byte[]>(IOUtils.toByteArray(new GZIPInputStream(new ByteArrayInputStream(value.getValue()))), (VectorClock) value.getVersion())); - } catch (IOException e) { + } catch(IOException e) { throw new VoldemortException(e); } } src/java/voldemort/store/gzip/GzipStore.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.http; import java.net.HttpURLConnection; @@ -19,9 +35,9 @@ public class HttpResponseCodeErrorMapper { public VoldemortException mapResponseCodeToError(int responseCode, String message) { // 200 range response code is okay! - if (responseCode >= 200 && responseCode < 300) + if(responseCode >= 200 && responseCode < 300) return null; - else if (responseCode == HttpURLConnection.HTTP_CONFLICT) + else if(responseCode == HttpURLConnection.HTTP_CONFLICT) throw new ObsoleteVersionException(message); else throw new UnknownFailure("Unknown failure occured in HTTP operation: " + responseCode @@ -29,7 +45,7 @@ public class HttpResponseCodeErrorMapper { } public ResponseCode mapErrorToResponseCode(VoldemortException v) { - if (v instanceof ObsoleteVersionException) + if(v instanceof ObsoleteVersionException) return new ResponseCode(HttpURLConnection.HTTP_CONFLICT, v.getMessage()); else return new ResponseCode(HttpURLConnection.HTTP_BAD_GATEWAY, v.getMessage()); @@ -37,7 +53,7 @@ public class HttpResponseCodeErrorMapper { public void throwError(int responseCode, String message) { // 200 range response code is okay! - if (responseCode >= 200 && responseCode < 300) + if(responseCode >= 200 && responseCode < 300) return; else throw mapResponseCodeToError(responseCode, message); src/java/voldemort/store/http/HttpResponseCodeErrorMapper.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.http; import java.io.ByteArrayInputStream; @@ -60,18 +76,18 @@ public class HttpStore implements Store<byte[], byte[]> { method.setRequestHeader(VERSION_EXTENSION, new String(Base64.encodeBase64(clock.toBytes()))); int response = httpClient.executeMethod(method); - if (response == HttpURLConnection.HTTP_NOT_FOUND) + if(response == HttpURLConnection.HTTP_NOT_FOUND) return false; - if (response != HttpURLConnection.HTTP_OK) + if(response != HttpURLConnection.HTTP_OK) httpResponseCodeErrorMapper.throwError(response, method.getStatusText()); return true; - } catch (HttpException e) { + } catch(HttpException e) { throw new VoldemortException(e); - } catch (IOException e) { + } catch(IOException e) { throw new UnreachableStoreException("Could not connect to " + url + " for " + storeName, e); } finally { - if (method != null) + if(method != null) method.releaseConnection(); } } @@ -83,12 +99,12 @@ public class HttpStore implements Store<byte[], byte[]> { try { method = new GetMethod(url); int response = httpClient.executeMethod(method); - if (response != HttpURLConnection.HTTP_OK) + if(response != HttpURLConnection.HTTP_OK) httpResponseCodeErrorMapper.throwError(response, method.getStatusText()); DataInputStream input = new DataInputStream(new ByteArrayInputStream(method.getResponseBody())); List<Versioned<byte[]>> items = new ArrayList<Versioned<byte[]>>(); try { - while (true) { + while(true) { int size = input.readInt(); byte[] bytes = new byte[size]; input.read(bytes); @@ -96,17 +112,17 @@ public class HttpStore implements Store<byte[], byte[]> { byte[] data = ByteUtils.copy(bytes, clock.sizeInBytes(), bytes.length); items.add(new Versioned<byte[]>(data, clock)); } - } catch (EOFException e) { + } catch(EOFException e) { input.close(); } return items; - } catch (HttpException e) { + } catch(HttpException e) { throw new VoldemortException(e); - } catch (IOException e) { + } catch(IOException e) { throw new UnreachableStoreException("Could not connect to " + url + " for " + storeName, e); } finally { - if (method != null) + if(method != null) method.releaseConnection(); } } @@ -122,15 +138,15 @@ public class HttpStore implements Store<byte[], byte[]> { new String(Base64.encodeBase64(clock.toBytes()), "UTF-8")); method.setRequestEntity(new ByteArrayRequestEntity(versioned.getValue())); int response = httpClient.executeMethod(method); - if (response != HttpURLConnection.HTTP_OK) + if(response != HttpURLConnection.HTTP_OK) httpResponseCodeErrorMapper.throwError(response, method.getStatusText()); - } catch (HttpException e) { + } catch(HttpException e) { throw new VoldemortException(e); - } catch (IOException e) { + } catch(IOException e) { throw new UnreachableStoreException("Could not connect to " + url + " for " + storeName, e); } finally { - if (method != null) + if(method != null) method.releaseConnection(); } } src/java/voldemort/store/http/HttpStore.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.logging; import java.util.List; @@ -38,7 +54,7 @@ public class LoggingStore<K, V> extends DelegatingStore<K, V> { @Override public void close() throws VoldemortException { - if (logger.isDebugEnabled()) + if(logger.isDebugEnabled()) logger.debug("Closing " + getName() + "."); super.close(); } @@ -47,14 +63,14 @@ public class LoggingStore<K, V> extends DelegatingStore<K, V> { public boolean delete(K key, Version version) throws VoldemortException { long startTimeNs = 0; boolean succeeded = false; - if (logger.isDebugEnabled()) + if(logger.isDebugEnabled()) startTimeNs = time.getNanoseconds(); try { boolean deletedSomething = getInnerStore().delete(key, version); succeeded = true; return deletedSomething; } finally { - if (logger.isDebugEnabled()) { + if(logger.isDebugEnabled()) { double elapsedMs = (time.getNanoseconds() - startTimeNs) / (double) Time.NS_PER_MS; logger.debug("DELETE from store '" + getName() + "' completed " + (succeeded ? "successfully" : "unsuccessfully") + " in " + elapsedMs @@ -67,14 +83,14 @@ public class LoggingStore<K, V> extends DelegatingStore<K, V> { public List<Versioned<V>> get(K key) throws VoldemortException { long startTimeNs = 0; boolean succeeded = false; - if (logger.isDebugEnabled()) + if(logger.isDebugEnabled()) startTimeNs = time.getNanoseconds(); try { List<Versioned<V>> l = getInnerStore().get(key); succeeded = true; return l; } finally { - if (logger.isDebugEnabled()) { + if(logger.isDebugEnabled()) { double elapsedMs = (time.getNanoseconds() - startTimeNs) / (double) Time.NS_PER_MS; logger.debug("GET from store '" + getName() + "' completed " + (succeeded ? "successfully" : "unsuccessfully") + " in " + elapsedMs @@ -87,14 +103,14 @@ public class LoggingStore<K, V> extends DelegatingStore<K, V> { public void put(K key, Versioned<V> value) throws VoldemortException { long startTimeNs = 0; boolean succeeded = false; - if (logger.isDebugEnabled()) { + if(logger.isDebugEnabled()) { startTimeNs = time.getNanoseconds(); } try { getInnerStore().put(key, value); succeeded = true; } finally { - if (logger.isDebugEnabled()) { + if(logger.isDebugEnabled()) { double elapsedMs = (time.getNanoseconds() - startTimeNs) / (double) Time.NS_PER_MS; logger.debug("PUT from store '" + getName() + "' completed " + (succeeded ? "successfully" : "unsuccessfully") + " in " + elapsedMs src/java/voldemort/store/logging/LoggingStore.java @@ -1,5 +1,20 @@ -package voldemort.store.memory; +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package voldemort.store.memory; import java.util.List; import voldemort.store.KeyWrapper; @@ -11,6 +26,7 @@ import voldemort.versioning.Versioned; import com.google.common.base.ReferenceType; import com.google.common.collect.ReferenceMap; + /** * Identical to the InMemoryStorageConfiguration except that it creates google * collections ReferenceMap with Soft references on both keys and values. This src/java/voldemort/store/memory/CacheStorageConfiguration.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.memory; import java.util.List; src/java/voldemort/store/memory/InMemoryStorageConfiguration.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.memory; import java.util.ArrayList; src/java/voldemort/store/memory/InMemoryStorageEngine.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.metadata; import java.io.StringReader; @@ -87,7 +103,7 @@ public class MetadataStore implements StorageEngine<byte[], byte[]> { public List<Versioned<byte[]>> get(byte[] key) throws VoldemortException { List<Versioned<byte[]>> values = Lists.newArrayList(); - for(Versioned<String> versioned : innerStore.get(ByteUtils.getString(key, "UTF-8"))) + for(Versioned<String> versioned: innerStore.get(ByteUtils.getString(key, "UTF-8"))) values.add(new Versioned<byte[]>(ByteUtils.getBytes(versioned.getValue(), "UTF-8"), versioned.getVersion())); return values; src/java/voldemort/store/metadata/MetadataStore.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.mysql; import javax.sql.DataSource; src/java/voldemort/store/mysql/MysqlStorageConfiguration.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.mysql; import java.sql.Connection; @@ -60,7 +76,7 @@ public class MysqlStorageEngine implements StorageEngine<byte[], byte[]> { conn = datasource.getConnection(); stmt = conn.prepareStatement(query); stmt.executeUpdate(); - } catch (SQLException e) { + } catch(SQLException e) { throw new PersistenceFailureException("Fix me!", e); } finally { tryClose(stmt); @@ -78,7 +94,7 @@ public class MysqlStorageEngine implements StorageEngine<byte[], byte[]> { stmt = conn.prepareStatement(select); rs = stmt.executeQuery(); return new MysqlClosableIterator(conn, stmt, rs); - } catch (SQLException e) { + } catch(SQLException e) { throw new PersistenceFailureException("Fix me!", e); } } @@ -100,17 +116,17 @@ public class MysqlStorageEngine implements StorageEngine<byte[], byte[]> { selectStmt.setBytes(1, key); rs = selectStmt.executeQuery(); boolean deletedSomething = false; - while (rs.next()) { + while(rs.next()) { byte[] theKey = rs.getBytes("key_"); byte[] version = rs.getBytes("version_"); - if (new VectorClock(version).compare(maxVersion) == Occured.BEFORE) { + if(new VectorClock(version).compare(maxVersion) == Occured.BEFORE) { delete(conn, theKey, version); deletedSomething = true; } } return deletedSomething; - } catch (SQLException e) { + } catch(SQLException e) { throw new PersistenceFailureException("Fix me!", e); } finally { tryClose(rs); @@ -145,14 +161,14 @@ public class MysqlStorageEngine implements StorageEngine<byte[], byte[]> { stmt.setBytes(1, key); rs = stmt.executeQuery(); List<Versioned<byte[]>> found = Lists.newArrayList(); - while (rs.next()) { + while(rs.next()) { byte[] version = rs.getBytes("version_"); byte[] value = rs.getBytes("value_"); found.add(new Versioned<byte[]>(value, new VectorClock(version))); } return found; - } catch (SQLException e) { + } catch(SQLException e) { throw new PersistenceFailureException("Fix me!", e); } finally { tryClose(rs); @@ -182,16 +198,16 @@ public class MysqlStorageEngine implements StorageEngine<byte[], byte[]> { select = conn.prepareStatement(selectSql); select.setBytes(1, key); results = select.executeQuery(); - while (results.next()) { + while(results.next()) { byte[] thisKey = results.getBytes("key_"); VectorClock version = new VectorClock(results.getBytes("version_")); Occured occured = value.getVersion().compare(version); - if (occured == Occured.BEFORE) + if(occured == Occured.BEFORE) throw new ObsoleteVersionException("Attempt to put version " + value.getVersion() + " which is superceeded by " + version + "."); - else if (occured == Occured.AFTER) + else if(occured == Occured.AFTER) delete(conn, thisKey, version.toBytes()); } @@ -202,21 +218,21 @@ public class MysqlStorageEngine implements StorageEngine<byte[], byte[]> { insert.setBytes(2, clock.toBytes()); insert.setBytes(3, value.getValue()); insert.executeUpdate(); - } catch (SQLException e) { - if (e.getErrorCode() == MYSQL_ERR_DUP_KEY || e.getErrorCode() == MYSQL_ERR_DUP_ENTRY) { + } catch(SQLException e) { + if(e.getErrorCode() == MYSQL_ERR_DUP_KEY || e.getErrorCode() == MYSQL_ERR_DUP_ENTRY) { e.printStackTrace(); throw new ObsoleteVersionException("Key or value already used."); } else { throw new PersistenceFailureException("Fix me!", e); } } finally { - if (conn != null) { + if(conn != null) { try { - if (doCommit) + if(doCommit) conn.commit(); else conn.rollback(); - } catch (SQLException e) {} + } catch(SQLException e) {} } tryClose(results); tryClose(insert); @@ -227,27 +243,27 @@ public class MysqlStorageEngine implements StorageEngine<byte[], byte[]> { private void tryClose(ResultSet rs) { try { - if (rs != null) + if(rs != null) rs.close(); - } catch (Exception e) { + } catch(Exception e) { logger.error("Failed to close resultset.", e); } } private void tryClose(Connection c) { try { - if (c != null) + if(c != null) c.close(); - } catch (Exception e) { + } catch(Exception e) { logger.error("Failed to close connection.", e); } } private void tryClose(PreparedStatement s) { try { - if (s != null) + if(s != null) s.close(); - } catch (Exception e) { + } catch(Exception e) { logger.error("Failed to close prepared statement.", e); } } @@ -266,7 +282,7 @@ public class MysqlStorageEngine implements StorageEngine<byte[], byte[]> { try { // Move to the first item this.hasMore = resultSet.next(); - } catch (SQLException e) { + } catch(SQLException e) { throw new PersistenceFailureException(e); } this.rs = resultSet; @@ -286,7 +302,7 @@ public class MysqlStorageEngine implements StorageEngine<byte[], byte[]> { public Entry<byte[], Versioned<byte[]>> next() { try { - if (!this.hasMore) + if(!this.hasMore) throw new PersistenceFailureException("Next called on iterator, but no more items available!"); byte[] key = rs.getBytes("key_"); byte[] value = rs.getBytes("value_"); @@ -294,7 +310,7 @@ public class MysqlStorageEngine implements StorageEngine<byte[], byte[]> { this.hasMore = rs.next(); return new Entry<byte[], Versioned<byte[]>>(key, new Versioned<byte[]>(value, clock)); - } catch (SQLException e) { + } catch(SQLException e) { throw new PersistenceFailureException(e); } } @@ -302,7 +318,7 @@ public class MysqlStorageEngine implements StorageEngine<byte[], byte[]> { public void remove() { try { rs.deleteRow(); - } catch (SQLException e) { + } catch(SQLException e) { throw new PersistenceFailureException(e); } } src/java/voldemort/store/mysql/MysqlStorageEngine.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.readonly; import java.io.BufferedInputStream; src/java/voldemort/store/readonly/ExternalSorter.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.readonly; import java.io.BufferedOutputStream; src/java/voldemort/store/readonly/JsonStoreBuilder.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.readonly; import java.io.File; src/java/voldemort/store/readonly/RandomAccessFileStorageConfiguration.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.readonly; import java.io.File; src/java/voldemort/store/readonly/RandomAccessFileStore.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.readonly; import java.io.BufferedReader; src/java/voldemort/store/readonly/StringSorter.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.routed; import java.io.Serializable; @@ -63,11 +79,11 @@ final class NodeValue<K, V> implements Serializable, Cloneable { @Override public boolean equals(Object o) { - if (o == this) + if(o == this) return true; - if (!(o instanceof NodeValue)) + if(!(o instanceof NodeValue)) return false; - if (o == null) + if(o == null) return false; NodeValue<?, ?> v = (NodeValue<?, ?>) o; src/java/voldemort/store/routed/NodeValue.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.routed; import java.util.ArrayList; @@ -33,7 +49,7 @@ public class ReadRepairer<K, V> { */ public List<NodeValue<K, V>> getRepairs(List<NodeValue<K, V>> nodeValues) { int size = nodeValues.size(); - if (size <= 1) + if(size <= 1) return Collections.emptyList(); // A list of obsolete nodes that need to be repaired @@ -46,31 +62,31 @@ public class ReadRepairer<K, V> { concurrents.put(nodeValues.get(0).getVersion(), nodeValues.get(0)); // check each value against the current set of most current versions - for (int i = 1; i < nodeValues.size(); i++) { + for(int i = 1; i < nodeValues.size(); i++) { NodeValue<K, V> curr = nodeValues.get(i); boolean concurrentToAll = true; Set<Version> versions = new HashSet<Version>(concurrents.keySet()); - for (Version concurrentVersion : versions) { + for(Version concurrentVersion: versions) { // if we already have the version, just add the nodevalue for // future updating and move on - if (curr.getVersion().equals(concurrentVersion)) { + if(curr.getVersion().equals(concurrentVersion)) { concurrents.put(curr.getVersion(), curr); break; } // Check the ordering of the current value Occured occured = curr.getVersion().compare(concurrentVersion); - if (occured == Occured.BEFORE) { + if(occured == Occured.BEFORE) { // This value is obsolete! Stop checking against other // values... obsolete.add(curr.getNodeId()); concurrentToAll = false; break; - } else if (occured == Occured.AFTER) { + } else if(occured == Occured.AFTER) { // This concurrent value is obsolete and the current value // should replace it - for (NodeValue<K, V> v : concurrents.get(concurrentVersion)) + for(NodeValue<K, V> v: concurrents.get(concurrentVersion)) obsolete.add(v.getNodeId()); concurrents.removeAll(concurrentVersion); concurrentToAll = false; @@ -79,15 +95,15 @@ public class ReadRepairer<K, V> { } // if the value is concurrent to all existing versions then add it // to the concurrent set - if (concurrentToAll) + if(concurrentToAll) concurrents.put(curr.getVersion(), curr); } // Construct the list of repairs List<NodeValue<K, V>> repairs = new ArrayList<NodeValue<K, V>>(3); - for (Integer id : obsolete) { + for(Integer id: obsolete) { // repair all obsolete nodes - for (Version v : concurrents.keys()) { + for(Version v: concurrents.keys()) { Iterator<NodeValue<K, V>> it = concurrents.get(v).iterator(); NodeValue<K, V> concurrent = it.next(); NodeValue<K, V> repair = new NodeValue<K, V>(id, @@ -97,20 +113,20 @@ public class ReadRepairer<K, V> { } } - if (concurrents.size() > 1) { + if(concurrents.size() > 1) { // if there are more then one concurrent versions on different // nodes, // we should repair so all have the same set of values HashSet<NodeValue<K, V>> existing = new HashSet<NodeValue<K, V>>(); - for (NodeValue<K, V> value : repairs) + for(NodeValue<K, V> value: repairs) existing.add(value); - for (NodeValue<K, V> entry1 : concurrents.values()) { - for (NodeValue<K, V> entry2 : concurrents.values()) { - if (!entry1.getVersion().equals(entry2.getVersion())) { + for(NodeValue<K, V> entry1: concurrents.values()) { + for(NodeValue<K, V> entry2: concurrents.values()) { + if(!entry1.getVersion().equals(entry2.getVersion())) { NodeValue<K, V> repair = new NodeValue<K, V>(entry1.getNodeId(), entry2.getKey(), entry2.getVersioned()); - if (!existing.contains(repair)) + if(!existing.contains(repair)) repairs.add(repair); } } src/java/voldemort/store/routed/ReadRepairer.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.routed; import java.util.ArrayList; @@ -172,7 +188,7 @@ public class RoutedStore implements Store<byte[], byte[]> { // semaphore.acquire(n) waits for n operations to complete final Semaphore semaphore = new Semaphore(0, false); // Add the operations to the pool - for(final Node node : nodes) { + for(final Node node: nodes) { this.executor.execute(new Runnable() { public void run() { @@ -261,20 +277,20 @@ public class RoutedStore implements Store<byte[], byte[]> { final Node node = nodes.get(nodeIndex); System.out.println("Querying node:" + node.getId() + " key:" + key); if(isAvailable(node)) { - System.out.println("Available node:" + node.getId() + " key:" + key); + System.out.println("Available node:" + node.getId() + " key:" + key); this.executor.execute(new Runnable() { public void run() { try { - for (Store store: innerStores.values()) - { - logger.info("storeID: " + store.getName() + " Class:" + store.getClass().toString()); - } + for(Store store: innerStores.values()) { + logger.info("storeID: " + store.getName() + " Class:" + + store.getClass().toString()); + } List<Versioned<byte[]>> fetched = innerStores.get(node.getId()) .get(key); retrieved.addAll(fetched); if(repairReads) { - for(Versioned<byte[]> f : fetched) + for(Versioned<byte[]> f: fetched) nodeValues.add(new NodeValue<byte[], byte[]>(node.getId(), key, f)); @@ -328,7 +344,7 @@ public class RoutedStore implements Store<byte[], byte[]> { this.executor.execute(new Runnable() { public void run() { - for(NodeValue<byte[], byte[]> v : readRepairer.getRepairs(nodeValues)) { + for(NodeValue<byte[], byte[]> v: readRepairer.getRepairs(nodeValues)) { try { logger.debug("Doing read repair on node " + v.getNodeId() + " for key '" + v.getKey() + "' with version " @@ -503,7 +519,7 @@ public class RoutedStore implements Store<byte[], byte[]> { this.executor.shutdownNow(); } VoldemortException exception = null; - for(Store<byte[], byte[]> client : innerStores.values()) { + for(Store<byte[], byte[]> client: innerStores.values()) { try { client.close(); } catch(VoldemortException v) { src/java/voldemort/store/routed/RoutedStore.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.serialized; import voldemort.serialization.Serializer; src/java/voldemort/store/serialized/SerializingStorageEngine.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.serialized; import java.util.ArrayList; @@ -41,7 +57,7 @@ public class SerializingStore<K, V> implements Store<K, V> { public List<Versioned<V>> get(K key) throws VoldemortException { List<Versioned<byte[]>> found = store.get(keySerializer.toBytes(key)); List<Versioned<V>> results = new ArrayList<Versioned<V>>(found.size()); - for (Versioned<byte[]> versioned : found) + for(Versioned<byte[]> versioned: found) results.add(new Versioned<V>(valueSerializer.toObject(versioned.getValue()), (VectorClock) versioned.getVersion())); return results; src/java/voldemort/store/serialized/SerializingStore.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.slop; import java.util.Arrays; @@ -86,9 +102,9 @@ public class Slop { @Override public boolean equals(Object obj) { - if (obj == null) + if(obj == null) return false; - else if (!obj.getClass().equals(Slop.class)) + else if(!obj.getClass().equals(Slop.class)) return false; Slop slop = (Slop) obj; src/java/voldemort/store/slop/Slop.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.slop; import java.util.Date; src/java/voldemort/store/slop/SlopDetectingStore.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.slop; import java.util.ArrayList; @@ -14,6 +30,8 @@ import voldemort.store.UnreachableStoreException; import voldemort.versioning.Version; import voldemort.versioning.Versioned; +; + /** * A Sloppy store is a store wrapper that delegates to an inner store, and if * that store fails, instead stores some slop in the first of a list of backup @@ -68,15 +86,15 @@ public class SloppyStore extends DelegatingStore<byte[], byte[]> { StoreUtils.assertValidKey(key); try { return getInnerStore().delete(key, version); - } catch (UnreachableStoreException e) { + } catch(UnreachableStoreException e) { List<Exception> failures = new ArrayList<Exception>(); failures.add(e); Slop slop = new Slop(getName(), Slop.Operation.DELETE, key, null, node, new Date()); - for (Store<byte[], Slop> slopStore : backupStores) { + for(Store<byte[], Slop> slopStore: backupStores) { try { slopStore.put(slop.makeKey(), new Versioned<Slop>(slop, version)); return false; - } catch (UnreachableStoreException u) { + } catch(UnreachableStoreException u) { failures.add(u); } } @@ -96,7 +114,7 @@ public class SloppyStore extends DelegatingStore<byte[], byte[]> { StoreUtils.assertValidKey(key); try { getInnerStore().put(key, value); - } catch (UnreachableStoreException e) { + } catch(UnreachableStoreException e) { List<Exception> failures = new ArrayList<Exception>(); failures.add(e); boolean persisted = false; @@ -106,16 +124,16 @@ public class SloppyStore extends DelegatingStore<byte[], byte[]> { value.getValue(), node, new Date()); - for (Store<byte[], Slop> slopStore : backupStores) { + for(Store<byte[], Slop> slopStore: backupStores) { try { slopStore.put(slop.makeKey(), new Versioned<Slop>(slop, value.getVersion())); persisted = true; break; - } catch (UnreachableStoreException u) { + } catch(UnreachableStoreException u) { failures.add(u); } } - if (persisted) + if(persisted) throw new UnreachableStoreException("Put operation failed on node " + node + ", but has been persisted to slop storage for eventual replication.", src/java/voldemort/store/slop/SloppyStore.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.socket; import java.io.BufferedInputStream; src/java/voldemort/store/socket/SocketAndStreams.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.socket; import com.google.common.base.Objects; @@ -28,10 +44,10 @@ public class SocketDestination { @Override public boolean equals(Object obj) { - if (obj == this) + if(obj == this) return true; - if (obj == null || !obj.getClass().equals(SocketDestination.class)) + if(obj == null || !obj.getClass().equals(SocketDestination.class)) return false; SocketDestination d = (SocketDestination) obj; src/java/voldemort/store/socket/SocketDestination.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.socket; import org.apache.commons.pool.KeyedObjectPool; @@ -38,7 +54,7 @@ public class SocketPool { public SocketAndStreams checkout(SocketDestination destination) { try { return (SocketAndStreams) pool.borrowObject(destination); - } catch (Exception e) { + } catch(Exception e) { throw new UnreachableStoreException("Failure while checking out socket for " + destination + ": ", e); } @@ -47,10 +63,10 @@ public class SocketPool { public void checkin(SocketDestination destination, SocketAndStreams socket) { try { pool.returnObject(destination, socket); - } catch (Exception e) { + } catch(Exception e) { try { pool.invalidateObject(destination, socket); - } catch (Exception e2) { + } catch(Exception e2) { logger.error("Error while destroying socket:", e2); } throw new UnreachableStoreException("Failure while checking out socket for " @@ -62,7 +78,7 @@ public class SocketPool { try { pool.clear(); pool.close(); - } catch (Exception e) { + } catch(Exception e) { throw new VoldemortException(e); } } src/java/voldemort/store/socket/SocketPool.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.socket; import java.net.InetSocketAddress; @@ -40,7 +56,7 @@ public class SocketPoolableObjectFactory implements KeyedPoolableObjectFactory { SocketAndStreams sands = (SocketAndStreams) value; sands.getSocket().close(); int numDestroyed = destroyed.incrementAndGet(); - if (logger.isDebugEnabled()) + if(logger.isDebugEnabled()) logger.debug("Destroyed socket " + numDestroyed + " connection to " + dest.getHost() + ":" + dest.getPort()); } @@ -54,7 +70,7 @@ public class SocketPoolableObjectFactory implements KeyedPoolableObjectFactory { s.setSoTimeout(timeoutMs); s.connect(new InetSocketAddress(dest.getHost(), dest.getPort())); int numCreated = created.incrementAndGet(); - if (logger.isDebugEnabled()) + if(logger.isDebugEnabled()) logger.debug("Created socket " + numCreated + " for " + dest.getHost() + ":" + dest.getPort()); return new SocketAndStreams(s); src/java/voldemort/store/socket/SocketPoolableObjectFactory.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.socket; import java.io.DataInputStream; @@ -63,7 +79,7 @@ public class SocketStore implements Store<byte[], byte[]> { DataInputStream inputStream = sands.getInputStream(); checkException(inputStream); return inputStream.readBoolean(); - } catch (IOException e) { + } catch(IOException e) { close(sands.getSocket()); throw new VoldemortException(e); } finally { @@ -85,7 +101,7 @@ public class SocketStore implements Store<byte[], byte[]> { checkException(inputStream); int resultSize = inputStream.readInt(); List<Versioned<byte[]>> results = new ArrayList<Versioned<byte[]>>(resultSize); - for (int i = 0; i < resultSize; i++) { + for(int i = 0; i < resultSize; i++) { int valueSize = inputStream.readInt(); byte[] bytes = new byte[valueSize]; ByteUtils.read(inputStream, bytes); @@ -95,7 +111,7 @@ public class SocketStore implements Store<byte[], byte[]> { bytes.length), clock)); } return results; - } catch (IOException e) { + } catch(IOException e) { close(sands.getSocket()); throw new VoldemortException(e); } finally { @@ -119,7 +135,7 @@ public class SocketStore implements Store<byte[], byte[]> { outputStream.flush(); DataInputStream inputStream = sands.getInputStream(); checkException(inputStream); - } catch (IOException e) { + } catch(IOException e) { close(sands.getSocket()); throw new VoldemortException(e); } finally { @@ -133,7 +149,7 @@ public class SocketStore implements Store<byte[], byte[]> { private void checkException(DataInputStream inputStream) throws IOException { short retCode = inputStream.readShort(); - if (retCode != 0) { + if(retCode != 0) { String error = inputStream.readUTF(); throw errorCodeMapper.getError(retCode, error); } @@ -142,7 +158,7 @@ public class SocketStore implements Store<byte[], byte[]> { private void close(Socket socket) { try { socket.close(); - } catch (IOException e) { + } catch(IOException e) { logger.warn("Failed to close socket"); } } src/java/voldemort/store/socket/SocketStore.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.stats; import java.util.List; @@ -42,7 +58,7 @@ public class StatTrackingStore<K, V> extends DelegatingStore<K, V> { long start = System.nanoTime(); try { return super.delete(key, version); - } catch (VoldemortException e) { + } catch(VoldemortException e) { exceptionsThrown++; throw e; } finally { @@ -57,7 +73,7 @@ public class StatTrackingStore<K, V> extends DelegatingStore<K, V> { long start = System.nanoTime(); try { return super.get(key); - } catch (VoldemortException e) { + } catch(VoldemortException e) { exceptionsThrown++; throw e; } finally { @@ -72,7 +88,7 @@ public class StatTrackingStore<K, V> extends DelegatingStore<K, V> { long start = System.nanoTime(); try { super.put(key, value); - } catch (VoldemortException e) { + } catch(VoldemortException e) { exceptionsThrown++; throw e; } finally { src/java/voldemort/store/stats/StatTrackingStore.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.versioned; import java.util.List; src/java/voldemort/store/versioned/InconsistencyResolvingStore.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.versioned; import voldemort.VoldemortException; src/java/voldemort/store/versioned/VersionIncrementingStore.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.utils; import java.io.DataInputStream; @@ -45,7 +61,7 @@ public class ByteUtils { try { MD5_PROTOTYPE = MessageDigest.getInstance("MD5"); SHA1_PROTOTYPE = MessageDigest.getInstance("SHA-1"); - } catch (NoSuchAlgorithmException e) { + } catch(NoSuchAlgorithmException e) { throw new IllegalStateException("Could not initialize digest prototypes.", e); } } @@ -58,8 +74,8 @@ public class ByteUtils { */ public static String toHexString(byte[] bytes) { StringBuffer buffer = new StringBuffer(); - for (byte b : bytes) { - if (Math.abs(b) < 16) + for(byte b: bytes) { + if(Math.abs(b) < 16) buffer.append('0'); String hex = Integer.toHexString(b); buffer.append(hex.substring(Math.max(0, hex.length() - 2))); @@ -75,9 +91,9 @@ public class ByteUtils { */ public static String toBinaryString(byte[] bytes) { StringBuffer buffer = new StringBuffer(); - for (byte b : bytes) { + for(byte b: bytes) { String bin = Integer.toBinaryString(b); - for (int i = 0; i < 8 - bin.length(); i++) + for(int i = 0; i < 8 - bin.length(); i++) buffer.append('0'); buffer.append(bin.substring(Math.max(0, bin.length() - 8))); } @@ -93,13 +109,13 @@ public class ByteUtils { */ public static byte[] cat(byte[]... arrays) { int size = 0; - for (byte[] a : arrays) - if (a != null) + for(byte[] a: arrays) + if(a != null) size += a.length; byte[] cated = new byte[size]; int pos = 0; - for (byte[] a : arrays) { - if (a != null) { + for(byte[] a: arrays) { + if(a != null) { System.arraycopy(a, 0, cated, pos, a.length); pos += a.length; } @@ -117,7 +133,7 @@ public class ByteUtils { * @return A new byte[] containing the copied bytes */ public static byte[] copy(byte[] array, int from, int to) { - if (to - from < 0) { + if(to - from < 0) { return new byte[0]; } else { byte[] a = new byte[to - from]; @@ -177,7 +193,7 @@ public class ByteUtils { public static long readBytes(byte[] bytes, int offset, int numBytes) { int shift = 0; long value = 0; - for (int i = offset + numBytes - 1; i >= offset; i--) { + for(int i = offset + numBytes - 1; i >= offset; i--) { value |= (bytes[i] & 0xFFL) << shift; shift += 8; } @@ -238,7 +254,7 @@ public class ByteUtils { */ public static void writeBytes(byte[] bytes, long value, int offset, int numBytes) { int shift = 0; - for (int i = offset + numBytes - 1; i >= offset; i--) { + for(int i = offset + numBytes - 1; i >= offset; i--) { bytes[i] = (byte) (0xFF & (value >> shift)); shift += 8; } @@ -251,36 +267,36 @@ public class ByteUtils { * @return The required number of bytes (must be 8 or less) */ public static byte numberOfBytesRequired(long number) { - if (number < 0) + if(number < 0) number = -number; - for (byte i = 1; i <= SIZE_OF_LONG; i++) - if (number < (1L << (8 * i))) + for(byte i = 1; i <= SIZE_OF_LONG; i++) + if(number < (1L << (8 * i))) return i; throw new IllegalStateException("Should never happen."); } public static long readVarNumber(DataInputStream input) throws IOException { int b = 0xFF & input.readByte(); - if ((b & MASK_10000000) == 0) { + if((b & MASK_10000000) == 0) { // one byte value, mask off the size bit and return return MASK_01111111 & b; - } else if ((b & MASK_11000000) == MASK_10000000) { + } else if((b & MASK_11000000) == MASK_10000000) { // two byte value, mask off first two bits long val = (b & MASK_00111111) << Byte.SIZE; val |= 0xFF & input.readByte(); return val; - } else if ((b & MASK_11100000) == MASK_11000000) { + } else if((b & MASK_11100000) == MASK_11000000) { // four byte value, mask off three bits long val = (b & MASK_00011111); - for (int i = 0; i < 3; i++) { + for(int i = 0; i < 3; i++) { val <<= Byte.SIZE; val |= 0xFF & input.readByte(); } return val; - } else if ((b & MASK_11100000) == MASK_11100000) { + } else if((b & MASK_11100000) == MASK_11100000) { // eight byte value, mask off three bits long val = (b & MASK_00011111); - for (int i = 0; i < 7; i++) { + for(int i = 0; i < 7; i++) { val <<= Byte.SIZE; val |= 0xFF & input.readByte(); } @@ -299,23 +315,23 @@ public class ByteUtils { public static void writeVarNumber(long value, DataOutputStream output) throws IOException { int size; int signMask = Long.signum(value) << 8; - if (value < 1 << 6) { + if(value < 1 << 6) { size = 1; output.write(signMask | (byte) value); - } else if (value < 1 << 13) { + } else if(value < 1 << 13) { size = 2; output.write(signMask | MASK_10000000 | readNthByte(value, 1)); - } else if (value < 1 << 28) { + } else if(value < 1 << 28) { size = 4; output.write(signMask | MASK_11000000 | readNthByte(value, 3)); - } else if (value < 1L << 60) { + } else if(value < 1L << 60) { size = 8; output.write(signMask | MASK_11100000 | readNthByte(value, 7)); } else { throw new IllegalArgumentException(value + " is larger than maximum allowable"); } // write all but first byte - for (int i = size - 2; i >= 0; i--) + for(int i = size - 2; i >= 0; i--) output.write(readNthByte(value, i)); } @@ -338,9 +354,9 @@ public class ByteUtils { */ public static void read(InputStream stream, byte[] buffer) throws IOException { int read = 0; - while (read < buffer.length) { + while(read < buffer.length) { int newlyRead = stream.read(buffer, read, buffer.length - read); - if (newlyRead == -1) + if(newlyRead == -1) throw new EOFException("Attempt to read " + buffer.length + " bytes failed due to EOF."); read += newlyRead; @@ -357,7 +373,7 @@ public class ByteUtils { public static byte[] getBytes(String string, String encoding) { try { return string.getBytes(encoding); - } catch (UnsupportedEncodingException e) { + } catch(UnsupportedEncodingException e) { throw new IllegalArgumentException(encoding + " is not a known encoding name."); } } @@ -372,7 +388,7 @@ public class ByteUtils { public static String getString(byte[] bytes, String encoding) { try { return new String(bytes, encoding); - } catch (UnsupportedEncodingException e) { + } catch(UnsupportedEncodingException e) { throw new IllegalArgumentException(encoding + " is not a known encoding name."); } } @@ -388,7 +404,7 @@ public class ByteUtils { try { MessageDigest digest = (MessageDigest) MD5_PROTOTYPE.clone(); return digest.digest(input); - } catch (CloneNotSupportedException e) { + } catch(CloneNotSupportedException e) { throw new IllegalStateException(e); } } @@ -404,7 +420,7 @@ public class ByteUtils { try { MessageDigest digest = (MessageDigest) SHA1_PROTOTYPE.clone(); return digest.digest(input); - } catch (CloneNotSupportedException e) { + } catch(CloneNotSupportedException e) { throw new IllegalStateException(e); } } @@ -420,14 +436,14 @@ public class ByteUtils { */ public static int compare(byte[] b1, byte[] b2) { int larger = Math.max(b1.length, b2.length); - for (int i = 0; i < larger; i++) { - if (i >= b1.length) + for(int i = 0; i < larger; i++) { + if(i >= b1.length) return -1; - else if (i >= b2.length) + else if(i >= b2.length) return 1; - else if (b1[i] < b2[i]) + else if(b1[i] < b2[i]) return -1; - else if (b1[i] > b2[i]) + else if(b1[i] > b2[i]) return 1; } src/java/voldemort/utils/ByteUtils.java @@ -1,19 +1,35 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.utils; import java.util.Iterator; -/** +/** * An iterator that must be closed after use * * @author jay - * + * * @param <T> The type being iterated over */ public interface ClosableIterator<T> extends Iterator<T> { - - /** - * Close the iterator - */ - public void close(); + + /** + * Close the iterator + */ + public void close(); } src/java/voldemort/utils/ClosableIterator.java @@ -1,16 +1,31 @@ -package voldemort.utils; +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package voldemort.utils; public class ConfigurationException extends RuntimeException { - final static long serialVersionUID = 1; + final static long serialVersionUID = 1; - public ConfigurationException(String message){ - super(message); - } + public ConfigurationException(String message) { + super(message); + } - public ConfigurationException(Exception cause){ - super(cause); - } + public ConfigurationException(Exception cause) { + super(cause); + } } src/java/voldemort/utils/ConfigurationException.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.utils; /** src/java/voldemort/utils/ConstantHashFunction.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.utils; import java.util.Iterator; src/java/voldemort/utils/DefaultIterable.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.utils; /** @@ -16,7 +32,7 @@ public class FnvHashFunction implements HashFunction { public int hash(byte[] key) { long hash = FNV_BASIS; - for (int i = 0; i < key.length; i++) { + for(int i = 0; i < key.length; i++) { hash ^= 0xFF & key[i]; hash *= FNV_PRIME; } @@ -25,19 +41,19 @@ public class FnvHashFunction implements HashFunction { } public static void main(String[] args) { - if (args.length != 2) + if(args.length != 2) Utils.croak("USAGE: java FnvHashFunction iterations buckets"); int numIterations = Integer.parseInt(args[0]); int numBuckets = Integer.parseInt(args[1]); int[] buckets = new int[numBuckets]; HashFunction hash = new FnvHashFunction(); - for (int i = 0; i < numIterations; i++) { + for(int i = 0; i < numIterations; i++) { int val = hash.hash(Integer.toString(i).getBytes()); buckets[Math.abs(val) % numBuckets] += 1; } double expected = numIterations / (double) numBuckets; - for (int i = 0; i < numBuckets; i++) + for(int i = 0; i < numBuckets; i++) System.out.println(i + " " + buckets[i] + " " + (buckets[i] / expected)); } src/java/voldemort/utils/FnvHashFunction.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.utils; /** src/java/voldemort/utils/HashFunction.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.utils; import java.lang.annotation.Annotation; @@ -72,11 +88,11 @@ public class JmxUtils { mbean.setManagedResource(o, "ObjectReference"); return mbean; - } catch (MBeanException e) { + } catch(MBeanException e) { throw new VoldemortException(e); - } catch (InvalidTargetObjectTypeException e) { + } catch(InvalidTargetObjectTypeException e) { throw new VoldemortException(e); - } catch (InstanceNotFoundException e) { + } catch(InstanceNotFoundException e) { throw new VoldemortException(e); } } @@ -91,22 +107,22 @@ public class JmxUtils { */ public static ModelMBeanOperationInfo[] extractOperationInfo(Object object) { ArrayList<ModelMBeanOperationInfo> infos = new ArrayList<ModelMBeanOperationInfo>(); - for (Method m : object.getClass().getMethods()) { + for(Method m: object.getClass().getMethods()) { JmxOperation jmxOperation = m.getAnnotation(JmxOperation.class); JmxGetter jmxGetter = m.getAnnotation(JmxGetter.class); JmxSetter jmxSetter = m.getAnnotation(JmxSetter.class); - if (jmxOperation != null || jmxGetter != null || jmxSetter != null) { + if(jmxOperation != null || jmxGetter != null || jmxSetter != null) { String description = ""; int visibility = 1; int impact = ModelMBeanOperationInfo.UNKNOWN; - if (jmxOperation != null) { + if(jmxOperation != null) { description = jmxOperation.description(); impact = jmxOperation.impact(); - } else if (jmxGetter != null) { + } else if(jmxGetter != null) { description = jmxGetter.description(); impact = ModelMBeanOperationInfo.INFO; visibility = 4; - } else if (jmxSetter != null) { + } else if(jmxSetter != null) { description = jmxSetter.description(); impact = ModelMBeanOperationInfo.ACTION; visibility = 4; @@ -138,14 +154,14 @@ public class JmxUtils { Map<String, Method> getters = new HashMap<String, Method>(); Map<String, Method> setters = new HashMap<String, Method>(); Map<String, String> descriptions = new HashMap<String, String>(); - for (Method m : object.getClass().getMethods()) { + for(Method m: object.getClass().getMethods()) { JmxGetter getter = m.getAnnotation(JmxGetter.class); - if (getter != null) { + if(getter != null) { getters.put(getter.name(), m); descriptions.put(getter.name(), getter.description()); } JmxSetter setter = m.getAnnotation(JmxSetter.class); - if (setter != null) { + if(setter != null) { setters.put(setter.name(), m); descriptions.put(setter.name(), setter.description()); } @@ -154,7 +170,7 @@ public class JmxUtils { Set<String> attributes = new HashSet<String>(getters.keySet()); attributes.addAll(setters.keySet()); List<ModelMBeanAttributeInfo> infos = new ArrayList<ModelMBeanAttributeInfo>(); - for (String name : attributes) { + for(String name: attributes) { try { Method getter = getters.get(name); Method setter = setters.get(name); @@ -163,13 +179,13 @@ public class JmxUtils { getter, setter); Descriptor descriptor = info.getDescriptor(); - if (getter != null) + if(getter != null) descriptor.setField("getMethod", getter.getName()); - if (setter != null) + if(setter != null) descriptor.setField("setMethod", setter.getName()); info.setDescriptor(descriptor); infos.add(info); - } catch (IntrospectionException e) { + } catch(IntrospectionException e) { throw new VoldemortException(e); } } @@ -188,10 +204,10 @@ public class JmxUtils { Class<?>[] types = m.getParameterTypes(); Annotation[][] annotations = m.getParameterAnnotations(); MBeanParameterInfo[] params = new MBeanParameterInfo[types.length]; - for (int i = 0; i < params.length; i++) { + for(int i = 0; i < params.length; i++) { boolean hasAnnotation = false; - for (int j = 0; j < annotations[i].length; j++) { - if (annotations[i][j] instanceof JmxParam) { + for(int j = 0; j < annotations[i].length; j++) { + if(annotations[i][j] instanceof JmxParam) { JmxParam param = (JmxParam) annotations[i][j]; params[i] = new MBeanParameterInfo(param.name(), types[i].getName(), @@ -200,7 +216,7 @@ public class JmxUtils { break; } } - if (!hasAnnotation) { + if(!hasAnnotation) { params[i] = new MBeanParameterInfo("", types[i].getName(), ""); } } @@ -218,7 +234,7 @@ public class JmxUtils { public static ObjectName createObjectName(String domain, String type) { try { return new ObjectName(domain + ":type=" + type); - } catch (MalformedObjectNameException e) { + } catch(MalformedObjectNameException e) { throw new VoldemortException(e); } } @@ -265,11 +281,11 @@ public class JmxUtils { public static void registerMbean(MBeanServer server, ModelMBean mbean, ObjectName name) { try { server.registerMBean(mbean, name); - } catch (InstanceAlreadyExistsException e) { + } catch(InstanceAlreadyExistsException e) { throw new VoldemortException(e); - } catch (MBeanRegistrationException e) { + } catch(MBeanRegistrationException e) { throw new VoldemortException(e); - } catch (NotCompliantMBeanException e) { + } catch(NotCompliantMBeanException e) { throw new VoldemortException(e); } } @@ -283,9 +299,9 @@ public class JmxUtils { public static void unregisterMbean(MBeanServer server, ObjectName name) { try { server.unregisterMBean(name); - } catch (InstanceNotFoundException e) { + } catch(InstanceNotFoundException e) { throw new VoldemortException(e); - } catch (MBeanRegistrationException e) { + } catch(MBeanRegistrationException e) { throw new VoldemortException(e); } } src/java/voldemort/utils/JmxUtils.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.utils; import java.io.BufferedInputStream; @@ -32,11 +48,11 @@ public class Props implements Map<String, String> { public Props(File... files) throws FileNotFoundException, IOException { this.props = new HashMap<String, String>(); - for (int i = files.length - 1; i >= 0; i--) { + for(int i = files.length - 1; i >= 0; i--) { Properties properties = new Properties(); InputStream input = new BufferedInputStream(new FileInputStream(files[i].getAbsolutePath())); properties.load(input); - for (Entry<Object, Object> e : properties.entrySet()) + for(Entry<Object, Object> e: properties.entrySet()) this.props.put((String) e.getKey(), (String) e.getValue()); input.close(); } @@ -44,14 +60,14 @@ public class Props implements Map<String, String> { public Props(Map<String, String>... props) { this.props = new HashMap<String, String>(); - for (int i = props.length - 1; i >= 0; i--) + for(int i = props.length - 1; i >= 0; i--) this.props.putAll(props[i]); } public Props(Properties... properties) { this.props = new HashMap<String, String>(); - for (int i = properties.length - 1; i >= 0; i--) - for (Entry<Object, Object> e : properties[i].entrySet()) + for(int i = properties.length - 1; i >= 0; i--) + for(Entry<Object, Object> e: properties[i].entrySet()) this.props.put((String) e.getKey(), (String) e.getValue()); } @@ -116,77 +132,77 @@ public class Props implements Map<String, String> { } public String getString(String key, String defaultValue) { - if (containsKey(key)) + if(containsKey(key)) return get(key); else return defaultValue; } public String getString(String key) { - if (containsKey(key)) + if(containsKey(key)) return get(key); else throw new UndefinedPropertyException(key); } public boolean getBoolean(String key, boolean defaultValue) { - if (containsKey(key)) + if(containsKey(key)) return "true".equalsIgnoreCase(get(key)); else return defaultValue; } public boolean getBoolean(String key) { - if (containsKey(key)) + if(containsKey(key)) return "true".equalsIgnoreCase(get(key)); else throw new UndefinedPropertyException(key); } public long getLong(String name, long defaultValue) { - if (containsKey(name)) + if(containsKey(name)) return Long.parseLong(get(name)); else return defaultValue; } public long getLong(String name) { - if (containsKey(name)) + if(containsKey(name)) return Long.parseLong(get(name)); else throw new UndefinedPropertyException(name); } public int getInt(String name, int defaultValue) { - if (containsKey(name)) + if(containsKey(name)) return Integer.parseInt(get(name)); else return defaultValue; } public int getInt(String name) { - if (containsKey(name)) + if(containsKey(name)) return Integer.parseInt(get(name)); else throw new UndefinedPropertyException(name); } public double getDouble(String name, double defaultValue) { - if (containsKey(name)) + if(containsKey(name)) return Double.parseDouble(get(name)); else return defaultValue; } public double getDouble(String name) { - if (containsKey(name)) + if(containsKey(name)) return Double.parseDouble(get(name)); else throw new UndefinedPropertyException(name); } public long getBytes(String name, long defaultValue) { - if (containsKey(name)) + if(containsKey(name)) return getBytes(name); else return defaultValue; @@ -205,7 +221,7 @@ public class Props implements Map<String, String> { @Override public String toString() { StringBuilder builder = new StringBuilder("{"); - for (Entry<String, String> entry : this.props.entrySet()) { + for(Entry<String, String> entry: this.props.entrySet()) { builder.append(entry.getKey()); builder.append(": "); builder.append(entry.getValue()); @@ -216,22 +232,22 @@ public class Props implements Map<String, String> { } public long getBytes(String name) { - if (!containsKey(name)) + if(!containsKey(name)) throw new UndefinedPropertyException(name); String bytes = get(name); String bytesLc = bytes.toLowerCase().trim(); - if (bytesLc.endsWith("kb")) + if(bytesLc.endsWith("kb")) return Long.parseLong(bytes.substring(0, bytes.length() - 2)) * 1024; - else if (bytesLc.endsWith("k")) + else if(bytesLc.endsWith("k")) return Long.parseLong(bytes.substring(0, bytes.length() - 1)) * 1024; - else if (bytesLc.endsWith("mb")) + else if(bytesLc.endsWith("mb")) return Long.parseLong(bytes.substring(0, bytes.length() - 2)) * 1024 * 1024; - else if (bytesLc.endsWith("m")) + else if(bytesLc.endsWith("m")) return Long.parseLong(bytes.substring(0, bytes.length() - 1)) * 1024 * 1024; - else if (bytesLc.endsWith("gb")) + else if(bytesLc.endsWith("gb")) return Long.parseLong(bytes.substring(0, bytes.length() - 2)) * 1024 * 1024 * 1024; - else if (bytesLc.endsWith("g")) + else if(bytesLc.endsWith("g")) return Long.parseLong(bytes.substring(0, bytes.length() - 1)) * 1024 * 1024 * 1024; else return Long.parseLong(bytes); src/java/voldemort/utils/Props.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.utils; import java.lang.reflect.Constructor; @@ -13,25 +29,25 @@ public class ReflectUtils { public static <T> T construct(Class<T> klass, Object[] args) { Class<?>[] klasses = new Class[args.length]; - for (int i = 0; i < args.length; i++) + for(int i = 0; i < args.length; i++) klasses[i] = args[i].getClass(); try { Constructor<T> cons = klass.getConstructor(klasses); T t = cons.newInstance(args); return t; - } catch (NoSuchMethodException e) { + } catch(NoSuchMethodException e) { throw new RuntimeException("Could not construct " + klass + " with arguments " + args); - } catch (InvocationTargetException e) { + } catch(InvocationTargetException e) { throw new RuntimeException("Could not construct " + klass + " with arguments " + args); - } catch (InstantiationException e) { + } catch(InstantiationException e) { throw new RuntimeException("Could not construct " + klass + " with arguments " + args); - } catch (IllegalAccessException e) { + } catch(IllegalAccessException e) { throw new RuntimeException("Could not construct " + klass + " with arguments " + args); } } public static String getPropertyName(String name) { - if (name != null && (name.startsWith("get") || name.startsWith("set"))) { + if(name != null && (name.startsWith("get") || name.startsWith("set"))) { StringBuilder b = new StringBuilder(name); b.delete(0, 3); b.setCharAt(0, Character.toLowerCase(b.charAt(0))); src/java/voldemort/utils/ReflectUtils.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.utils; import java.util.Date; src/java/voldemort/utils/SystemTime.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.utils; import java.util.Date; src/java/voldemort/utils/Time.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.utils; /** src/java/voldemort/utils/UndefinedPropertyException.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.utils; import java.io.File; @@ -75,8 +91,8 @@ public class Utils { * @param files A collection of files to delete */ public static void rm(Collection<File> files) { - for (File f : files) { - if (f.isDirectory()) { + for(File f: files) { + if(f.isDirectory()) { rm(Arrays.asList(f.listFiles())); f.delete(); } else { @@ -105,14 +121,14 @@ public class Utils { * @return True iff they are equal */ public static boolean areNEquals(Object o1, Object o2) { - if (o1 == o2) + if(o1 == o2) return true; // t1 != t2 - else if (o1 == null || o2 == null) + else if(o1 == null || o2 == null) // only null equals null return false; // are they of the same class? - else if (!o1.getClass().equals(o2.getClass())) + else if(!o1.getClass().equals(o2.getClass())) return false; // t1 != null else @@ -135,8 +151,8 @@ public class Utils { * @param objects The objects to test */ public static void assertNotNull(String s, Object... objects) { - for (Object o : objects) - if (o == null) + for(Object o: objects) + if(o == null) throw new IllegalArgumentException(s); } src/java/voldemort/utils/Utils.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; import java.util.Collections; @@ -20,7 +36,7 @@ public class ArbitraryInconsistencyResolver<T> implements InconsistencyResolver< * @return A single value, if one exists, taken from the input list. */ public List<T> resolveConflicts(List<T> values) { - if (values.size() > 1) + if(values.size() > 1) return values; else return Collections.singletonList(values.get(0)); src/java/voldemort/versioning/ArbitraryInconsistencyResolver.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; import java.util.ArrayList; @@ -18,13 +34,13 @@ public class ChainedResolver<T> implements InconsistencyResolver<T> { public ChainedResolver(InconsistencyResolver<T>... resolvers) { this.resolvers = new ArrayList<InconsistencyResolver<T>>(resolvers.length); - for (InconsistencyResolver<T> resolver : resolvers) + for(InconsistencyResolver<T> resolver: resolvers) this.resolvers.add(Objects.nonNull(resolver)); } public List<T> resolveConflicts(List<T> items) { - for (InconsistencyResolver<T> resolver : resolvers) { - if (items.size() <= 1) + for(InconsistencyResolver<T> resolver: resolvers) { + if(items.size() <= 1) return items; else items = resolver.resolveConflicts(items); src/java/voldemort/versioning/ChainedResolver.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; import java.io.Serializable; @@ -27,10 +43,10 @@ public final class ClockEntry implements Cloneable, Serializable { * @param version The current version */ public ClockEntry(short nodeId, long version) { - if (nodeId < 0) + if(nodeId < 0) throw new IllegalArgumentException("Node id " + nodeId + " is not in the range (0, " + Short.MAX_VALUE + ")."); - if (version < 1) + if(version < 1) throw new IllegalArgumentException("Version " + version + " is not in the range (1, " + Short.MAX_VALUE + ")."); this.nodeId = nodeId; @@ -41,7 +57,7 @@ public final class ClockEntry implements Cloneable, Serializable { public ClockEntry clone() { try { return (ClockEntry) super.clone(); - } catch (CloneNotSupportedException e) { + } catch(CloneNotSupportedException e) { throw new RuntimeException(e); } } @@ -65,13 +81,13 @@ public final class ClockEntry implements Cloneable, Serializable { @Override public boolean equals(Object o) { - if (this == o) + if(this == o) return true; - if (o == null) + if(o == null) return false; - if (o.getClass().equals(ClockEntry.class)) { + if(o.getClass().equals(ClockEntry.class)) { ClockEntry v = (ClockEntry) o; return v.getNodeId() == getNodeId() && v.getVersion() == getVersion(); } else { src/java/voldemort/versioning/ClockEntry.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; import java.util.List; @@ -11,7 +27,7 @@ import java.util.List; public class FailingInconsistencyResolver<T> implements InconsistencyResolver<T> { public List<T> resolveConflicts(List<T> items) { - if (items.size() > 1) + if(items.size() > 1) throw new InconsistentDataException("Conflict resolution failed.", items); else return items; src/java/voldemort/versioning/FailingInconsistencyResolver.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; import java.util.List; src/java/voldemort/versioning/InconsistencyResolver.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; import java.util.List; src/java/voldemort/versioning/InconsistentDataException.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; import java.util.Collections; @@ -19,14 +35,14 @@ public class MergingInconsitencyResolver<T> implements InconsistencyResolver<Ver } public List<Versioned<T>> resolveConflicts(List<Versioned<T>> items) { - if (items.size() <= 1) { + if(items.size() <= 1) { return items; } else { Iterator<Versioned<T>> iter = items.iterator(); Versioned<T> current = iter.next(); T merged = current.getValue(); VectorClock clock = (VectorClock) current.getVersion(); - while (iter.hasNext()) { + while(iter.hasNext()) { Versioned<T> versioned = iter.next(); merged = merger.merge(merged, versioned.getValue()); clock = clock.merge((VectorClock) versioned.getVersion()); src/java/voldemort/versioning/MergingInconsitencyResolver.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; /** src/java/voldemort/versioning/ObjectMerger.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; /** src/java/voldemort/versioning/Occured.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; import java.util.Collections; @@ -18,7 +34,7 @@ public class TimeBasedInconsistencyResolver<T> implements InconsistencyResolver< } else { Versioned<T> max = items.get(0); long maxTime = ((VectorClock) items.get(0).getVersion()).getTimestamp(); - for(Versioned<T> versioned : items) { + for(Versioned<T> versioned: items) { VectorClock clock = (VectorClock) versioned.getVersion(); if(clock.getTimestamp() > maxTime) { max = versioned; src/java/voldemort/versioning/TimeBasedInconsistencyResolver.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; import java.io.Serializable; @@ -105,7 +121,7 @@ public class VectorClock implements Version, Serializable { int clockEntrySize = ByteUtils.SIZE_OF_SHORT + versionSize; int start = 3; - for(ClockEntry v : versions) { + for(ClockEntry v: versions) { ByteUtils.writeShort(serialized, v.getNodeId(), start); ByteUtils.writeBytes(serialized, v.getVersion(), @@ -214,7 +230,7 @@ public class VectorClock implements Version, Serializable { public long getMaxVersion() { long max = -1; - for(ClockEntry entry : versions) + for(ClockEntry entry: versions) if(entry.getVersion() > max) max = entry.getVersion(); return max; src/java/voldemort/versioning/VectorClock.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; import java.util.Collections; src/java/voldemort/versioning/VectorClockInconsistencyResolver.java @@ -1,22 +1,40 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; /** - * An interface that allows us to determine if a given version happened before or - * after another version. + * An interface that allows us to determine if a given version happened before + * or after another version. * - * This could have been done using the comparable interface but that is confusing, - * because the numeric codes are easily confused, and because concurrent versions are - * not necessarily "equal" in the normal sense. + * This could have been done using the comparable interface but that is + * confusing, because the numeric codes are easily confused, and because + * concurrent versions are not necessarily "equal" in the normal sense. * * @author jay - * + * */ public interface Version { - - /** - * Return whether or not the given version preceeded this one, succeeded it, or is concurrant with it - * @param v The other version - */ - public Occured compare(Version v); - + + /** + * Return whether or not the given version preceeded this one, succeeded it, + * or is concurrant with it + * + * @param v The other version + */ + public Occured compare(Version v); + } src/java/voldemort/versioning/Version.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; import java.io.Serializable; @@ -42,11 +58,11 @@ public final class Versioned<T> implements Serializable { @Override @SuppressWarnings("unchecked") public boolean equals(Object object) { - if (this == null) + if(this == null) return true; - else if (object == null) + else if(object == null) return false; - else if (!object.getClass().equals(Versioned.class)) + else if(!object.getClass().equals(Versioned.class)) return false; Versioned versioned = (Versioned) object; @@ -76,9 +92,9 @@ public final class Versioned<T> implements Serializable { public int compare(Versioned<S> v1, Versioned<S> v2) { Occured occured = v1.getVersion().compare(v2.getVersion()); - if (occured == Occured.BEFORE) + if(occured == Occured.BEFORE) return -1; - else if (occured == Occured.AFTER) + else if(occured == Occured.AFTER) return 1; else return 0; src/java/voldemort/versioning/Versioned.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.xml; import java.io.IOException; @@ -71,7 +87,7 @@ public class ClusterMapper { + doc.getRootElement().getName()); String name = root.getChildText(CLUSTER_NAME_ELMT); List<Node> nodes = new ArrayList<Node>(); - for(Element node : (List<Element>) root.getChildren(SERVER_ELMT)) + for(Element node: (List<Element>) root.getChildren(SERVER_ELMT)) nodes.add(readServer(node)); return new Cluster(name, nodes); } catch(JDOMException e) { @@ -91,7 +107,7 @@ public class ClusterMapper { int socketPort = Integer.parseInt(server.getChildText(SOCKET_PORT_ELMT)); String partitionsText = server.getChildText(SERVER_PARTITIONS_ELMT).trim(); List<Integer> partitions = new ArrayList<Integer>(); - for(String aPartition : COMMA_SEP.split(partitionsText)) + for(String aPartition: COMMA_SEP.split(partitionsText)) partitions.add(Integer.parseInt(aPartition.trim())); return new Node(id, host, httpPort, socketPort, partitions); } @@ -99,7 +115,7 @@ public class ClusterMapper { public String writeCluster(Cluster cluster) { Document doc = new Document(new Element(CLUSTER_ELMT)); doc.getRootElement().addContent(new Element(CLUSTER_NAME_ELMT).setText(cluster.getName())); - for(Node n : cluster.getNodes()) + for(Node n: cluster.getNodes()) doc.getRootElement().addContent(mapServer(n)); XMLOutputter serializer = new XMLOutputter(Format.getPrettyFormat()); return serializer.outputString(doc.getRootElement()); src/java/voldemort/xml/ClusterMapper.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.xml; import voldemort.VoldemortException; src/java/voldemort/xml/MappingException.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.xml; import java.io.IOException; @@ -78,7 +94,7 @@ public class StoreDefinitionsMapper { throw new MappingException("Invalid root element: " + doc.getRootElement().getName()); List<StoreDefinition> stores = new ArrayList<StoreDefinition>(); - for(Element store : (List<Element>) root.getChildren(STORE_ELMT)) + for(Element store: (List<Element>) root.getChildren(STORE_ELMT)) stores.add(readStore(store)); return stores; } catch(JDOMException e) { @@ -141,7 +157,7 @@ public class StoreDefinitionsMapper { private SerializerDefinition readSerializer(Element elmt) { String name = elmt.getChild(STORE_SERIALIZATION_TYPE_ELMT).getText(); Map<Integer, String> schemaInfosByVersion = new HashMap<Integer, String>(); - for(Object schemaInfo : elmt.getChildren(STORE_SERIALIZATION_META_ELMT)) { + for(Object schemaInfo: elmt.getChildren(STORE_SERIALIZATION_META_ELMT)) { Element schemaInfoElmt = (Element) schemaInfo; String versionStr = schemaInfoElmt.getAttributeValue(STORE_VERSION_ATTR); int version = 0; @@ -158,7 +174,7 @@ public class StoreDefinitionsMapper { public String writeStoreList(List<StoreDefinition> stores) { Element root = new Element(STORES_ELMT); - for(StoreDefinition def : stores) + for(StoreDefinition def: stores) root.addContent(toElement(def)); XMLOutputter serializer = new XMLOutputter(Format.getPrettyFormat()); return serializer.outputString(root); @@ -201,7 +217,7 @@ public class StoreDefinitionsMapper { private void addSerializer(Element parent, SerializerDefinition def) { parent.addContent(new Element(STORE_SERIALIZATION_TYPE_ELMT).setText(def.getName())); if(def.hasSchemaInfo()) { - for(Map.Entry<Integer, String> entry : def.getAllSchemaInfoVersions().entrySet()) { + for(Map.Entry<Integer, String> entry: def.getAllSchemaInfoVersions().entrySet()) { Element schemaElmt = new Element(STORE_SERIALIZATION_META_ELMT); schemaElmt.setAttribute(STORE_VERSION_ATTR, Integer.toString(entry.getKey())); schemaElmt.setText(entry.getValue()); src/java/voldemort/xml/StoreDefinitionsMapper.java @@ -1,16 +1,34 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort; -import java.io.*; -import java.util.concurrent.*; +import java.io.IOException; +import java.io.InputStream; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.BlockingQueue; public class BlockingInputStream extends InputStream { - + private BlockingQueue<Byte> queue; - + public BlockingInputStream() { this(new ArrayBlockingQueue<Byte>(1000)); } - + public BlockingInputStream(BlockingQueue<Byte> queue) { this.queue = queue; } @@ -23,5 +41,5 @@ public class BlockingInputStream extends InputStream { throw new IOException(e.getMessage()); } } - + } test/common/voldemort/BlockingInputStream.java @@ -1,12 +1,30 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort; -import java.io.*; -import java.util.concurrent.*; +import java.io.IOException; +import java.io.OutputStream; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.BlockingQueue; public class BlockingOutputStream extends OutputStream { - + private BlockingQueue<Byte> queue; - + public BlockingOutputStream() { this(new ArrayBlockingQueue<Byte>(1000)); } @@ -24,5 +42,5 @@ public class BlockingOutputStream extends OutputStream { throw new IOException(e.getMessage()); } } - + } test/common/voldemort/BlockingOutputStream.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort; import java.util.Date; @@ -5,13 +21,13 @@ import java.util.Date; import voldemort.utils.Time; public class MockTime implements Time { - + private long currentTime; - + public MockTime() { this.currentTime = System.currentTimeMillis(); } - + public MockTime(long time) { this.currentTime = time; } @@ -35,13 +51,13 @@ public class MockTime implements Time { public void setTime(long time) { this.currentTime = time; } - + public void setCurrentDate(Date date) { this.currentTime = date.getTime(); } - + public void addMilliseconds(long ms) { this.currentTime += ms; } - + } test/common/voldemort/MockTime.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort; import java.util.concurrent.ConcurrentHashMap; @@ -22,57 +38,60 @@ import voldemort.versioning.Versioned; * Helper functions for testing with real server implementations * * @author jay - * + * */ public class ServerTestUtils { - - public static ConcurrentMap<String, Store<byte[],byte[]>> getStores(String storeName, - String clusterXml, - String storesXml) { - ConcurrentMap<String, Store<byte[],byte[]>> stores = - new ConcurrentHashMap<String,Store<byte[],byte[]>>(1); - stores.put(storeName, new InMemoryStorageEngine<byte[],byte[]>(storeName)); - Store<String,String> metadataInner = new InMemoryStorageEngine<String,String>("metadata"); + + public static ConcurrentMap<String, Store<byte[], byte[]>> getStores(String storeName, + String clusterXml, + String storesXml) { + ConcurrentMap<String, Store<byte[], byte[]>> stores = new ConcurrentHashMap<String, Store<byte[], byte[]>>(1); + stores.put(storeName, new InMemoryStorageEngine<byte[], byte[]>(storeName)); + Store<String, String> metadataInner = new InMemoryStorageEngine<String, String>("metadata"); metadataInner.put("cluster.xml", new Versioned<String>(clusterXml)); metadataInner.put("stores.xml", new Versioned<String>(storesXml)); - MetadataStore metadata = new MetadataStore(metadataInner, - stores); + MetadataStore metadata = new MetadataStore(metadataInner, stores); stores.put(MetadataStore.METADATA_STORE_NAME, metadata); return stores; } - public static SocketServer getSocketServer(String clusterXml, - String storesXml, - String storeName, + public static SocketServer getSocketServer(String clusterXml, + String storesXml, + String storeName, int port) { - SocketServer socketServer = new SocketServer(getStores(storeName, clusterXml, storesXml), port, 5, 10); + SocketServer socketServer = new SocketServer(getStores(storeName, clusterXml, storesXml), + port, + 5, + 10); socketServer.start(); socketServer.awaitStartupCompletion(); return socketServer; } - + public static SocketStore getSocketStore(String storeName, int port) { SocketPool socketPool = new SocketPool(1, 2, 1000); return new SocketStore(storeName, "localhost", port, socketPool); } - - public static Context getJettyServer(String clusterXml, + + public static Context getJettyServer(String clusterXml, String storesXml, - String storeName, + String storeName, int port) throws Exception { - ConcurrentMap<String, Store<byte[],byte[]>> stores = getStores(storeName, clusterXml, storesXml); - + ConcurrentMap<String, Store<byte[], byte[]>> stores = getStores(storeName, + clusterXml, + storesXml); + // initialize servlet Server server = new Server(port); server.setSendServerVersion(false); Context context = new Context(server, "/", Context.NO_SESSIONS); - + context.addServlet(new ServletHolder(new StoreServlet(stores)), "/*"); server.start(); return context; } - + public static HttpStore getHttpStore(String storeName, int port) { return new HttpStore(storeName, "localhost", port, new HttpClient()); } test/common/voldemort/ServerTestUtils.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort; import java.io.File; test/common/voldemort/TestUtils.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort; import java.io.IOException; test/common/voldemort/VoldemortTestConstants.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import java.util.List; test/common/voldemort/store/FailingStore.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import java.util.List; test/common/voldemort/store/SleepyStore.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort; import static voldemort.VoldemortTestConstants.getOneNodeClusterXml; @@ -38,7 +54,7 @@ public class ClientServerTest extends TestCase { public void setUp() { Props serverProps = new Props(); this.tempDir = System.getProperty("java.io.tmpdir") + File.separator - + new Random().nextInt(Integer.MAX_VALUE); + + new Random().nextInt(Integer.MAX_VALUE); assertTrue(new File(tempDir).mkdir()); String dataDir = tempDir + File.separator + "data"; assertTrue(new File(dataDir).mkdir()); test/integration/voldemort/ClientServerTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort; import voldemort.store.Store; test/integration/voldemort/InMemoryMultiThreadedTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort; import java.util.List; @@ -14,34 +30,38 @@ import voldemort.versioning.Versioned; * Big honkin multithreaded stress test * * @author jay - * + * */ public class MultithreadedStressTest { - + private final ExecutorService service; - private final Store<byte[],byte[]> store; + private final Store<byte[], byte[]> store; private final AtomicInteger value; private final int numberOfValues; private final int numberOfRequests; - + @SuppressWarnings("unchecked") - public MultithreadedStressTest(Store<byte[],byte[]> store, int numberOfValues, int numberOfRequests, int numberOfThreads) { + public MultithreadedStressTest(Store<byte[], byte[]> store, + int numberOfValues, + int numberOfRequests, + int numberOfThreads) { this.numberOfValues = numberOfValues; this.numberOfRequests = numberOfRequests; this.service = Executors.newFixedThreadPool(numberOfThreads); this.store = store; this.value = new AtomicInteger(0); for(int i = 0; i < numberOfValues; i++) - this.store.put(Integer.toString(i).getBytes(), new Versioned<byte[]>(Integer.toString(i).getBytes())); + this.store.put(Integer.toString(i).getBytes(), + new Versioned<byte[]>(Integer.toString(i).getBytes())); } - + public void testGetAndPut() throws Exception { final AtomicInteger obsoletes = new AtomicInteger(0); final CountDownLatch isDone = new CountDownLatch(numberOfRequests); for(int i = 0; i < numberOfRequests; i++) { final int index = i % numberOfValues; - service.execute( - new Runnable() { + service.execute(new Runnable() { + public void run() { boolean done = false; while(!done) { @@ -52,7 +72,8 @@ public class MultithreadedStressTest { throw new RuntimeException("Found multiple versions: " + found); } else if(found.size() == 1) { Versioned<byte[]> versioned = found.get(0); - byte[] valueBytes = Integer.toString(MultithreadedStressTest.this.value.getAndIncrement()).getBytes(); + byte[] valueBytes = Integer.toString(MultithreadedStressTest.this.value.getAndIncrement()) + .getBytes(); versioned.setObject(valueBytes); store.put(key, versioned); done = true; @@ -72,5 +93,5 @@ public class MultithreadedStressTest { System.err.println("Number of obsoletes: " + obsoletes.get()); System.exit(0); } - + } test/integration/voldemort/MultithreadedStressTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort; import java.io.RandomAccessFile; @@ -29,7 +45,7 @@ public class RandomAccessFileStoreTest { RandomAccessFileStore store = null; // new RandomAccessFileStore("test", // 10000L, index, data); - for(int i : ImmutableList.of(964, 2, 15, 78, 192, 984)) { + for(int i: ImmutableList.of(964, 2, 15, 78, 192, 984)) { byte[] key = Integer.toString(i).getBytes(); List<Versioned<byte[]>> values = store.get(key); System.out.print(new String(key)); test/integration/voldemort/RandomAccessFileStoreTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort; import java.io.BufferedReader; @@ -8,7 +24,7 @@ import voldemort.utils.Utils; /** * @author jay - * + * */ public class ReadJson { @@ -26,5 +42,5 @@ public class ReadJson { } System.out.println((System.currentTimeMillis() - start) / (double) count + " ms/object"); } - + } test/integration/voldemort/ReadJson.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort; import java.io.BufferedReader; @@ -14,25 +30,25 @@ import voldemort.utils.Utils; /** * @author jay - * + * */ public class ReadOnlyStoreBuilder { - + public static void main(String[] args) throws Exception { if(args.length != 6) Utils.croak("USAGE: java MmapStoreBuilder store_name input_file output_dir cluster.xml stores.xml sort_buffer_size"); - + String storeName = args[0]; String inputFile = args[1]; String outputDir = args[2]; String clusterFile = args[3]; String storesFile = args[4]; int sortBufferSize = Integer.parseInt(args[5]); - + BufferedReader reader = new BufferedReader(new FileReader(inputFile), 5000000); // needs type def JsonReader jsonReader = new JsonReader(reader); - + Pattern tab = Pattern.compile("\t"); SortedMap<ByteKey, String> lines = new TreeMap<ByteKey, String>(); for(String line = reader.readLine(); line != null; line = reader.readLine()) { @@ -42,16 +58,23 @@ public class ReadOnlyStoreBuilder { lines.put(new ByteKey(ByteUtils.md5(pieces[0].getBytes())), line); } reader.close(); - - DataOutputStream index = null;//new DataOutputStream(new BufferedOutputStream(new FileOutputStream(outputFileBase + ".index"), 1000000)); - DataOutputStream data = null;//new DataOutputStream(new BufferedOutputStream(new FileOutputStream(outputFileBase + ".data"), 1000000)); + + DataOutputStream index = null;// new DataOutputStream(new + // BufferedOutputStream(new + // FileOutputStream(outputFileBase + + // ".index"), 1000000)); + DataOutputStream data = null;// new DataOutputStream(new + // BufferedOutputStream(new + // FileOutputStream(outputFileBase + + // ".data"), 1000000)); long position = 0; for(ByteKey key: lines.keySet()) { String line = lines.get(key); String[] pieces = tab.split(line); index.write(ByteUtils.md5(pieces[0].getBytes())); index.writeLong(position); - System.out.println("Wrote " + pieces[0] + " " + pieces[0].getBytes() + " to " + position); + System.out.println("Wrote " + pieces[0] + " " + pieces[0].getBytes() + " to " + + position); byte[] theValue = pieces[1].getBytes(); data.writeInt(theValue.length); data.write(theValue); @@ -63,18 +86,19 @@ public class ReadOnlyStoreBuilder { index.close(); data.close(); } - + private final static class ByteKey implements Comparable<ByteKey> { + private final byte[] bytes; - + public ByteKey(byte[] bytes) { this.bytes = bytes; } - + public byte[] getBytes() { return this.bytes; } - + public boolean equals(Object o) { if(o == null) return false; @@ -82,11 +106,11 @@ public class ReadOnlyStoreBuilder { return false; return Arrays.equals(this.getBytes(), ((ByteKey) o).getBytes()); } - + public int hashCode() { return Arrays.hashCode(getBytes()); } - + public int compareTo(ByteKey k) { return ByteUtils.compare(this.getBytes(), k.getBytes()); } test/integration/voldemort/ReadOnlyStoreBuilder.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort; public class TestArrayCopy { test/integration/voldemort/TestArrayCopy.java @@ -1,28 +1,45 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.partition; -import java.io.*; +import java.io.BufferedReader; +import java.io.FileReader; import voldemort.utils.FnvHashFunction; public class FnvHashFunctionTester { - public static void main(String[] argv) throws Exception { - if(argv.length != 1) { - System.err.println("USAGE: java voldemort.partition.FnvHashFunctionTester filename"); - System.exit(1); - } + public static void main(String[] argv) throws Exception { + if(argv.length != 1) { + System.err.println("USAGE: java voldemort.partition.FnvHashFunctionTester filename"); + System.exit(1); + } - FnvHashFunction hash = new FnvHashFunction(); - BufferedReader reader = new BufferedReader(new FileReader(argv[0])); - while(true) { - String line = reader.readLine(); - if(line == null) - break; - System.out.println(hash.hash(line.trim().getBytes())); - } + FnvHashFunction hash = new FnvHashFunction(); + BufferedReader reader = new BufferedReader(new FileReader(argv[0])); + while(true) { + String line = reader.readLine(); + if(line == null) + break; + System.out.println(hash.hash(line.trim().getBytes())); + } - reader.close(); + reader.close(); - } + } } test/integration/voldemort/partition/FnvHashFunctionTester.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.performance; import static voldemort.utils.Utils.croak; @@ -10,48 +26,51 @@ import voldemort.versioning.Versioned; public abstract class AbstractLoadTestHarness { - public abstract StoreClient<String,String> getStore(Props propsA, Props propsB) throws Exception; - - public void run(String[] args) throws Exception { - if(args.length != 4) - croak("USAGE: java " + RemoteTest.class.getName() + - " numRequests numThreads properties_file1 properties_file2"); - - int numRequests = Integer.parseInt(args[0]); - int numThreads = Integer.parseInt(args[1]); - Props propertiesA = new Props(new File(args[2])); - Props propertiesB = new Props(new File(args[3])); - - System.out.println("Creating client: "); - final StoreClient<String,String> client = getStore(propertiesA, propertiesB); - - PerformanceTest writeTest = new PerformanceTest() { + public abstract StoreClient<String, String> getStore(Props propsA, Props propsB) + throws Exception; + + public void run(String[] args) throws Exception { + if(args.length != 4) + croak("USAGE: java " + RemoteTest.class.getName() + + " numRequests numThreads properties_file1 properties_file2"); + + int numRequests = Integer.parseInt(args[0]); + int numThreads = Integer.parseInt(args[1]); + Props propertiesA = new Props(new File(args[2])); + Props propertiesB = new Props(new File(args[3])); + + System.out.println("Creating client: "); + final StoreClient<String, String> client = getStore(propertiesA, propertiesB); + + PerformanceTest writeTest = new PerformanceTest() { + public void doOperation(int index) throws Exception { String iStr = Integer.toString(index); client.put(iStr, new Versioned<String>(iStr)); } - }; - System.out.println(); - System.out.println("WRITE TEST"); - writeTest.run(numRequests, numThreads); - writeTest.printStats(); - - System.out.println(); - + }; + System.out.println(); + System.out.println("WRITE TEST"); + writeTest.run(numRequests, numThreads); + writeTest.printStats(); + + System.out.println(); + PerformanceTest readTest = new PerformanceTest() { + public void doOperation(int index) throws Exception { String iStr = Integer.toString(index); String found = client.getValue(iStr); if(!iStr.equals(found)) System.err.println("Not equal: " + iStr + ", " + found); - } + } }; - + System.out.println("READ TEST"); readTest.run(numRequests, numThreads); readTest.printStats(); - System.exit(0); - } - + System.exit(0); + } + } test/integration/voldemort/performance/AbstractLoadTestHarness.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.performance; import java.io.File; @@ -15,29 +31,28 @@ import com.sleepycat.je.DatabaseEntry; import com.sleepycat.je.Environment; import com.sleepycat.je.EnvironmentConfig; - /** * @author jay - * + * */ public class BdbGrowth { - - public static void main(String[] args) throws Exception { + + public static void main(String[] args) throws Exception { if(args.length != 5) { System.err.println("USAGE: java BdbGrowth directory cache_size total_size increment threads"); System.exit(1); } - + final String dir = args[0]; final long cacheSize = Long.parseLong(args[1]); final int totalSize = Integer.parseInt(args[2]); final int increment = Integer.parseInt(args[3]); final int threads = Integer.parseInt(args[4]); - + Environment environment; EnvironmentConfig environmentConfig; DatabaseConfig databaseConfig; - + environmentConfig = new EnvironmentConfig(); environmentConfig.setCacheSize(cacheSize); environmentConfig.setTxnNoSync(true); @@ -48,7 +63,7 @@ public class BdbGrowth { environmentConfig.setTransactional(true); databaseConfig = new DatabaseConfig(); databaseConfig.setAllowCreate(true); - //databaseConfig.setDeferredWrite(true); + // databaseConfig.setDeferredWrite(true); databaseConfig.setTransactional(true); databaseConfig.setNodeMaxEntries(1024); File bdbDir = new File(dir); @@ -60,12 +75,12 @@ public class BdbGrowth { } environment = new Environment(bdbDir, environmentConfig); final Database db = environment.openDatabase(null, "test", databaseConfig); - + final Random rand = new Random(); int iterations = totalSize / increment; long[] readTimes = new long[iterations]; long[] writeTimes = new long[iterations]; - + ExecutorService service = Executors.newFixedThreadPool(threads); for(int i = 0; i < iterations; i++) { System.out.println("Starting iteration " + i); @@ -75,8 +90,11 @@ public class BdbGrowth { for(int j = 0; j < increment; j++) { final int fj = j; results.add(service.submit(new Callable<Object>() { + public Object call() throws Exception { - db.put(null, new DatabaseEntry(Integer.toString(fi*increment + fj).getBytes()), new DatabaseEntry(Integer.toString(fi*increment + fj).getBytes())); + db.put(null, + new DatabaseEntry(Integer.toString(fi * increment + fj).getBytes()), + new DatabaseEntry(Integer.toString(fi * increment + fj).getBytes())); return null; } })); @@ -86,14 +104,18 @@ public class BdbGrowth { writeTimes[i] = System.currentTimeMillis() - startTime; System.out.println("write: " + (writeTimes[i] / (double) increment)); results.clear(); - + startTime = System.currentTimeMillis(); for(int j = 0; j < increment; j++) { final int fj = j; results.add(service.submit(new Callable<Object>() { + public Object call() throws Exception { int value = rand.nextInt((fi + 1) * increment); - return db.get(null, new DatabaseEntry(Integer.toString(value).getBytes()), new DatabaseEntry(Integer.toString(value).getBytes()), null); + return db.get(null, + new DatabaseEntry(Integer.toString(value).getBytes()), + new DatabaseEntry(Integer.toString(value).getBytes()), + null); } })); } @@ -101,21 +123,21 @@ public class BdbGrowth { results.get(j).get(); readTimes[i] = (System.currentTimeMillis() - startTime); System.out.println("read: " + (readTimes[i] / (double) increment)); - -// int cleaned = 0; -// do { -// cleaned += environment.cleanLog(); -// } while(cleaned > 0); -// if(cleaned > 0) -// System.out.println("Cleaned " + cleaned + " files."); -// CheckpointConfig cp = new CheckpointConfig(); -// cp.setForce(true); -// environment.checkpoint(null); -// environment.compress(); -// environment.sync(); + + // int cleaned = 0; + // do { + // cleaned += environment.cleanLog(); + // } while(cleaned > 0); + // if(cleaned > 0) + // System.out.println("Cleaned " + cleaned + " files."); + // CheckpointConfig cp = new CheckpointConfig(); + // cp.setForce(true); + // environment.checkpoint(null); + // environment.compress(); + // environment.sync(); System.out.println("Cleaning, Checkpointing and compression completed."); } - + System.out.println(); System.out.println("iteration read write:"); for(int i = 0; i < iterations; i++) { @@ -123,10 +145,10 @@ public class BdbGrowth { System.out.print(" " + readTimes[i] / (double) increment); System.out.println(" " + writeTimes[i] / (double) increment); } - + System.out.println(environment.getStats(null)); - + System.exit(0); - } + } } \ No newline at end of file test/integration/voldemort/performance/BdbGrowth.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.performance; import java.util.concurrent.atomic.AtomicInteger; test/integration/voldemort/performance/CacheStorageEnginePerformanceTest.java @@ -1,33 +1,54 @@ -package voldemort.performance; +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ -import java.util.concurrent.*; +package voldemort.performance; -import org.apache.commons.httpclient.*; +import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler; +import org.apache.commons.httpclient.HostConfiguration; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpConnectionManager; +import org.apache.commons.httpclient.HttpVersion; +import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; import org.apache.commons.httpclient.cookie.CookiePolicy; import org.apache.commons.httpclient.methods.GetMethod; -import org.apache.commons.httpclient.params.*; +import org.apache.commons.httpclient.params.HttpClientParams; +import org.apache.commons.httpclient.params.HttpConnectionManagerParams; public class HttpClientBench { - + private static final int DEFAULT_CONNECTION_MANAGER_TIMEOUT = 100000; private static final int DEFAULT_MAX_CONNECTIONS = 10; private static final int DEFAULT_MAX_HOST_CONNECTIONS = 10; private static final String VOLDEMORT_USER_AGENT = "vldmrt/0.01"; - + public static void main(String[] args) throws Exception { if(args.length < 3) { System.err.println("USAGE: java HttpClientBench url numThreads numRequests"); System.exit(1); } - + final String url = args[0]; final int numThreads = Integer.parseInt(args[1]); final int numRequests = Integer.parseInt(args[2]); - + System.out.println("Benchmarking against " + url); - + final HttpClient client = createClient(); PerformanceTest perfTest = new PerformanceTest() { + public void doOperation(int index) { GetMethod get = new GetMethod(url); try { @@ -45,14 +66,15 @@ public class HttpClientBench { System.exit(1); } - + private static HttpClient createClient() { HttpConnectionManager connectionManager = new MultiThreadedHttpConnectionManager(); HttpClient httpClient = new HttpClient(connectionManager); HttpClientParams clientParams = httpClient.getParams(); clientParams.setConnectionManagerTimeout(DEFAULT_CONNECTION_MANAGER_TIMEOUT); clientParams.setSoTimeout(500); - clientParams.setParameter(HttpClientParams.RETRY_HANDLER, new DefaultHttpMethodRetryHandler(0, false)); + clientParams.setParameter(HttpClientParams.RETRY_HANDLER, + new DefaultHttpMethodRetryHandler(0, false)); clientParams.setCookiePolicy(CookiePolicy.IGNORE_COOKIES); clientParams.setBooleanParameter("http.tcp.nodelay", false); clientParams.setIntParameter("http.socket.receivebuffer", 60000); @@ -61,12 +83,14 @@ public class HttpClientBench { hostConfig.setHost("localhost"); hostConfig.getParams().setParameter("http.protocol.version", HttpVersion.HTTP_1_1); httpClient.setHostConfiguration(hostConfig); - HttpConnectionManagerParams managerParams = httpClient.getHttpConnectionManager().getParams(); + HttpConnectionManagerParams managerParams = httpClient.getHttpConnectionManager() + .getParams(); managerParams.setConnectionTimeout(DEFAULT_CONNECTION_MANAGER_TIMEOUT); managerParams.setMaxTotalConnections(DEFAULT_MAX_CONNECTIONS); - managerParams.setMaxConnectionsPerHost(httpClient.getHostConfiguration(), DEFAULT_MAX_HOST_CONNECTIONS); + managerParams.setMaxConnectionsPerHost(httpClient.getHostConfiguration(), + DEFAULT_MAX_HOST_CONNECTIONS); managerParams.setStaleCheckingEnabled(false); - + return httpClient; } test/integration/voldemort/performance/HttpClientBench.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.performance; import voldemort.client.DefaultStoreClient; @@ -15,24 +31,24 @@ import voldemort.versioning.VectorClockInconsistencyResolver; import voldemort.versioning.Versioned; public class LocalDirectLoadTest extends AbstractLoadTestHarness { - - @Override - public StoreClient<String,String> getStore(Props propsA, Props propsB) throws Exception { - StorageConfiguration conf = new BdbStorageConfiguration(new VoldemortConfig(propsA)); - Store<String,String> store = - new SerializingStore<String,String>(conf.getStore("test" + 0), - new StringSerializer(), - new StringSerializer()); - InconsistencyResolver<Versioned<String>> resolver = new VectorClockInconsistencyResolver<String>(); - - return new DefaultStoreClient<String,String>(new InconsistencyResolvingStore<String,String>(store, resolver), - new StringSerializer(), - new StringSerializer(), - null); - } - public static void main(String[] args) throws Exception { - new LocalDirectLoadTest().run(args); - } + @Override + public StoreClient<String, String> getStore(Props propsA, Props propsB) throws Exception { + StorageConfiguration conf = new BdbStorageConfiguration(new VoldemortConfig(propsA)); + Store<String, String> store = new SerializingStore<String, String>(conf.getStore("test" + 0), + new StringSerializer(), + new StringSerializer()); + InconsistencyResolver<Versioned<String>> resolver = new VectorClockInconsistencyResolver<String>(); + + return new DefaultStoreClient<String, String>(new InconsistencyResolvingStore<String, String>(store, + resolver), + new StringSerializer(), + new StringSerializer(), + null); + } + + public static void main(String[] args) throws Exception { + new LocalDirectLoadTest().run(args); + } } test/integration/voldemort/performance/LocalDirectLoadTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.performance; import java.io.File; @@ -30,35 +46,39 @@ import com.google.common.collect.Maps; public class LocalRoutedStoreLoadTest extends AbstractLoadTestHarness { - @Override - public StoreClient<String,String> getStore(Props propsA, Props propsB) throws Exception { - Cluster cluster = new ClusterMapper().readCluster(new FileReader(propsA.getString("metadata.directory") + - File.separator + "/cluster.xml")); - HashFunction hasher = new FnvHashFunction(); - RoutingStrategy routingStrategy = new ConsistentRoutingStrategy(cluster.getNodes(), 1); - Map<Integer,Store<byte[],byte[]>> clientMapping = Maps.newHashMap(); - StorageConfiguration conf = new BdbStorageConfiguration(new VoldemortConfig(propsA)); - for(Node node: cluster.getNodes()) - clientMapping.put(node.getId(), conf.getStore("test" + node.getId())); - - InconsistencyResolver<Versioned<String>> resolver = new VectorClockInconsistencyResolver<String>(); - Store<byte[],byte[]> store = new RoutedStore("test", - clientMapping, - routingStrategy, - 1, - 1, - 10, + @Override + public StoreClient<String, String> getStore(Props propsA, Props propsB) throws Exception { + Cluster cluster = new ClusterMapper().readCluster(new FileReader(propsA.getString("metadata.directory") + + File.separator + + "/cluster.xml")); + HashFunction hasher = new FnvHashFunction(); + RoutingStrategy routingStrategy = new ConsistentRoutingStrategy(cluster.getNodes(), 1); + Map<Integer, Store<byte[], byte[]>> clientMapping = Maps.newHashMap(); + StorageConfiguration conf = new BdbStorageConfiguration(new VoldemortConfig(propsA)); + for(Node node: cluster.getNodes()) + clientMapping.put(node.getId(), conf.getStore("test" + node.getId())); + + InconsistencyResolver<Versioned<String>> resolver = new VectorClockInconsistencyResolver<String>(); + Store<byte[], byte[]> store = new RoutedStore("test", + clientMapping, + routingStrategy, + 1, + 1, + 10, true, 10000L); - Store<String,String> serializingStore = new SerializingStore<String,String>(store, new StringSerializer(), new StringSerializer()); - return new DefaultStoreClient<String, String>(new InconsistencyResolvingStore<String, String>(serializingStore, resolver), - new StringSerializer(), - new StringSerializer(), - null); - } + Store<String, String> serializingStore = new SerializingStore<String, String>(store, + new StringSerializer(), + new StringSerializer()); + return new DefaultStoreClient<String, String>(new InconsistencyResolvingStore<String, String>(serializingStore, + resolver), + new StringSerializer(), + new StringSerializer(), + null); + } + + public static void main(String[] args) throws Exception { + new LocalRoutedStoreLoadTest().run(args); + } - public static void main(String[] args) throws Exception { - new LocalRoutedStoreLoadTest().run(args); - } - } test/integration/voldemort/performance/LocalRoutedStoreLoadTest.java @@ -1,9 +1,26 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.performance; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.util.concurrent.*; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import javax.sql.DataSource; @@ -13,10 +30,10 @@ import org.apache.commons.dbcp.BasicDataSource; * A simple MySQL benchmark * * @author jay - * + * */ public class MysqlBench { - + private final ExecutorService threadPool; private final DataSource dataSource; private final int numRequests; @@ -27,10 +44,11 @@ public class MysqlBench { System.err.println("USAGE: java MysqlBench jdbc-url db-user db-password num-requests num-threads"); System.exit(1); } - + public static void main(String[] args) throws Exception { if(args.length != 5) - croak("Invalid number of command line arguments: expected 5 but got " + args.length +"."); + croak("Invalid number of command line arguments: expected 5 but got " + args.length + + "."); String jdbcUrl = args[0]; String user = args[1]; String password = args[2]; @@ -39,8 +57,12 @@ public class MysqlBench { MysqlBench bench = new MysqlBench(numThreads, numRequests, jdbcUrl, user, password); bench.benchmark(); } - - public MysqlBench(int numThreads, int numRequests, String connectionString, String username, String password) { + + public MysqlBench(int numThreads, + int numRequests, + String connectionString, + String username, + String password) { this.numThreads = numThreads; this.threadPool = Executors.newFixedThreadPool(numThreads); this.numRequests = numRequests; @@ -51,7 +73,7 @@ public class MysqlBench { ds.setUrl(connectionString); this.dataSource = ds; } - + private void upsert(String key, String value) throws Exception { Connection conn = dataSource.getConnection(); String upsert = "insert into test_table (key_, value_) values (?, ?) on duplicate key update value_ = ?"; @@ -62,11 +84,15 @@ public class MysqlBench { stmt.setString(3, value); stmt.executeUpdate(); } finally { - try { stmt.close(); } catch(Exception e) { } - try { conn.close(); } catch(Exception e) { } + try { + stmt.close(); + } catch(Exception e) {} + try { + conn.close(); + } catch(Exception e) {} } } - + private void deleteAll() throws Exception { Connection conn = dataSource.getConnection(); String delete = "delete from test_table"; @@ -74,11 +100,15 @@ public class MysqlBench { try { stmt.executeUpdate(); } finally { - try { stmt.close(); } catch(Exception e) { } - try { conn.close(); } catch(Exception e) { } + try { + stmt.close(); + } catch(Exception e) {} + try { + conn.close(); + } catch(Exception e) {} } } - + private String select(String key) throws Exception { Connection conn = dataSource.getConnection(); String upsert = "select value_ from test_table where key_ = ?"; @@ -92,33 +122,39 @@ public class MysqlBench { else return null; } finally { - try { stmt.close(); } catch(Exception e) { } - try { conn.close(); } catch(Exception e) { } + try { + stmt.close(); + } catch(Exception e) {} + try { + conn.close(); + } catch(Exception e) {} } } - + public void benchmark() throws Exception { System.out.println("WRITE TEST"); PerformanceTest writeTest = new PerformanceTest() { - public void doOperation(int index) throws Exception { - upsert(Integer.toString(index), Integer.toString(index)); - } + + public void doOperation(int index) throws Exception { + upsert(Integer.toString(index), Integer.toString(index)); + } }; writeTest.run(numRequests, numThreads); writeTest.printStats(); - + System.out.println(); - + System.out.println("READ TEST"); PerformanceTest readTest = new PerformanceTest() { - public void doOperation(int index) throws Exception { - select(Integer.toString(index)); - } + + public void doOperation(int index) throws Exception { + select(Integer.toString(index)); + } }; readTest.run(numRequests, numThreads); readTest.printStats(); - + deleteAll(); } - + } \ No newline at end of file test/integration/voldemort/performance/MysqlBench.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.performance; import java.sql.Connection; @@ -14,10 +30,11 @@ import java.util.concurrent.Future; import org.apache.commons.dbcp.BasicDataSource; /** - * create table test_table (key_ varchar(200) primary key, value_ varchar(200)) engine=InnoDB; + * create table test_table (key_ varchar(200) primary key, value_ varchar(200)) + * engine=InnoDB; * * @author jay - * + * */ public class MysqlGrowth { @@ -29,7 +46,7 @@ public class MysqlGrowth { final int totalSize = Integer.parseInt(args[0]); final int increment = Integer.parseInt(args[1]); final int threads = Integer.parseInt(args[2]); - + BasicDataSource ds = new BasicDataSource(); ds.setDriverClassName("com.mysql.jdbc.Driver"); ds.setUsername("root"); @@ -37,7 +54,7 @@ public class MysqlGrowth { ds.setUrl("jdbc:mysql://127.0.0.1:3306/test"); final Connection conn = ds.getConnection(); conn.createStatement().execute("truncate table test_table"); - + final Random rand = new Random(); int iterations = totalSize / increment; long[] readTimes = new long[iterations]; @@ -51,8 +68,11 @@ public class MysqlGrowth { for(int j = 0; j < increment; j++) { final int fj = j; results.add(service.submit(new Callable<Object>() { + public Object call() throws Exception { - upsert(conn, Integer.toString(fi*increment + fj), Integer.toString(fi*increment + fj)); + upsert(conn, + Integer.toString(fi * increment + fj), + Integer.toString(fi * increment + fj)); return null; } })); @@ -62,11 +82,12 @@ public class MysqlGrowth { writeTimes[i] = System.currentTimeMillis() - startTime; System.out.println("write: " + (writeTimes[i] / (double) increment)); results.clear(); - + startTime = System.currentTimeMillis(); for(int j = 0; j < increment; j++) { final int fj = j; results.add(service.submit(new Callable<Object>() { + public Object call() throws Exception { return select(conn, Integer.toString(rand.nextInt((fi + 1) * increment))); } @@ -78,7 +99,7 @@ public class MysqlGrowth { System.out.println("read: " + (readTimes[i] / (double) increment)); } conn.close(); - + System.out.println(); System.out.println("iteration read write:"); for(int i = 0; i < iterations; i++) { @@ -86,10 +107,10 @@ public class MysqlGrowth { System.out.print(" " + readTimes[i] / (double) increment); System.out.println(" " + writeTimes[i] / (double) increment); } - + System.exit(0); } - + private static void upsert(Connection conn, String key, String value) throws Exception { String upsert = "insert into test_table (key_, value_) values (?, ?) on duplicate key update value_ = ?"; PreparedStatement stmt = conn.prepareStatement(upsert); @@ -99,10 +120,12 @@ public class MysqlGrowth { stmt.setString(3, value); stmt.executeUpdate(); } finally { - try { stmt.close(); } catch(Exception e) { } + try { + stmt.close(); + } catch(Exception e) {} } } - + private static String select(Connection conn, String key) throws Exception { String upsert = "select value_ from test_table where key_ = ?"; PreparedStatement stmt = conn.prepareStatement(upsert); @@ -115,8 +138,10 @@ public class MysqlGrowth { else return null; } finally { - try { stmt.close(); } catch(Exception e) { } + try { + stmt.close(); + } catch(Exception e) {} } } - + } test/integration/voldemort/performance/MysqlGrowth.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.performance; import java.util.concurrent.CountDownLatch; @@ -10,23 +26,23 @@ import voldemort.TestUtils; import voldemort.utils.Time; public abstract class PerformanceTest { - + private final AtomicInteger numberOfFailures = new AtomicInteger(0); private long elapsedTimeNs; private long[] operationTimes; private volatile boolean hasCompleted; private int numberOfThreads; - + public abstract void doOperation(int index) throws Exception; - + public void setUp() { - // override me to do stuff + // override me to do stuff } - + public void tearDown() { - // override me to do stuff + // override me to do stuff } - + public void run(int numRequests, int numThreads) { setUp(); try { @@ -37,33 +53,33 @@ public abstract class PerformanceTest { ExecutorService executor = Executors.newFixedThreadPool(numThreads); final CountDownLatch latch = new CountDownLatch(numRequests); final AtomicInteger index = new AtomicInteger(0); - + long start = System.nanoTime(); for(int i = 0; i < numRequests; i++) { - executor.execute( - new Runnable() { - public void run() { - int current = index.getAndIncrement(); - long begin = System.nanoTime(); - try { - doOperation(current); - } catch(Exception e) { - numberOfFailures.getAndIncrement(); - e.printStackTrace(); - } finally { - operationTimes[current] = System.nanoTime() - begin; - latch.countDown(); - } - } - }); + executor.execute(new Runnable() { + + public void run() { + int current = index.getAndIncrement(); + long begin = System.nanoTime(); + try { + doOperation(current); + } catch(Exception e) { + numberOfFailures.getAndIncrement(); + e.printStackTrace(); + } finally { + operationTimes[current] = System.nanoTime() - begin; + latch.countDown(); + } + } + }); } - + try { latch.await(); } catch(InterruptedException e) { e.printStackTrace(); } - + this.hasCompleted = true; this.elapsedTimeNs = System.nanoTime() - start; executor.shutdownNow(); @@ -74,43 +90,44 @@ public abstract class PerformanceTest { tearDown(); } } - + public void printStats() { if(!hasCompleted) throw new RuntimeException("Hasn't finished running yet!"); System.out.println("Total number of operations: " + this.operationTimes.length); - System.out.println("Total elapsed seconds: " + this.elapsedTimeNs / (double) Time.NS_PER_SECOND); + System.out.println("Total elapsed seconds: " + this.elapsedTimeNs + / (double) Time.NS_PER_SECOND); System.out.println("Number of failures: " + this.numberOfFailures.get()); System.out.println("Number of threads: " + this.numberOfThreads); System.out.println("Avg. operations/second: " + getOperationsPerSecond()); System.out.println("Average time: " + getAverageOperationTimeMs() + " ms"); System.out.println("Median time: " + getOperationTimeMsQuantile(0.5d) + " ms"); - System.out.println("1st percentile: " + getOperationTimeMsQuantile(0.01d) + " ms"); - System.out.println("99th percentile: " + getOperationTimeMsQuantile(0.99d) + " ms"); + System.out.println("1st percentile: " + getOperationTimeMsQuantile(0.01d) + " ms"); + System.out.println("99th percentile: " + getOperationTimeMsQuantile(0.99d) + " ms"); } - + public double getOperationsPerSecond() { if(!hasCompleted) throw new RuntimeException("Hasn't finished running yet!"); double elapsedSeconds = this.elapsedTimeNs / (double) Time.NS_PER_SECOND; return this.operationTimes.length / elapsedSeconds; } - + public double getOperationTimeMsQuantile(double quantile) { if(!hasCompleted) throw new RuntimeException("Hasn't finished running yet!"); return TestUtils.quantile(this.operationTimes, quantile) / (double) Time.NS_PER_MS; } - + public double getAverageOperationTimeMs() { if(!hasCompleted) throw new RuntimeException("Hasn't finished running yet!"); - + double sum = 0.0; for(int i = 0; i < this.operationTimes.length; i++) sum += this.operationTimes[i]; sum /= Time.NS_PER_MS; return sum / this.operationTimes.length; } - + } test/integration/voldemort/performance/PerformanceTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.performance; import voldemort.client.HttpStoreClientFactory; @@ -8,22 +24,34 @@ import voldemort.utils.Props; public class RemoteHttpStoreLoadTest extends AbstractLoadTestHarness { - @Override - public StoreClient<String,String> getStore(Props propsA, Props propsB) throws java.lang.Exception { - System.out.println("Initializing master server."); - VoldemortServer serverA = new VoldemortServer(new VoldemortConfig(propsA)); - System.out.println("Initializing slave server."); - VoldemortServer serverB = new VoldemortServer(new VoldemortConfig(propsB)); - - serverA.start(); - serverB.start(); - - HttpStoreClientFactory factory = new HttpStoreClientFactory(5, 2000, 2000, 0, 2000, 2000, 10000, 10, 5, serverA.getIdentityNode().getHttpUrl().toString()); - return factory.getStoreClient("users"); - } - - public static void main(String[] args) throws Exception { - new RemoteHttpStoreLoadTest().run(args); - } + @Override + public StoreClient<String, String> getStore(Props propsA, Props propsB) + throws java.lang.Exception { + System.out.println("Initializing master server."); + VoldemortServer serverA = new VoldemortServer(new VoldemortConfig(propsA)); + System.out.println("Initializing slave server."); + VoldemortServer serverB = new VoldemortServer(new VoldemortConfig(propsB)); + + serverA.start(); + serverB.start(); + + HttpStoreClientFactory factory = new HttpStoreClientFactory(5, + 2000, + 2000, + 0, + 2000, + 2000, + 10000, + 10, + 5, + serverA.getIdentityNode() + .getHttpUrl() + .toString()); + return factory.getStoreClient("users"); + } + + public static void main(String[] args) throws Exception { + new RemoteHttpStoreLoadTest().run(args); + } } test/integration/voldemort/performance/RemoteHttpStoreLoadTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.performance; import java.util.List; @@ -24,17 +40,19 @@ import voldemort.utils.Utils; import voldemort.versioning.Versioned; public class RemoteStoreComparisonTest { - + public static void main(String[] args) throws Exception { if(args.length != 2) - Utils.croak("USAGE: java " + RemoteStoreComparisonTest.class.getName() + " numRequests numThreads"); - + Utils.croak("USAGE: java " + RemoteStoreComparisonTest.class.getName() + + " numRequests numThreads"); + int numRequests = Integer.parseInt(args[0]); int numThreads = Integer.parseInt(args[1]); - + /*** In memory test ***/ - final Store<byte[],byte[]> memStore = new InMemoryStorageEngine<byte[],byte[]>("test"); + final Store<byte[], byte[]> memStore = new InMemoryStorageEngine<byte[], byte[]>("test"); PerformanceTest memWriteTest = new PerformanceTest() { + public void doOperation(int i) { byte[] key = String.valueOf(i).getBytes(); memStore.put(key, new Versioned<byte[]>(key)); @@ -45,8 +63,9 @@ public class RemoteStoreComparisonTest { memWriteTest.run(numRequests, numThreads); memWriteTest.printStats(); System.out.println(); - + PerformanceTest memReadTest = new PerformanceTest() { + public void doOperation(int i) { try { List<Versioned<byte[]>> s = memStore.get(String.valueOf(i).getBytes()); @@ -61,18 +80,19 @@ public class RemoteStoreComparisonTest { memReadTest.printStats(); System.out.println(); System.out.println(); - + /*** Do Socket tests ***/ String storeName = "test"; - ConcurrentMap<String, Store<byte[],byte[]>> stores = new ConcurrentHashMap<String,Store<byte[],byte[]>>(1); - stores.put(storeName, new InMemoryStorageEngine<byte[],byte[]>(storeName)); + ConcurrentMap<String, Store<byte[], byte[]>> stores = new ConcurrentHashMap<String, Store<byte[], byte[]>>(1); + stores.put(storeName, new InMemoryStorageEngine<byte[], byte[]>(storeName)); SocketPool socketPool = new SocketPool(10, 10, 1000); final SocketStore socketStore = new SocketStore(storeName, "localhost", 6666, socketPool); SocketServer socketServer = new SocketServer(stores, 6666, 50, 50); socketServer.start(); socketServer.awaitStartupCompletion(); - + PerformanceTest socketWriteTest = new PerformanceTest() { + public void doOperation(int i) { byte[] key = String.valueOf(i).getBytes(); socketStore.put(key, new Versioned<byte[]>(key)); @@ -83,8 +103,9 @@ public class RemoteStoreComparisonTest { socketWriteTest.run(numRequests, numThreads); socketWriteTest.printStats(); System.out.println(); - + PerformanceTest socketReadTest = new PerformanceTest() { + public void doOperation(int i) { try { List<Versioned<byte[]>> s = socketStore.get(String.valueOf(i).getBytes()); @@ -99,32 +120,35 @@ public class RemoteStoreComparisonTest { socketReadTest.printStats(); System.out.println(); System.out.println(); - + socketStore.close(); socketPool.close(); socketServer.shutdown(); - + /*** Do HTTP tests ***/ - stores.put(storeName, new InMemoryStorageEngine<byte[],byte[]>(storeName)); + stores.put(storeName, new InMemoryStorageEngine<byte[], byte[]>(storeName)); HttpService httpService = new HttpService(storeName, null, numThreads, 8080); httpService.start(); HttpClient httpClient = new HttpClient(new MultiThreadedHttpConnectionManager()); HttpClientParams clientParams = httpClient.getParams(); - clientParams.setParameter(HttpClientParams.RETRY_HANDLER, new DefaultHttpMethodRetryHandler(0, false)); + clientParams.setParameter(HttpClientParams.RETRY_HANDLER, + new DefaultHttpMethodRetryHandler(0, false)); clientParams.setCookiePolicy(CookiePolicy.IGNORE_COOKIES); clientParams.setParameter("http.useragent", "test-agent"); HostConfiguration hostConfig = new HostConfiguration(); hostConfig.getParams().setParameter("http.protocol.version", HttpVersion.HTTP_1_1); httpClient.setHostConfiguration(hostConfig); - HttpConnectionManagerParams managerParams = httpClient.getHttpConnectionManager().getParams(); + HttpConnectionManagerParams managerParams = httpClient.getHttpConnectionManager() + .getParams(); managerParams.setConnectionTimeout(10000); managerParams.setMaxTotalConnections(numThreads); managerParams.setStaleCheckingEnabled(false); managerParams.setMaxConnectionsPerHost(httpClient.getHostConfiguration(), numThreads); final HttpStore httpStore = new HttpStore("test", "localhost", 8080, httpClient); Thread.sleep(400); - + PerformanceTest httpWriteTest = new PerformanceTest() { + public void doOperation(int i) { byte[] key = String.valueOf(i).getBytes(); httpStore.put(key, new Versioned<byte[]>(key)); @@ -135,8 +159,9 @@ public class RemoteStoreComparisonTest { httpWriteTest.run(numRequests, numThreads); httpWriteTest.printStats(); System.out.println(); - + PerformanceTest httpReadTest = new PerformanceTest() { + public void doOperation(int i) { List<Versioned<byte[]>> s = httpStore.get(String.valueOf(i).getBytes()); } @@ -144,7 +169,7 @@ public class RemoteStoreComparisonTest { System.out.println("Performing HTTP read test."); httpReadTest.run(numRequests, numThreads); httpReadTest.printStats(); - + httpService.stop(); } test/integration/voldemort/performance/RemoteStoreComparisonTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.performance; import static voldemort.utils.Utils.croak; @@ -14,18 +30,24 @@ import voldemort.versioning.Versioned; public class RemoteTest { - public static void main(String[] args) throws Exception { - if(args.length != 3) - croak("USAGE: java " + RemoteTest.class.getName() + " url size start_num"); + public static void main(String[] args) throws Exception { + if(args.length != 3) + croak("USAGE: java " + RemoteTest.class.getName() + " url size start_num"); + + System.err.println("Bootstraping cluster data."); + String url = args[0]; + int size = Integer.parseInt(args[1]); + int startNum = Integer.parseInt(args[2]); + StoreClientFactory factory = new SocketStoreClientFactory(Executors.newFixedThreadPool(8), + 6, + 12, + 2000, + 2000, + 2000, + url); + final StoreClient<String, String> store = factory.getStoreClient("test"); - System.err.println("Bootstraping cluster data."); - String url = args[0]; - int size = Integer.parseInt(args[1]); - int startNum = Integer.parseInt(args[2]); - StoreClientFactory factory = new SocketStoreClientFactory(Executors.newFixedThreadPool(8), 6, 12, 2000, 2000, 2000, url); - final StoreClient<String,String> store = factory.getStoreClient("test"); - - System.err.println("Beginning delete test."); + System.err.println("Beginning delete test."); final AtomicInteger count0 = new AtomicInteger(startNum); final AtomicInteger successes = new AtomicInteger(0); ExecutorService service = Executors.newFixedThreadPool(8); @@ -33,12 +55,13 @@ public class RemoteTest { final CountDownLatch latch0 = new CountDownLatch(size); for(int i = 0; i < size; i++) { service.execute(new Runnable() { + public void run() { try { String str = Integer.toString(count0.getAndIncrement()); store.delete(str); successes.getAndIncrement(); - } catch (Exception e) { + } catch(Exception e) { e.printStackTrace(); } finally { latch0.countDown(); @@ -50,53 +73,54 @@ public class RemoteTest { long deleteTime = System.currentTimeMillis() - start; System.out.println("Throughput: " + (size / (float) deleteTime * 1000) + " deletes/sec."); System.out.println(successes.get() + " things deleted."); - - - System.err.println("Beginning write test."); - final AtomicInteger count1 = new AtomicInteger(startNum); - start = System.currentTimeMillis(); - final CountDownLatch latch1 = new CountDownLatch(size); - for(int i = 0; i < size; i++) { - service.execute(new Runnable() { - public void run() { - try { - String str = Integer.toString(count1.getAndIncrement()); - store.put(str, new Versioned<String>(str)); - } catch (Exception e) { - e.printStackTrace(); - } finally { - latch1.countDown(); - } - } - }); - } - latch1.await(); - long writeTime = System.currentTimeMillis() - start; + + System.err.println("Beginning write test."); + final AtomicInteger count1 = new AtomicInteger(startNum); + start = System.currentTimeMillis(); + final CountDownLatch latch1 = new CountDownLatch(size); + for(int i = 0; i < size; i++) { + service.execute(new Runnable() { + + public void run() { + try { + String str = Integer.toString(count1.getAndIncrement()); + store.put(str, new Versioned<String>(str)); + } catch(Exception e) { + e.printStackTrace(); + } finally { + latch1.countDown(); + } + } + }); + } + latch1.await(); + long writeTime = System.currentTimeMillis() - start; System.out.println("Throughput: " + (size / (float) writeTime * 1000) + " writes/sec."); - + System.err.println("Beginning read test."); final CountDownLatch latch2 = new CountDownLatch(size); - start = System.currentTimeMillis(); - final AtomicInteger count2 = new AtomicInteger(startNum); - for(int i = 0; i < size; i++) { - service.execute(new Runnable() { - public void run() { - try { - String str = Integer.toString(count2.getAndIncrement()); - Versioned<String> found = store.get(str); - } catch(Exception e) { - e.printStackTrace(); - } finally { - latch2.countDown(); - } - } - }); - } - latch2.await(); - long readTime = System.currentTimeMillis() - start; - System.out.println("Throughput: " + (size / (float) readTime * 1000.0) + " reads/sec."); + start = System.currentTimeMillis(); + final AtomicInteger count2 = new AtomicInteger(startNum); + for(int i = 0; i < size; i++) { + service.execute(new Runnable() { + + public void run() { + try { + String str = Integer.toString(count2.getAndIncrement()); + Versioned<String> found = store.get(str); + } catch(Exception e) { + e.printStackTrace(); + } finally { + latch2.countDown(); + } + } + }); + } + latch2.await(); + long readTime = System.currentTimeMillis() - start; + System.out.println("Throughput: " + (size / (float) readTime * 1000.0) + " reads/sec."); - System.exit(0); - } + System.exit(0); + } } test/integration/voldemort/performance/RemoteTest.java @@ -1,31 +1,48 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.performance; import voldemort.client.StoreClient; -import voldemort.server.VoldemortServer; import voldemort.server.VoldemortConfig; +import voldemort.server.VoldemortServer; import voldemort.utils.Props; public class SemiLocalHttpStoreLoadTest extends AbstractLoadTestHarness { @Override - public StoreClient<String,String> getStore(Props propsA, Props propsB) throws java.lang.Exception { + public StoreClient<String, String> getStore(Props propsA, Props propsB) + throws java.lang.Exception { System.out.println("Initializing master server."); VoldemortServer serverA = new VoldemortServer(new VoldemortConfig(propsA)); System.out.println("Initializing slave server."); VoldemortServer serverB = new VoldemortServer(new VoldemortConfig(propsB)); - + serverA.start(); serverB.start(); - + return null; -// Clients.getSemiLocalRoutedHttpStoreClient(Collections.singletonList(serverA.getIdentityNode().getHttpUrl()), -// serverA.getStoreConfiguration(), -// "users", -// new StringSerializer("UTF-8"), -// serverA.getIdentityNode().getId(), -// 20); + // Clients.getSemiLocalRoutedHttpStoreClient(Collections.singletonList(serverA.getIdentityNode().getHttpUrl()), + // serverA.getStoreConfiguration(), + // "users", + // new StringSerializer("UTF-8"), + // serverA.getIdentityNode().getId(), + // 20); } - + public static void main(String[] args) throws Exception { new RemoteHttpStoreLoadTest().run(args); } test/integration/voldemort/performance/SemiLocalHttpStoreLoadTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort; import java.io.ByteArrayInputStream; @@ -13,44 +29,50 @@ import voldemort.utils.ByteUtils; import voldemort.utils.ReflectUtils; public class UtilsTest extends TestCase { - - public void testCat() { - assertTrue("Concatenation of empty arrays is not empty", - Arrays.equals(new byte[0], ByteUtils.cat(new byte[0], new byte[0]))); - assertTrue("Concatenation of no arrays is not empty", - Arrays.equals(new byte[0], ByteUtils.cat())); - assertTrue("Concatenation of arrays incorrect.", - Arrays.equals("abcdefg".getBytes(), - ByteUtils.cat("ab".getBytes(), "".getBytes(), "cdef".getBytes(), "g".getBytes()))); - } - - public void testCopy() { - assertTrue("Copy of no bytes is not empty array.", - Arrays.equals(new byte[0], ByteUtils.copy("hello".getBytes(), 0, 0))); - assertTrue("Copy of negetive bytes is not empty array.", - Arrays.equals(new byte[0], ByteUtils.copy("hello".getBytes(), 2, 0))); - assertTrue("Bytes copy incorrectly", - Arrays.equals("hell".getBytes(), ByteUtils.copy("hello".getBytes(), 0, 4))); - } - - public void testReadWriteShort() { - byte[] bytes = new byte[4]; - ByteUtils.writeShort(bytes, (short) 5, 0); - assertEquals("Read value not equal to written value.", (short) 5, ByteUtils.readShort(bytes, 0)); - ByteUtils.writeShort(bytes, (short) 500, 2); - assertEquals("Read value not equal to written value.", (short) 500, ByteUtils.readShort(bytes, 2)); - } - - public void testReadWriteLong() { - byte[] bytes = new byte[8]; - ByteUtils.writeLong(bytes, 5, 0); - assertEquals("Read value not equal to written value.", 5, ByteUtils.readLong(bytes, 0)); - long value = System.currentTimeMillis(); - ByteUtils.writeLong(bytes, value, 0); - assertEquals("Read value not equal to written value.", value, ByteUtils.readLong(bytes, 0)); - } - - public void testReadWriteInt() { + + public void testCat() { + assertTrue("Concatenation of empty arrays is not empty", + Arrays.equals(new byte[0], ByteUtils.cat(new byte[0], new byte[0]))); + assertTrue("Concatenation of no arrays is not empty", Arrays.equals(new byte[0], + ByteUtils.cat())); + assertTrue("Concatenation of arrays incorrect.", + Arrays.equals("abcdefg".getBytes(), ByteUtils.cat("ab".getBytes(), + "".getBytes(), + "cdef".getBytes(), + "g".getBytes()))); + } + + public void testCopy() { + assertTrue("Copy of no bytes is not empty array.", + Arrays.equals(new byte[0], ByteUtils.copy("hello".getBytes(), 0, 0))); + assertTrue("Copy of negetive bytes is not empty array.", + Arrays.equals(new byte[0], ByteUtils.copy("hello".getBytes(), 2, 0))); + assertTrue("Bytes copy incorrectly", + Arrays.equals("hell".getBytes(), ByteUtils.copy("hello".getBytes(), 0, 4))); + } + + public void testReadWriteShort() { + byte[] bytes = new byte[4]; + ByteUtils.writeShort(bytes, (short) 5, 0); + assertEquals("Read value not equal to written value.", + (short) 5, + ByteUtils.readShort(bytes, 0)); + ByteUtils.writeShort(bytes, (short) 500, 2); + assertEquals("Read value not equal to written value.", + (short) 500, + ByteUtils.readShort(bytes, 2)); + } + + public void testReadWriteLong() { + byte[] bytes = new byte[8]; + ByteUtils.writeLong(bytes, 5, 0); + assertEquals("Read value not equal to written value.", 5, ByteUtils.readLong(bytes, 0)); + long value = System.currentTimeMillis(); + ByteUtils.writeLong(bytes, value, 0); + assertEquals("Read value not equal to written value.", value, ByteUtils.readLong(bytes, 0)); + } + + public void testReadWriteInt() { byte[] bytes = new byte[8]; ByteUtils.writeInt(bytes, 5, 0); assertEquals("Read value not equal to written value.", 5, ByteUtils.readInt(bytes, 0)); @@ -58,99 +80,117 @@ public class UtilsTest extends TestCase { ByteUtils.writeInt(bytes, value, 0); assertEquals("Read value not equal to written value.", value, ByteUtils.readInt(bytes, 0)); } - - public void testConstruct() { - String str = "hello"; - String str2 = ReflectUtils.construct(String.class, new Object[]{str}); - assertEquals(str, str2); - } - - public void testReadWriteBytes() { - byte[] bytes = new byte[8]; - ByteUtils.writeBytes(bytes, 5, 0, 8); - assertEquals("Read value not equal to written value.", 5, ByteUtils.readBytes(bytes, 0, 8)); - long value = System.currentTimeMillis(); - ByteUtils.writeBytes(bytes, value, 0, 8); - assertEquals("Read value not equal to written value.", value, ByteUtils.readBytes(bytes, 0, 8)); - bytes = new byte[24]; - ByteUtils.writeBytes(bytes, value, 8, 8); - assertEquals("Read value not equal to written value.", value, ByteUtils.readBytes(bytes, 8, 8)); - } - - public void testGetNumberOfRequiredBytes() { - assertEquals(1, ByteUtils.numberOfBytesRequired(0)); - assertEquals(1, ByteUtils.numberOfBytesRequired(1)); - assertEquals(2, ByteUtils.numberOfBytesRequired(257)); - assertEquals(3, ByteUtils.numberOfBytesRequired(3 * Short.MAX_VALUE)); - - } - - public void testToString() { - assertEquals("010203", ByteUtils.toHexString(new byte[]{1,2,3})); - assertEquals("afadae", ByteUtils.toHexString(new byte[]{(byte) 0xaf, (byte) 0xad, (byte) 0xae})); - assertEquals("00000001" + "00000010" + "00000011", ByteUtils.toBinaryString(new byte[]{1,2,3})); - assertEquals("10101111" + "10101101" + "10101110", ByteUtils.toBinaryString(new byte[]{(byte) 0xaf, (byte) 0xad, (byte) 0xae})); - - } - - public void testNthByte() { - assertEquals((byte) 0xFF, ByteUtils.readNthByte(Long.MAX_VALUE, 0)); - assertEquals((byte) 0xFF, ByteUtils.readNthByte(Long.MAX_VALUE, 1)); - testNthByteRead("aa", "bbaa", 0); - testNthByteRead("bb", "bbaa", 1); - testNthByteRead("bb", "bbaa", 1); - testNthByteRead("cc", "aabbccddeeff", 3); - } - - public void testNthByteRead(String theByte, String theLong, int nth) { - assertEquals(2, theByte.length()); - assertTrue(theByte.length() <= theLong.length()); - long asLong = Long.parseLong(theLong, 16); - byte asByte = (byte) Short.parseShort(theByte, 16); - assertEquals(asByte, ByteUtils.readNthByte(asLong, nth)); - } - - public void testVarNumberSerialization() throws Exception { - varNumber(128); - List<Long> values = Arrays.asList(0L, 1L, 2L, 62L, 63L, 64L, - 126L, 127L, 128L, 536870911L, - 536870912L, 2147483647L, 2147483657L, - 17179869184L); - for(long v: values) { - varNumber(v); - // varNumber(-v); - } - } - - public void varNumber(long value) throws IOException { - //System.out.println("Got: " + Long.toBinaryString(value)); - ByteArrayOutputStream out = new ByteArrayOutputStream(); - DataOutputStream dataOut = new DataOutputStream(out); - ByteUtils.writeVarNumber(value, dataOut); - dataOut.flush(); - //System.out.println("Bytes: " + ByteUtils.toBinaryString(out.toByteArray())); - ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); - DataInputStream dataIn = new DataInputStream(in); - long found = ByteUtils.readVarNumber(dataIn); - //System.out.println("Found: " + Long.toBinaryString(found)); - assertEquals(value, found); - } - - public void testMd5() { - ByteUtils.md5("hello".getBytes()); - } - - public void testSha1() { - ByteUtils.sha1("hello".getBytes()); - } - - public void testByteComparison() { - assertEquals(0, ByteUtils.compare(new byte[]{}, new byte[]{})); - assertEquals(1, ByteUtils.compare(new byte[]{1}, new byte[]{})); - assertEquals(-1, ByteUtils.compare(new byte[]{}, new byte[]{1})); - assertEquals(0, ByteUtils.compare(new byte[]{0,1,2}, new byte[]{0,1,2})); - assertEquals(-1, ByteUtils.compare(new byte[]{0,1,1}, new byte[]{0,1,2})); - assertEquals(-1, ByteUtils.compare(new byte[]{-1,2,3}, new byte[]{0,1,2})); - } - + + public void testConstruct() { + String str = "hello"; + String str2 = ReflectUtils.construct(String.class, new Object[] { str }); + assertEquals(str, str2); + } + + public void testReadWriteBytes() { + byte[] bytes = new byte[8]; + ByteUtils.writeBytes(bytes, 5, 0, 8); + assertEquals("Read value not equal to written value.", 5, ByteUtils.readBytes(bytes, 0, 8)); + long value = System.currentTimeMillis(); + ByteUtils.writeBytes(bytes, value, 0, 8); + assertEquals("Read value not equal to written value.", value, ByteUtils.readBytes(bytes, + 0, + 8)); + bytes = new byte[24]; + ByteUtils.writeBytes(bytes, value, 8, 8); + assertEquals("Read value not equal to written value.", value, ByteUtils.readBytes(bytes, + 8, + 8)); + } + + public void testGetNumberOfRequiredBytes() { + assertEquals(1, ByteUtils.numberOfBytesRequired(0)); + assertEquals(1, ByteUtils.numberOfBytesRequired(1)); + assertEquals(2, ByteUtils.numberOfBytesRequired(257)); + assertEquals(3, ByteUtils.numberOfBytesRequired(3 * Short.MAX_VALUE)); + + } + + public void testToString() { + assertEquals("010203", ByteUtils.toHexString(new byte[] { 1, 2, 3 })); + assertEquals("afadae", ByteUtils.toHexString(new byte[] { (byte) 0xaf, (byte) 0xad, + (byte) 0xae })); + assertEquals("00000001" + "00000010" + "00000011", ByteUtils.toBinaryString(new byte[] { 1, + 2, 3 })); + assertEquals("10101111" + "10101101" + "10101110", ByteUtils.toBinaryString(new byte[] { + (byte) 0xaf, (byte) 0xad, (byte) 0xae })); + + } + + public void testNthByte() { + assertEquals((byte) 0xFF, ByteUtils.readNthByte(Long.MAX_VALUE, 0)); + assertEquals((byte) 0xFF, ByteUtils.readNthByte(Long.MAX_VALUE, 1)); + testNthByteRead("aa", "bbaa", 0); + testNthByteRead("bb", "bbaa", 1); + testNthByteRead("bb", "bbaa", 1); + testNthByteRead("cc", "aabbccddeeff", 3); + } + + public void testNthByteRead(String theByte, String theLong, int nth) { + assertEquals(2, theByte.length()); + assertTrue(theByte.length() <= theLong.length()); + long asLong = Long.parseLong(theLong, 16); + byte asByte = (byte) Short.parseShort(theByte, 16); + assertEquals(asByte, ByteUtils.readNthByte(asLong, nth)); + } + + public void testVarNumberSerialization() throws Exception { + varNumber(128); + List<Long> values = Arrays.asList(0L, + 1L, + 2L, + 62L, + 63L, + 64L, + 126L, + 127L, + 128L, + 536870911L, + 536870912L, + 2147483647L, + 2147483657L, + 17179869184L); + for(long v: values) { + varNumber(v); + // varNumber(-v); + } + } + + public void varNumber(long value) throws IOException { + // System.out.println("Got: " + Long.toBinaryString(value)); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + DataOutputStream dataOut = new DataOutputStream(out); + ByteUtils.writeVarNumber(value, dataOut); + dataOut.flush(); + // System.out.println("Bytes: " + + // ByteUtils.toBinaryString(out.toByteArray())); + ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()); + DataInputStream dataIn = new DataInputStream(in); + long found = ByteUtils.readVarNumber(dataIn); + // System.out.println("Found: " + Long.toBinaryString(found)); + assertEquals(value, found); + } + + public void testMd5() { + ByteUtils.md5("hello".getBytes()); + } + + public void testSha1() { + ByteUtils.sha1("hello".getBytes()); + } + + public void testByteComparison() { + assertEquals(0, ByteUtils.compare(new byte[] {}, new byte[] {})); + assertEquals(1, ByteUtils.compare(new byte[] { 1 }, new byte[] {})); + assertEquals(-1, ByteUtils.compare(new byte[] {}, new byte[] { 1 })); + assertEquals(0, ByteUtils.compare(new byte[] { 0, 1, 2 }, new byte[] { 0, 1, 2 })); + assertEquals(-1, ByteUtils.compare(new byte[] { 0, 1, 1 }, new byte[] { 0, 1, 2 })); + assertEquals(-1, ByteUtils.compare(new byte[] { -1, 2, 3 }, new byte[] { 0, 1, 2 })); + } + } test/unit/voldemort/UtilsTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.client; import java.net.URISyntaxException; test/unit/voldemort/client/AbstractStoreClientFactoryTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.client; import org.mortbay.jetty.Server; @@ -9,7 +25,7 @@ import voldemort.store.http.HttpStore; /** * @author jay - * + * */ public class HttpStoreClientFactoryTest extends AbstractStoreClientFactoryTest { @@ -17,33 +33,44 @@ public class HttpStoreClientFactoryTest extends AbstractStoreClientFactoryTest { private Server server; private Context context; private String url; - + public void setUp() throws Exception { super.setUp(); int httpPort = 8080; url = "http://localhost:" + httpPort; - context = ServerTestUtils.getJettyServer(getClusterXml(), - getStoreDefXml(), - getValidStoreName(), + context = ServerTestUtils.getJettyServer(getClusterXml(), + getStoreDefXml(), + getValidStoreName(), httpPort); server = context.getServer(); httpStore = ServerTestUtils.getHttpStore(getValidStoreName(), httpPort); } - + public void tearDown() throws Exception { httpStore.close(); server.stop(); context.destroy(); } - + @Override - protected StoreClientFactory getFactory(String...bootstrapUrls) { + protected StoreClientFactory getFactory(String... bootstrapUrls) { return new HttpStoreClientFactory(4, bootstrapUrls); } - + @Override - protected StoreClientFactory getFactoryWithSerializer(SerializerFactory factory, String...bootstrapUrls) { - return new HttpStoreClientFactory(3, 1000, 1000, 0, 1000, 1000, 10000, 10, 10, factory, bootstrapUrls); + protected StoreClientFactory getFactoryWithSerializer(SerializerFactory factory, + String... bootstrapUrls) { + return new HttpStoreClientFactory(3, + 1000, + 1000, + 0, + 1000, + 1000, + 10000, + 10, + 10, + factory, + bootstrapUrls); } @Override test/unit/voldemort/client/HttpStoreClientFactoryTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.client; import java.net.URISyntaxException; @@ -9,16 +25,16 @@ import voldemort.server.socket.SocketServer; /** * @author jay - * + * */ public class SocketStoreClientFactoryTest extends AbstractStoreClientFactoryTest { private SocketServer server; - + public SocketStoreClientFactoryTest() { super(); } - + @Override public void setUp() throws Exception { super.setUp(); @@ -32,18 +48,25 @@ public class SocketStoreClientFactoryTest extends AbstractStoreClientFactoryTest super.tearDown(); server.shutdown(); } - + @Override - protected StoreClientFactory getFactory(String...bootstrapUrls) { - return new SocketStoreClientFactory(Executors.newCachedThreadPool(), 5, 10, 1000, 1000, 10000, bootstrapUrls); + protected StoreClientFactory getFactory(String... bootstrapUrls) { + return new SocketStoreClientFactory(Executors.newCachedThreadPool(), + 5, + 10, + 1000, + 1000, + 10000, + bootstrapUrls); } @Override - protected StoreClientFactory getFactoryWithSerializer(SerializerFactory factory, String...bootstrapUrls) { - return new SocketStoreClientFactory(Executors.newCachedThreadPool(), - 5, - 10, - 1000, + protected StoreClientFactory getFactoryWithSerializer(SerializerFactory factory, + String... bootstrapUrls) { + return new SocketStoreClientFactory(Executors.newCachedThreadPool(), + 5, + 10, + 1000, 1000, 1000, factory, test/unit/voldemort/client/SocketStoreClientFactoryTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.cluster; import java.util.HashSet; @@ -14,55 +30,75 @@ public class TestCluster extends TestCase { private MockTime time = new MockTime(); private List<Node> nodes; private Cluster cluster; - + public void setUp() { - this.nodes = ImmutableList.of(new Node(1, "test1", 1, 1, ImmutableList.of(1,2,3), new NodeStatus(time)), - new Node(2, "test1", 2, 2, ImmutableList.of(3,5,6), new NodeStatus(time)), - new Node(3, "test1", 3, 3, ImmutableList.of(7,8,9), new NodeStatus(time)), - new Node(4, "test1", 4, 4, ImmutableList.of(10,11,12), new NodeStatus(time))); + this.nodes = ImmutableList.of(new Node(1, + "test1", + 1, + 1, + ImmutableList.of(1, 2, 3), + new NodeStatus(time)), + new Node(2, + "test1", + 2, + 2, + ImmutableList.of(3, 5, 6), + new NodeStatus(time)), + new Node(3, + "test1", + 3, + 3, + ImmutableList.of(7, 8, 9), + new NodeStatus(time)), + new Node(4, + "test1", + 4, + 4, + ImmutableList.of(10, 11, 12), + new NodeStatus(time))); this.cluster = new Cluster(clusterName, nodes); } - + public void testBasics() { assertEquals(nodes.size(), cluster.getNumberOfNodes()); assertEquals(new HashSet<Node>(nodes), new HashSet<Node>(cluster.getNodes())); assertEquals(clusterName, cluster.getName()); assertEquals(nodes.get(0), cluster.getNodeById(1)); } - + public void testStatusBeginsAsAvailable() { for(Node n: cluster.getNodes()) { assertTrue("Node " + n.getId() + " is not available.", n.getStatus().isAvailable()); assertFalse("Node " + n.getId() + " is not available.", n.getStatus().isUnavailable()); } } - + public void testUnavailability() { Node n = cluster.getNodeById(1); NodeStatus status = n.getStatus(); - + // begins available assertTrue(status.isAvailable()); assertFalse(status.isUnavailable()); - + // if set unavailable, is unavailable status.setUnavailable(); assertFalse(status.isAvailable()); assertTrue(status.isUnavailable()); assertTrue(status.isUnavailable(10)); - + // after 11 ms of no ops, still unavailable, but not // if checked with expiration time.addMilliseconds(11); assertTrue(status.isUnavailable()); assertFalse(status.isAvailable()); assertFalse(status.isUnavailable(10)); - + // if we set it back to available then it is available again status.setAvailable(); assertTrue(status.isAvailable()); assertFalse(status.isUnavailable()); assertFalse(status.isUnavailable(10)); } - + } test/unit/voldemort/cluster/TestCluster.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.routing; import java.text.NumberFormat; @@ -23,10 +39,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Multiset; public class ConsistentRoutingStrategyTest extends TestCase { - + private final byte[] key = new byte[0]; private final Time time = new MockTime(0); - + private List<Node> getTestNodes() { return ImmutableList.of(node(0, 2, 7, 14), node(1, 1, 10, 13), @@ -35,130 +51,139 @@ public class ConsistentRoutingStrategyTest extends TestCase { node(4, 6, 9, 15), node(5, 4, 8, 12)); } - + public ConsistentRoutingStrategy getRouter(HashFunction hash, int replicationFactor) { return new ConsistentRoutingStrategy(hash, getTestNodes(), replicationFactor); } - + public ConsistentRoutingStrategy getRouter(int hashValue, int replicationFactor) { List<Node> nodes = getTestNodes(); - return new ConsistentRoutingStrategy(new ConstantHashFunction(hashValue), - nodes, replicationFactor); - } - - public void test1xReplication() { - assertNodeOrder(getRouter(0, 1).routeRequest(key), 3); - assertNodeOrder(getRouter(14, 1).routeRequest(key), 0); - assertNodeOrder(getRouter(4, 1).routeRequest(key), 5); - } - - public void test3xReplcation() { - assertNodeOrder(getRouter(0, 3).routeRequest(key), 3, 1, 0); + return new ConsistentRoutingStrategy(new ConstantHashFunction(hashValue), + nodes, + replicationFactor); + } + + public void test1xReplication() { + assertNodeOrder(getRouter(0, 1).routeRequest(key), 3); + assertNodeOrder(getRouter(14, 1).routeRequest(key), 0); + assertNodeOrder(getRouter(4, 1).routeRequest(key), 5); + } + + public void test3xReplcation() { + assertNodeOrder(getRouter(0, 3).routeRequest(key), 3, 1, 0); assertNodeOrder(getRouter(14, 3).routeRequest(key), 0, 4, 3); - assertNodeOrder(getRouter(4, 3).routeRequest(key), 5, 2, 4); - assertNodeOrder(getRouter(16, 3).routeRequest(key), 3, 2, 1); - } - - public void testGetNodes() { - getRouter(0, 3).getNodes().containsAll(getTestNodes()); - } - - public void testTagAssignment() { - List<Node> nodes = getTestNodes(); - ConsistentRoutingStrategy router = getRouter(new FnvHashFunction(), 3); - for(Node n: nodes) - for(Integer tag: n.getPartitionIds()) - assertEquals(router.getNodeByPartition(tag), n); - for(int i = 0; i < nodes.size(); i++) - assertEquals("Unexpected tag assignment for tag " + i + ": ", - new HashSet<Integer>(nodes.get(i).getPartitionIds()), - router.getPartitionsByNode(nodes.get(i))); - } - - public void testLoadBalancing() { - testLoadBalancing(2, 10, 1000, 2); - testLoadBalancing(6, 100, 1000, 3); - testLoadBalancing(10, 200, 10000, 3); - } - - public void testLoadBalancing(int numNodes, int tagsPerNode, int numRequests, int replicationFactor) { - List<Integer> tags = new ArrayList<Integer>(); - List<Node> nodes = new ArrayList<Node>(); - for(int i = 0; i < numNodes * tagsPerNode; i++) - tags.add(i); - - for(int i = 0; i < numNodes; i++) - nodes.add(new Node(i, "host", 8080, 6666, tags.subList(tagsPerNode * i, tagsPerNode * (i + 1)))); - - // use a seed so that this test is repeatable + assertNodeOrder(getRouter(4, 3).routeRequest(key), 5, 2, 4); + assertNodeOrder(getRouter(16, 3).routeRequest(key), 3, 2, 1); + } + + public void testGetNodes() { + getRouter(0, 3).getNodes().containsAll(getTestNodes()); + } + + public void testTagAssignment() { + List<Node> nodes = getTestNodes(); + ConsistentRoutingStrategy router = getRouter(new FnvHashFunction(), 3); + for(Node n: nodes) + for(Integer tag: n.getPartitionIds()) + assertEquals(router.getNodeByPartition(tag), n); + for(int i = 0; i < nodes.size(); i++) + assertEquals("Unexpected tag assignment for tag " + i + ": ", + new HashSet<Integer>(nodes.get(i).getPartitionIds()), + router.getPartitionsByNode(nodes.get(i))); + } + + public void testLoadBalancing() { + testLoadBalancing(2, 10, 1000, 2); + testLoadBalancing(6, 100, 1000, 3); + testLoadBalancing(10, 200, 10000, 3); + } + + public void testLoadBalancing(int numNodes, + int tagsPerNode, + int numRequests, + int replicationFactor) { + List<Integer> tags = new ArrayList<Integer>(); + List<Node> nodes = new ArrayList<Node>(); + for(int i = 0; i < numNodes * tagsPerNode; i++) + tags.add(i); + + for(int i = 0; i < numNodes; i++) + nodes.add(new Node(i, "host", 8080, 6666, tags.subList(tagsPerNode * i, tagsPerNode + * (i + 1)))); + + // use a seed so that this test is repeatable Random random = new Random(2158745224L); - Collections.shuffle(nodes, random); - - ConsistentRoutingStrategy router = new ConsistentRoutingStrategy(new FnvHashFunction(), nodes, replicationFactor); + Collections.shuffle(nodes, random); + + ConsistentRoutingStrategy router = new ConsistentRoutingStrategy(new FnvHashFunction(), + nodes, + replicationFactor); for(Node n: nodes) assertEquals(tagsPerNode, router.getPartitionsByNode(n).size()); - - // do some requests and test the load balancing - Multiset<Integer> masters = new HashMultiset<Integer>(); - Multiset<Integer> counts = new HashMultiset<Integer>(); - byte[] key = new byte[16]; - for(int i = 0; i < numRequests; i++) { - random.nextBytes(key); - List<Node> routed = router.routeRequest(key); - assertEquals(replicationFactor, routed.size()); - masters.add(routed.get(0).getId()); - for(Node n: routed) - counts.add(n.getId()); - } - - System.out.println("numNodes = " + numNodes + ", tagsPerNode = " + tagsPerNode + - ", numRequests = " + numRequests); - System.out.println("master node distribution:"); - assertWellBalanced(numNodes, masters); - System.out.println(); - System.out.println("storage node distribution:"); - assertWellBalanced(numNodes, counts); - System.out.println(); - } - - private void assertWellBalanced(int numNodes, Multiset<Integer> ids) { - // compute the chi-sq statistic - double expected = ids.size() / (double) numNodes; - double chiSq = 0.0; - int df = numNodes - 1; + + // do some requests and test the load balancing + Multiset<Integer> masters = new HashMultiset<Integer>(); + Multiset<Integer> counts = new HashMultiset<Integer>(); + byte[] key = new byte[16]; + for(int i = 0; i < numRequests; i++) { + random.nextBytes(key); + List<Node> routed = router.routeRequest(key); + assertEquals(replicationFactor, routed.size()); + masters.add(routed.get(0).getId()); + for(Node n: routed) + counts.add(n.getId()); + } + + System.out.println("numNodes = " + numNodes + ", tagsPerNode = " + tagsPerNode + + ", numRequests = " + numRequests); + System.out.println("master node distribution:"); + assertWellBalanced(numNodes, masters); + System.out.println(); + System.out.println("storage node distribution:"); + assertWellBalanced(numNodes, counts); + System.out.println(); + } + + private void assertWellBalanced(int numNodes, Multiset<Integer> ids) { + // compute the chi-sq statistic + double expected = ids.size() / (double) numNodes; + double chiSq = 0.0; + int df = numNodes - 1; NumberFormat prct = NumberFormat.getPercentInstance(); prct.setMaximumFractionDigits(4); NumberFormat num = NumberFormat.getInstance(); num.setMaximumFractionDigits(4); num.setMinimumFractionDigits(4); - System.out.println("node\treqs\tX^2\tskew"); - for(Integer id: ids.elementSet()) { - System.out.println(id + "\t" + ids.count(id) + "\t" + num.format(chiSq(ids.count(id), expected)) + "\t" + prct.format((ids.count(id) - expected)/expected)); - chiSq += chiSq(ids.count(id), expected); - } - System.out.println("X^2 = " + chiSq); - ChiSquare dist = new ChiSquare(df, new MersenneTwister()); - // p-value is ~= prob of seeing this distribution from fair router - double pValue = 1.0 - dist.cdf(chiSq); - System.out.println("p-value = " + pValue); - assertTrue("Non-uniform load distribution detected.", pValue >= 0.05); - } - - private double chiSq(double observed, double expected) { - return (observed - expected) * (observed - expected) / expected; - } - - private void assertNodeOrder(List<Node> found, int...expected) { - assertEquals("Router produced unexpected number of nodes.", expected.length, found.size()); - for(int i = 0; i < found.size(); i++) - assertEquals(expected[i], found.get(i).getId()); - } - - private Node node(int id, int...tags) { - List<Integer> list = new ArrayList<Integer>(tags.length); - for(int tag: tags) - list.add(tag); - return new Node(id, "localhost", 8080, 6666, list, new NodeStatus(time)); - } + System.out.println("node\treqs\tX^2\tskew"); + for(Integer id: ids.elementSet()) { + System.out.println(id + "\t" + ids.count(id) + "\t" + + num.format(chiSq(ids.count(id), expected)) + "\t" + + prct.format((ids.count(id) - expected) / expected)); + chiSq += chiSq(ids.count(id), expected); + } + System.out.println("X^2 = " + chiSq); + ChiSquare dist = new ChiSquare(df, new MersenneTwister()); + // p-value is ~= prob of seeing this distribution from fair router + double pValue = 1.0 - dist.cdf(chiSq); + System.out.println("p-value = " + pValue); + assertTrue("Non-uniform load distribution detected.", pValue >= 0.05); + } + + private double chiSq(double observed, double expected) { + return (observed - expected) * (observed - expected) / expected; + } + + private void assertNodeOrder(List<Node> found, int... expected) { + assertEquals("Router produced unexpected number of nodes.", expected.length, found.size()); + for(int i = 0; i < found.size(); i++) + assertEquals(expected[i], found.get(i).getId()); + } + + private Node node(int id, int... tags) { + List<Integer> list = new ArrayList<Integer>(tags.length); + for(int tag: tags) + list.add(tag); + return new Node(id, "localhost", 8080, 6666, list, new NodeStatus(time)); + } } test/unit/voldemort/routing/ConsistentRoutingStrategyTest.java @@ -1,25 +1,35 @@ -/** +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. */ -package voldemort.routing; +package voldemort.routing; import junit.framework.TestCase; /** * @author jay - * + * */ public class PartitionedRoutingStrategyTest extends TestCase { - public void setUp() throws Exception { - } + public void setUp() throws Exception {} + + public void tearDown() throws Exception {} - public void tearDown() throws Exception { - } - - public void testToWrite() { - // fail("Write some tests."); - } + public void testToWrite() { + // fail("Write some tests."); + } } test/unit/voldemort/routing/PartitionedRoutingStrategyTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.scheduled; import java.util.List; @@ -40,7 +56,7 @@ public class DataCleanupJobTest extends TestCase { } private void put(String... items) { - for(String item : items) { + for(String item: items) { VectorClock clock = null; List<Versioned<String>> found = engine.get(item); if(found.size() == 0) { @@ -56,7 +72,7 @@ public class DataCleanupJobTest extends TestCase { } private void assertContains(String... keys) { - for(String key : keys) { + for(String key: keys) { List<Versioned<String>> found = engine.get(key); assertTrue("Did not find key '" + key + "' in store!", found.size() > 0); } test/unit/voldemort/scheduled/DataCleanupJobTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.scheduled; import static voldemort.TestUtils.bytesEqual; @@ -18,51 +34,60 @@ import voldemort.store.slop.Slop.Operation; import voldemort.versioning.Versioned; public class SlopPusherTest extends TestCase { - - private StorageEngine<byte[],Slop> slopStore; - private Map<Integer,Store<byte[],byte[]>> stores; - private SlopPusherJob pusher; - private Random random; - - public SlopPusherTest(String name) { - super(name); - } - protected void setUp() throws Exception { - slopStore = new InMemoryStorageEngine<byte[],Slop>("slop"); - stores = new HashMap<Integer,Store<byte[],byte[]>>(); - stores.put(0, new InMemoryStorageEngine<byte[],byte[]>("0")); - stores.put(1, new InMemoryStorageEngine<byte[],byte[]>("1")); - stores.put(2, new InMemoryStorageEngine<byte[],byte[]>("2")); - pusher = new SlopPusherJob(slopStore, stores); - random = new Random(); - } - - private Slop randomSlop(String name, int nodeId) { - return new Slop(name, Operation.PUT, TestUtils.randomBytes(10), TestUtils.randomBytes(10), nodeId, new Date()); - } - - private void testPush(Versioned<Slop>...slops) { - // put all the slop in the slop store - for(Versioned<Slop> s: slops) - slopStore.put(s.getValue().makeKey(), s); - - // run the pusher - pusher.run(); - - // now all the slop should be gone and the various stores should have those items - for(Versioned<Slop> vs: slops) { - // check that all the slops are in the stores - // and no new slops have appeared - // and the SloppyStore is now empty - Slop slop = vs.getValue(); - assertEquals("Slop remains.", 0, slopStore.get(slop.makeKey()).size()); - assertTrue(bytesEqual(slop.getValue(), stores.get(slop.getNodeId()).get(slop.makeKey()).get(0).getValue())); - } - } + private StorageEngine<byte[], Slop> slopStore; + private Map<Integer, Store<byte[], byte[]>> stores; + private SlopPusherJob pusher; + private Random random; + + public SlopPusherTest(String name) { + super(name); + } + + protected void setUp() throws Exception { + slopStore = new InMemoryStorageEngine<byte[], Slop>("slop"); + stores = new HashMap<Integer, Store<byte[], byte[]>>(); + stores.put(0, new InMemoryStorageEngine<byte[], byte[]>("0")); + stores.put(1, new InMemoryStorageEngine<byte[], byte[]>("1")); + stores.put(2, new InMemoryStorageEngine<byte[], byte[]>("2")); + pusher = new SlopPusherJob(slopStore, stores); + random = new Random(); + } + + private Slop randomSlop(String name, int nodeId) { + return new Slop(name, + Operation.PUT, + TestUtils.randomBytes(10), + TestUtils.randomBytes(10), + nodeId, + new Date()); + } + + private void testPush(Versioned<Slop>... slops) { + // put all the slop in the slop store + for(Versioned<Slop> s: slops) + slopStore.put(s.getValue().makeKey(), s); + + // run the pusher + pusher.run(); + + // now all the slop should be gone and the various stores should have + // those items + for(Versioned<Slop> vs: slops) { + // check that all the slops are in the stores + // and no new slops have appeared + // and the SloppyStore is now empty + Slop slop = vs.getValue(); + assertEquals("Slop remains.", 0, slopStore.get(slop.makeKey()).size()); + assertTrue(bytesEqual(slop.getValue(), stores.get(slop.getNodeId()) + .get(slop.makeKey()) + .get(0) + .getValue())); + } + } - @SuppressWarnings("unchecked") - public void testPushSingleSlop() { - testPush(new Versioned<Slop>(randomSlop("0", 0))); - } + @SuppressWarnings("unchecked") + public void testPushSingleSlop() { + testPush(new Versioned<Slop>(randomSlop("0", 0))); + } } test/unit/voldemort/scheduled/SlopPusherTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization; import java.util.Date; @@ -6,21 +22,37 @@ import junit.framework.TestCase; import voldemort.store.slop.Slop; public class SlopSerializerTest extends TestCase { - - private SlopSerializer serializer; - - public void setUp() { - this.serializer = new SlopSerializer(); - } - - private void assertSerializes(Slop slop) { - assertEquals(slop, this.serializer.toObject(this.serializer.toBytes(slop))); - } - - public void testSerialization() { - assertSerializes(new Slop("test", Slop.Operation.DELETE, "hello".getBytes(), new byte[]{1}, 1, new Date())); - assertSerializes(new Slop("test", Slop.Operation.GET, "hello there".getBytes(), new byte[]{1, 3, 23,4,5,6,6}, 1, new Date(0))); - assertSerializes(new Slop("test", Slop.Operation.PUT, "".getBytes(), new byte[]{}, 1, new Date())); - assertSerializes(new Slop("test", Slop.Operation.PUT, "hello".getBytes(), null, 1, new Date())); - } + + private SlopSerializer serializer; + + public void setUp() { + this.serializer = new SlopSerializer(); + } + + private void assertSerializes(Slop slop) { + assertEquals(slop, this.serializer.toObject(this.serializer.toBytes(slop))); + } + + public void testSerialization() { + assertSerializes(new Slop("test", + Slop.Operation.DELETE, + "hello".getBytes(), + new byte[] { 1 }, + 1, + new Date())); + assertSerializes(new Slop("test", Slop.Operation.GET, "hello there".getBytes(), new byte[] { + 1, 3, 23, 4, 5, 6, 6 }, 1, new Date(0))); + assertSerializes(new Slop("test", + Slop.Operation.PUT, + "".getBytes(), + new byte[] {}, + 1, + new Date())); + assertSerializes(new Slop("test", + Slop.Operation.PUT, + "hello".getBytes(), + null, + 1, + new Date())); + } } test/unit/voldemort/serialization/SlopSerializerTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization; import static voldemort.TestUtils.getClock; @@ -5,29 +21,32 @@ import junit.framework.TestCase; import voldemort.versioning.Versioned; public class VersionedSerializerTest extends TestCase { - - private VersionedSerializer<String> serializer; - - public void setUp() { - this.serializer = new VersionedSerializer<String>(new StringSerializer("UTF-8")); - } - - private void assertSerializes(String message, Versioned<String> obj) { - assertEquals(obj, this.serializer.toObject(this.serializer.toBytes(obj))); - } - - public void testSerialization() { - // assertSerializes("Empty Versioned should equal itself.", - // new Versioned<String>(null, getClock())); - assertSerializes("Empty Versioned should equal itself.", - new Versioned<String>("", getClock())); - assertSerializes("Normal string should equal itself.", - new Versioned<String>("hello", getClock())); - assertSerializes("Normal string should equal itself.", - new Versioned<String>("hello", getClock(1,1,1,2,3))); - assertSerializes("Normal string should equal itself.", - new Versioned<String>("hello", getClock(1))); - assertSerializes("Normal string should equal itself.", - new Versioned<String>("hello", null)); - } + + private VersionedSerializer<String> serializer; + + public void setUp() { + this.serializer = new VersionedSerializer<String>(new StringSerializer("UTF-8")); + } + + private void assertSerializes(String message, Versioned<String> obj) { + assertEquals(obj, this.serializer.toObject(this.serializer.toBytes(obj))); + } + + public void testSerialization() { + // assertSerializes("Empty Versioned should equal itself.", + // new Versioned<String>(null, getClock())); + assertSerializes("Empty Versioned should equal itself.", new Versioned<String>("", + getClock())); + assertSerializes("Normal string should equal itself.", new Versioned<String>("hello", + getClock())); + assertSerializes("Normal string should equal itself.", new Versioned<String>("hello", + getClock(1, + 1, + 1, + 2, + 3))); + assertSerializes("Normal string should equal itself.", new Versioned<String>("hello", + getClock(1))); + assertSerializes("Normal string should equal itself.", new Versioned<String>("hello", null)); + } } test/unit/voldemort/serialization/VersionedSerializerTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization.json; import static voldemort.TestUtils.str; test/unit/voldemort/serialization/json/JsonReaderTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.serialization.json; import static java.util.Arrays.asList; test/unit/voldemort/serialization/json/JsonTypeSerializerTest.java @@ -1,19 +1,35 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server; import junit.framework.TestCase; /** * @author jay - * + * */ public class ServiceTest extends TestCase { - + public void testBeginsUnstarted() { FakeService s = new FakeService(); assertFalse(s.isStarted()); assertFalse(s.isStarted()); } - + public void testStartStartsAndStopStops() { FakeService s = new FakeService(); s.start(); @@ -23,7 +39,7 @@ public class ServiceTest extends TestCase { s.start(); assertTrue(s.isStarted()); } - + public void testStartupFailureLeavesUnstarted() { FakeService s = new FakeService(new RuntimeException("FAIL!"), null); try { @@ -32,7 +48,7 @@ public class ServiceTest extends TestCase { assertFalse(s.isStarted()); } } - + public void testShutdownFailureLeavesUnstarted() { FakeService s = new FakeService(null, new RuntimeException("FAIL!")); s.start(); @@ -42,16 +58,16 @@ public class ServiceTest extends TestCase { assertFalse(s.isStarted()); } } - + private static class FakeService extends AbstractService { - + private RuntimeException startException = null; private RuntimeException stopException = null; - + public FakeService() { super("do-nothing"); } - + public FakeService(RuntimeException startException, RuntimeException stopException) { super("do-nothing"); this.startException = startException; @@ -69,7 +85,7 @@ public class ServiceTest extends TestCase { if(stopException != null) throw stopException; } - + } - + } test/unit/voldemort/server/ServiceTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.server.socket; import java.util.concurrent.ConcurrentHashMap; @@ -5,25 +21,23 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import junit.framework.TestCase; import voldemort.store.socket.SocketAndStreams; import voldemort.store.socket.SocketDestination; import voldemort.store.socket.SocketPool; -import junit.framework.TestCase; /** * @author jay - * + * */ public class SocketPoolTest extends TestCase { - - private int port = 8567; private int maxConnections = 3; private SocketPool pool; private SocketDestination dest; private SocketServer server; - + public void setUp() { this.pool = new SocketPool(maxConnections, maxConnections, 2000); this.dest = new SocketDestination("localhost", port); @@ -31,19 +45,19 @@ public class SocketPoolTest extends TestCase { this.server.start(); this.server.awaitStartupCompletion(); } - + public void tearDown() { this.pool.close(); this.server.shutdown(); } - + public void testTwoCheckoutsGetTheSameSocket() throws Exception { SocketAndStreams sas1 = pool.checkout(dest); pool.checkin(dest, sas1); SocketAndStreams sas2 = pool.checkout(dest); assertTrue(sas1 == sas2); } - + public void testClosingSocketDeactivates() throws Exception { SocketAndStreams sas1 = pool.checkout(dest); sas1.getSocket().close(); @@ -51,7 +65,7 @@ public class SocketPoolTest extends TestCase { SocketAndStreams sas2 = pool.checkout(dest); assertTrue(sas1 != sas2); } - + public void testClosingStreamDeactivates() throws Exception { SocketAndStreams sas1 = pool.checkout(dest); sas1.getOutputStream().close(); @@ -59,13 +73,14 @@ public class SocketPoolTest extends TestCase { SocketAndStreams sas2 = pool.checkout(dest); assertTrue(sas1 != sas2); } - + public void testNoChurn() throws Exception { ExecutorService service = Executors.newFixedThreadPool(10); int numRequests = 1000; final CountDownLatch latch = new CountDownLatch(numRequests); for(int i = 0; i < numRequests; i++) { service.execute(new Runnable() { + public void run() { SocketAndStreams sas = pool.checkout(dest); pool.checkin(dest, sas); test/unit/voldemort/server/socket/SocketPoolTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import static voldemort.TestUtils.getClock; @@ -15,69 +31,69 @@ import voldemort.versioning.Versioned; import com.google.common.base.Objects; -public abstract class BasicStoreTest<K,V> extends TestCase { - - public abstract Store<K,V> getStore(); - - public abstract List<V> getValues(int numValues); - - public abstract List<K> getKeys(int numKeys); - - public List<String> getStrings(int numKeys, int size) { - List<String> ts = new ArrayList<String>(numKeys); - for(int i = 0; i < numKeys; i++) - ts.add(randomLetters(size)); - return ts; - } - - public List<byte[]> getByteValues(int numValues, int size) { +public abstract class BasicStoreTest<K, V> extends TestCase { + + public abstract Store<K, V> getStore(); + + public abstract List<V> getValues(int numValues); + + public abstract List<K> getKeys(int numKeys); + + public List<String> getStrings(int numKeys, int size) { + List<String> ts = new ArrayList<String>(numKeys); + for(int i = 0; i < numKeys; i++) + ts.add(randomLetters(size)); + return ts; + } + + public List<byte[]> getByteValues(int numValues, int size) { List<byte[]> values = new ArrayList<byte[]>(); for(int i = 0; i < numValues; i++) values.add(TestUtils.randomBytes(size)); return values; } - - public K getKey() { - return getKeys(1).get(0); - } - - public V getValue() { - return getValues(1).get(0); - } - - public Version getExpectedVersionAfterPut(Version version) { - return version; - } - - protected boolean valuesEqual(V t1, V t2) { - return Objects.equal(t1, t2); - } - - protected void assertEquals(String message, Versioned<V> v1, Versioned<V> v2) { - assertEquals(v1, v2); - } - - protected void assertEquals(Versioned<V> v1, Versioned<V> v2) { - assertTrue(v1 + " != " + v2 + ".", valuesEqual(v1.getValue(), v2.getValue())); - assertEquals(v1.getVersion(), v2.getVersion()); - } - - public void assertContains(Collection<Versioned<V>> collection, Versioned<V> value) { - boolean found = false; - for(Versioned<V> t: collection) - if(valuesEqual(t.getValue(), value.getValue())) - found = true; - assertTrue(collection + " does not contain " + value + ".", found); - } - - public void testNullKeys() { - Store<K,V> store = getStore(); - try { - store.put(null, new Versioned<V>(getValue())); - fail("Store should not put null keys!"); - } catch(IllegalArgumentException e) { - // this is good - } + + public K getKey() { + return getKeys(1).get(0); + } + + public V getValue() { + return getValues(1).get(0); + } + + public Version getExpectedVersionAfterPut(Version version) { + return version; + } + + protected boolean valuesEqual(V t1, V t2) { + return Objects.equal(t1, t2); + } + + protected void assertEquals(String message, Versioned<V> v1, Versioned<V> v2) { + assertEquals(v1, v2); + } + + protected void assertEquals(Versioned<V> v1, Versioned<V> v2) { + assertTrue(v1 + " != " + v2 + ".", valuesEqual(v1.getValue(), v2.getValue())); + assertEquals(v1.getVersion(), v2.getVersion()); + } + + public void assertContains(Collection<Versioned<V>> collection, Versioned<V> value) { + boolean found = false; + for(Versioned<V> t: collection) + if(valuesEqual(t.getValue(), value.getValue())) + found = true; + assertTrue(collection + " does not contain " + value + ".", found); + } + + public void testNullKeys() { + Store<K, V> store = getStore(); + try { + store.put(null, new Versioned<V>(getValue())); + fail("Store should not put null keys!"); + } catch(IllegalArgumentException e) { + // this is good + } try { store.get(null); fail("Store should not get null keys!"); @@ -90,106 +106,124 @@ public abstract class BasicStoreTest<K,V> extends TestCase { } catch(IllegalArgumentException e) { // this is good } - } - - public void testPutNullValue() { - // Store<K,V> store = getStore(); - // K key = getKey(); - // store.put(key, new Versioned<V>(null)); - // List<Versioned<V>> found = store.get(key); - // assertEquals("Wrong number of values.", 1, found.size()); - // assertEquals("Returned non-null value.", null, found.get(0).getValue()); - } - - public void testGetAndDeleteNonExistentKey() { - K key = getKey(); - Store<K,V> store = getStore(); - List<Versioned<V>> found = store.get(key); - assertEquals("Found non-existent key: " + found, 0, found.size()); - assertTrue("Delete of non-existent key succeeded.", !store.delete(key, getClock(1,1,2,2,3,3))); - } - - private void testObsoletePutFails(String message, Store<K,V> store, K key, Versioned<V> versioned) { - VectorClock clock = (VectorClock) versioned.getVersion(); - clock = clock.clone(); - try { - store.put(key, versioned); - fail(message); - } catch(ObsoleteVersionException e) { - // this is good, but check that we didn't fuck with the version - assertEquals(clock, versioned.getVersion()); - } - } - - public void testFetchedEqualsPut() { - K key = getKey(); - Store<K,V> store = getStore(); - VectorClock clock = getClock(1,1,2,3,3,4); - V value = getValue(); - assertEquals("Store not empty at start!", 0, store.get(key).size()); - Versioned<V> versioned = new Versioned<V>(value, clock); - store.put(key, versioned); - List<Versioned<V>> found = store.get(key); - assertEquals("Should only be one version stored.", 1, found.size()); - assertTrue("Values not equal!", valuesEqual(versioned.getValue(), found.get(0).getValue())); - } - - public void testVersionedPut() { - K key = getKey(); - Store<K,V> store = getStore(); - VectorClock clock = getClock(1,1); - VectorClock clockCopy = clock.clone(); - V value = getValue(); - assertEquals("Store not empty at start!", 0, store.get(key).size()); - Versioned<V> versioned = new Versioned<V>(value, clock); - - // put initial version - store.put(key, versioned); - assertContains(store.get(key), versioned); - - // test that putting obsolete versions fails - testObsoletePutFails("Put of identical version/value succeeded.", store, key, new Versioned<V>(value, clockCopy)); - testObsoletePutFails("Put of identical version succeeded.", store, key, new Versioned<V>(getValue(), clockCopy)); - testObsoletePutFails("Put of obsolete version succeeded.", store, key, new Versioned<V>(getValue(), getClock(1))); - assertEquals("Should still only be one version in store.", store.get(key).size(), 1); - assertContains(store.get(key), versioned); - - // test that putting a concurrent version succeeds - store.put(key, new Versioned<V>(getValue(), getClock(1,2))); - assertEquals(2, store.get(key).size()); - - // test that putting an incremented version succeeds - Versioned<V> newest = new Versioned<V>(getValue(), getClock(1,1,2,2)); - store.put(key, newest); - assertContains(store.get(key), newest); - } - - public void testDelete() { - K key = getKey(); - Store<K,V> store = getStore(); - VectorClock c1 = getClock(1,1); - VectorClock c2 = getClock(1,2); - V value = getValue(); - - // can't delete something that isn't there - assertTrue(!store.delete(key, c1)); - - // put two conflicting versions, then delete one - Versioned<V> v1 = new Versioned<V>(value, c1); - Versioned<V> v2 = new Versioned<V>(value, c2); - store.put(key, v1); - store.put(key, v2); - assertTrue("Delete failed!", store.delete(key, v1.getVersion())); - List<Versioned<V>> found = store.get(key); - - // check that there is a single remaining version, namely the non-deleted - assertEquals(1, found.size()); - assertEquals(v2.getVersion(), found.get(0).getVersion()); - assertTrue(valuesEqual(v2.getValue(), found.get(0).getValue())); - - // now delete that version too - assertTrue("Delete failed!", store.delete(key, c2)); - assertEquals(0, store.get(key).size()); - } + } + + public void testPutNullValue() { + // Store<K,V> store = getStore(); + // K key = getKey(); + // store.put(key, new Versioned<V>(null)); + // List<Versioned<V>> found = store.get(key); + // assertEquals("Wrong number of values.", 1, found.size()); + // assertEquals("Returned non-null value.", null, found.get(0).getValue()); + } + + public void testGetAndDeleteNonExistentKey() { + K key = getKey(); + Store<K, V> store = getStore(); + List<Versioned<V>> found = store.get(key); + assertEquals("Found non-existent key: " + found, 0, found.size()); + assertTrue("Delete of non-existent key succeeded.", !store.delete(key, getClock(1, + 1, + 2, + 2, + 3, + 3))); + } + + private void testObsoletePutFails(String message, + Store<K, V> store, + K key, + Versioned<V> versioned) { + VectorClock clock = (VectorClock) versioned.getVersion(); + clock = clock.clone(); + try { + store.put(key, versioned); + fail(message); + } catch(ObsoleteVersionException e) { + // this is good, but check that we didn't fuck with the version + assertEquals(clock, versioned.getVersion()); + } + } + + public void testFetchedEqualsPut() { + K key = getKey(); + Store<K, V> store = getStore(); + VectorClock clock = getClock(1, 1, 2, 3, 3, 4); + V value = getValue(); + assertEquals("Store not empty at start!", 0, store.get(key).size()); + Versioned<V> versioned = new Versioned<V>(value, clock); + store.put(key, versioned); + List<Versioned<V>> found = store.get(key); + assertEquals("Should only be one version stored.", 1, found.size()); + assertTrue("Values not equal!", valuesEqual(versioned.getValue(), found.get(0).getValue())); + } + + public void testVersionedPut() { + K key = getKey(); + Store<K, V> store = getStore(); + VectorClock clock = getClock(1, 1); + VectorClock clockCopy = clock.clone(); + V value = getValue(); + assertEquals("Store not empty at start!", 0, store.get(key).size()); + Versioned<V> versioned = new Versioned<V>(value, clock); + + // put initial version + store.put(key, versioned); + assertContains(store.get(key), versioned); + + // test that putting obsolete versions fails + testObsoletePutFails("Put of identical version/value succeeded.", + store, + key, + new Versioned<V>(value, clockCopy)); + testObsoletePutFails("Put of identical version succeeded.", + store, + key, + new Versioned<V>(getValue(), clockCopy)); + testObsoletePutFails("Put of obsolete version succeeded.", + store, + key, + new Versioned<V>(getValue(), getClock(1))); + assertEquals("Should still only be one version in store.", store.get(key).size(), 1); + assertContains(store.get(key), versioned); + + // test that putting a concurrent version succeeds + store.put(key, new Versioned<V>(getValue(), getClock(1, 2))); + assertEquals(2, store.get(key).size()); + + // test that putting an incremented version succeeds + Versioned<V> newest = new Versioned<V>(getValue(), getClock(1, 1, 2, 2)); + store.put(key, newest); + assertContains(store.get(key), newest); + } + + public void testDelete() { + K key = getKey(); + Store<K, V> store = getStore(); + VectorClock c1 = getClock(1, 1); + VectorClock c2 = getClock(1, 2); + V value = getValue(); + + // can't delete something that isn't there + assertTrue(!store.delete(key, c1)); + + // put two conflicting versions, then delete one + Versioned<V> v1 = new Versioned<V>(value, c1); + Versioned<V> v2 = new Versioned<V>(value, c2); + store.put(key, v1); + store.put(key, v2); + assertTrue("Delete failed!", store.delete(key, v1.getVersion())); + List<Versioned<V>> found = store.get(key); + + // check that there is a single remaining version, namely the + // non-deleted + assertEquals(1, found.size()); + assertEquals(v2.getVersion(), found.get(0).getVersion()); + assertTrue(valuesEqual(v2.getValue(), found.get(0).getValue())); + + // now delete that version too + assertTrue("Delete failed!", store.delete(key, c2)); + assertEquals(0, store.get(key).size()); + } } test/unit/voldemort/store/BasicStoreTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import java.util.List; @@ -7,31 +23,31 @@ import voldemort.versioning.Versioned; /** * @author jay - * + * */ -public abstract class ByteArrayStoreTest extends BasicStoreTest<byte[],byte[]> { +public abstract class ByteArrayStoreTest extends BasicStoreTest<byte[], byte[]> { public List<byte[]> getKeys(int numValues) { return this.getByteValues(numValues, 8); } - - @Override - public List<byte[]> getValues(int numValues) { - return this.getByteValues(numValues, 10); - } - - @Override - protected boolean valuesEqual(byte[] t1, byte[] t2) { - return TestUtils.bytesEqual(t1, t2); - } - - public void testEmptyByteArray() { - Store<byte[],byte[]> store = getStore(); - Versioned<byte[]> bytes = new Versioned<byte[]>(new byte[0]); - store.put(new byte[0], bytes); - List<Versioned<byte[]>> found = store.get(new byte[0]); - assertEquals("Incorrect number of results.", 1, found.size()); - assertEquals("Get doesn't equal put.", bytes, found.get(0)); - } + + @Override + public List<byte[]> getValues(int numValues) { + return this.getByteValues(numValues, 10); + } + + @Override + protected boolean valuesEqual(byte[] t1, byte[] t2) { + return TestUtils.bytesEqual(t1, t2); + } + + public void testEmptyByteArray() { + Store<byte[], byte[]> store = getStore(); + Versioned<byte[]> bytes = new Versioned<byte[]>(new byte[0]); + store.put(new byte[0], bytes); + List<Versioned<byte[]>> found = store.get(new byte[0]); + assertEquals("Incorrect number of results.", 1, found.size()); + assertEquals("Get doesn't equal put.", bytes, found.get(0)); + } } test/unit/voldemort/store/ByteArrayStoreTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store; import java.util.Iterator; @@ -9,77 +25,77 @@ import voldemort.versioning.Versioned; public abstract class StorageEngineTest extends ByteArrayStoreTest { - @Override - public Store<byte[],byte[]> getStore() { - return getStorageEngine(); - } - - public abstract StorageEngine<byte[],byte[]> getStorageEngine(); - - public void testGetNoEntries() { - ClosableIterator<Entry<byte[],Versioned<byte[]>>> it = null; - try { - StorageEngine<byte[],byte[]> engine = getStorageEngine(); - it = engine.entries(); - while(it.hasNext()) - fail("There shouldn't be any entries in this store."); - } finally { - if(it != null) - it.close(); - } - } - + @Override + public Store<byte[], byte[]> getStore() { + return getStorageEngine(); + } + + public abstract StorageEngine<byte[], byte[]> getStorageEngine(); + + public void testGetNoEntries() { + ClosableIterator<Entry<byte[], Versioned<byte[]>>> it = null; + try { + StorageEngine<byte[], byte[]> engine = getStorageEngine(); + it = engine.entries(); + while(it.hasNext()) + fail("There shouldn't be any entries in this store."); + } finally { + if(it != null) + it.close(); + } + } + public void testIterateOverNullValue() { - //StorageEngine<byte[]> engine = getStorageEngine(); - //engine.put("null", new Versioned<byte[]>(null)); - //ClosableIterator<Entry<Versioned<byte[]>>> it = engine.entries(); - //Versioned<byte[]> v = it.next().getValue(); - //assertNull("Value should remain null.", v.getValue()); - //assertTrue("Two values found?!?", it.hasNext()); - //assertNull(it.next()); + // StorageEngine<byte[]> engine = getStorageEngine(); + // engine.put("null", new Versioned<byte[]>(null)); + // ClosableIterator<Entry<Versioned<byte[]>>> it = engine.entries(); + // Versioned<byte[]> v = it.next().getValue(); + // assertNull("Value should remain null.", v.getValue()); + // assertTrue("Two values found?!?", it.hasNext()); + // assertNull(it.next()); + } + + public void testGetEntries() { + StorageEngine<byte[], byte[]> engine = getStorageEngine(); + int size = 20; + List<byte[]> values = getValues(size); + for(int i = 0; i < size; i++) + engine.put(Integer.toString(i).getBytes(), new Versioned<byte[]>(values.get(i))); + + ClosableIterator<Entry<byte[], Versioned<byte[]>>> it = engine.entries(); + for(int i = 0; i < size; i++) { + if(!it.hasNext()) + fail("Expected " + size + " items but found only " + i); + Versioned<byte[]> versioned = it.next().getValue(); + assertTrue("Found value that wasn't put!", remove(values, versioned.getValue())); + } + assertEquals("Failed to remove all values!", 0, values.size()); + it.close(); + } + + public void testPruneOnWrite() { + StorageEngine<byte[], byte[]> engine = getStorageEngine(); + Versioned<byte[]> v1 = new Versioned<byte[]>(new byte[] { 1 }, TestUtils.getClock(1)); + Versioned<byte[]> v2 = new Versioned<byte[]>(new byte[] { 2 }, TestUtils.getClock(2)); + Versioned<byte[]> v3 = new Versioned<byte[]>(new byte[] { 3 }, TestUtils.getClock(1, 2)); + byte[] key = new byte[] { 3 }; + engine.put(key, v1); + engine.put(key, v2); + assertEquals(2, engine.get(key).size()); + engine.put(key, v3); + assertEquals(1, engine.get(key).size()); + } + + private boolean remove(List<byte[]> list, byte[] item) { + Iterator<byte[]> it = list.iterator(); + boolean removedSomething = false; + while(it.hasNext()) { + if(TestUtils.bytesEqual(item, it.next())) { + it.remove(); + removedSomething = true; + } + } + return removedSomething; } - - public void testGetEntries() { - StorageEngine<byte[],byte[]> engine = getStorageEngine(); - int size = 20; - List<byte[]> values = getValues(size); - for(int i = 0; i < size; i++) - engine.put(Integer.toString(i).getBytes(), new Versioned<byte[]>(values.get(i))); - - ClosableIterator<Entry<byte[],Versioned<byte[]>>> it = engine.entries(); - for(int i = 0; i < size; i++) { - if(!it.hasNext()) - fail("Expected " + size + " items but found only " + i); - Versioned<byte[]> versioned = it.next().getValue(); - assertTrue("Found value that wasn't put!", remove(values, versioned.getValue())); - } - assertEquals("Failed to remove all values!", 0, values.size()); - it.close(); - } - - public void testPruneOnWrite() { - StorageEngine<byte[],byte[]> engine = getStorageEngine(); - Versioned<byte[]> v1 = new Versioned<byte[]>(new byte[]{1}, TestUtils.getClock(1)); - Versioned<byte[]> v2 = new Versioned<byte[]>(new byte[]{2}, TestUtils.getClock(2)); - Versioned<byte[]> v3 = new Versioned<byte[]>(new byte[]{3}, TestUtils.getClock(1,2)); - byte[] key = new byte[]{3}; - engine.put(key, v1); - engine.put(key, v2); - assertEquals(2, engine.get(key).size()); - engine.put(key, v3); - assertEquals(1, engine.get(key).size()); - } - - private boolean remove(List<byte[]> list, byte[] item) { - Iterator<byte[]> it = list.iterator(); - boolean removedSomething = false; - while(it.hasNext()) { - if(TestUtils.bytesEqual(item, it.next())) { - it.remove(); - removedSomething = true; - } - } - return removedSomething; - } } test/unit/voldemort/store/StorageEngineTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.bdb; import java.io.File; @@ -17,72 +33,72 @@ import com.sleepycat.je.DatabaseConfig; import com.sleepycat.je.Environment; import com.sleepycat.je.EnvironmentConfig; - public class BdbStorageEngineTest extends StorageEngineTest { - - private Environment environment; - private Database database; - private File tempDir; - private BdbStorageEngine store; - private DatabaseConfig databaseConfig; - private Random random; - @Override - protected void setUp() throws Exception { - super.setUp(); - this.random = new Random(); - EnvironmentConfig environmentConfig = new EnvironmentConfig(); - environmentConfig = new EnvironmentConfig(); - environmentConfig.setTxnNoSync(true); - environmentConfig.setAllowCreate(true); - environmentConfig.setTransactional(true); - this.tempDir = TestUtils.getTempDirectory(); - this.environment = new Environment(this.tempDir, environmentConfig); - this.databaseConfig = new DatabaseConfig(); - databaseConfig.setAllowCreate(true); - databaseConfig.setTransactional(true); - databaseConfig.setSortedDuplicates(true); - this.database = environment.openDatabase(null, "test", databaseConfig); - this.store = new BdbStorageEngine("test", this.environment, this.database); - } - - @Override - protected void tearDown() throws Exception { - super.tearDown(); - try { - database.close(); - environment.close(); - } finally { - FileDeleteStrategy.FORCE.delete(tempDir); - } - } - - @Override - public StorageEngine<byte[],byte[]> getStorageEngine() { - return store; - } + private Environment environment; + private Database database; + private File tempDir; + private BdbStorageEngine store; + private DatabaseConfig databaseConfig; + private Random random; + + @Override + protected void setUp() throws Exception { + super.setUp(); + this.random = new Random(); + EnvironmentConfig environmentConfig = new EnvironmentConfig(); + environmentConfig = new EnvironmentConfig(); + environmentConfig.setTxnNoSync(true); + environmentConfig.setAllowCreate(true); + environmentConfig.setTransactional(true); + this.tempDir = TestUtils.getTempDirectory(); + this.environment = new Environment(this.tempDir, environmentConfig); + this.databaseConfig = new DatabaseConfig(); + databaseConfig.setAllowCreate(true); + databaseConfig.setTransactional(true); + databaseConfig.setSortedDuplicates(true); + this.database = environment.openDatabase(null, "test", databaseConfig); + this.store = new BdbStorageEngine("test", this.environment, this.database); + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + try { + database.close(); + environment.close(); + } finally { + FileDeleteStrategy.FORCE.delete(tempDir); + } + } + + @Override + public StorageEngine<byte[], byte[]> getStorageEngine() { + return store; + } + + public void testMakeKey(byte[] key, VectorClock clock) { + byte[] keyBytes = BdbStorageEngine.makeKey(key, clock); + assertTrue("Invalid key returned", + TestUtils.bytesEqual(key, BdbStorageEngine.getObjKey(keyBytes))); + assertEquals("Invalid clock returned", clock, BdbStorageEngine.getVersion(keyBytes)); + } + + public void testMakeKey() { + testMakeKey("".getBytes(), TestUtils.getClock()); + testMakeKey("abc".getBytes(), null); + testMakeKey("hello-there".getBytes(), TestUtils.getClock(1, 1, 2, 3, 4)); + } - public void testMakeKey(byte[] key, VectorClock clock) { - byte[] keyBytes = BdbStorageEngine.makeKey(key, clock); - assertTrue("Invalid key returned", TestUtils.bytesEqual(key, BdbStorageEngine.getObjKey(keyBytes))); - assertEquals("Invalid clock returned", clock, BdbStorageEngine.getVersion(keyBytes)); - } - - public void testMakeKey() { - testMakeKey("".getBytes(), TestUtils.getClock()); - testMakeKey("abc".getBytes(), null); - testMakeKey("hello-there".getBytes(), TestUtils.getClock(1, 1, 2, 3, 4)); - } - - public void testPersistence() throws Exception { - StorageEngine<byte[], byte[]> eng = getStorageEngine(); - eng.put("abc".getBytes(), new Versioned<byte[]>("cdef".getBytes())); - eng.close(); - this.database = environment.openDatabase(null, "test", databaseConfig); - eng = new BdbStorageEngine("test", this.environment, this.database); - List<Versioned<byte[]>> vals = eng.get("abc".getBytes()); - assertEquals(1, vals.size()); - TestUtils.bytesEqual("cdef".getBytes(), vals.get(0).getValue()); - } + public void testPersistence() throws Exception { + StorageEngine<byte[], byte[]> eng = getStorageEngine(); + eng.put("abc".getBytes(), new Versioned<byte[]>("cdef".getBytes())); + eng.close(); + this.database = environment.openDatabase(null, "test", databaseConfig); + eng = new BdbStorageEngine("test", this.environment, this.database); + List<Versioned<byte[]>> vals = eng.get("abc".getBytes()); + assertEquals(1, vals.size()); + TestUtils.bytesEqual("cdef".getBytes(), vals.get(0).getValue()); + } } test/unit/voldemort/store/bdb/BdbStorageEngineTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.filesystem; import java.io.File; @@ -10,16 +26,16 @@ import voldemort.TestUtils; import voldemort.store.BasicStoreTest; import voldemort.store.Store; -public class FilesystemStorageEngineTest extends BasicStoreTest<String,String> { - +public class FilesystemStorageEngineTest extends BasicStoreTest<String, String> { + private List<File> tempDirs; - + @Override public void setUp() throws Exception { super.setUp(); tempDirs = new ArrayList<File>(); } - + @Override public void tearDown() throws Exception { super.tearDown(); test/unit/voldemort/store/filesystem/FilesystemStorageEngineTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.http; import org.apache.commons.httpclient.HttpClient; @@ -16,66 +32,66 @@ import voldemort.versioning.Versioned; /** * @author jay - * + * */ public class HttpStoreTest extends ByteArrayStoreTest { - - private HttpStore httpStore; - private Server server; - private Context context; - @Override - public void setUp() throws Exception { - super.setUp(); - Cluster cluster = VoldemortTestConstants.getOneNodeCluster(); - Node node = cluster.getNodes().iterator().next(); - context = ServerTestUtils.getJettyServer(VoldemortTestConstants.getOneNodeClusterXml(), - VoldemortTestConstants.getSimpleStoreDefinitionsXml(), - "users", - node.getHttpPort()); - server = context.getServer(); - httpStore = ServerTestUtils.getHttpStore("users", node.getHttpPort()); - } - - public <T extends Exception> void testBadUrlOrPort(String url, int port, Class<T> expected) { - byte[] key = "test".getBytes(); - HttpStore badUrlHttpStore = new HttpStore("test", url, port, new HttpClient()); - try { - badUrlHttpStore.put(key, new Versioned<byte[]>("value".getBytes(), new VectorClock())); - } catch(Exception e) { - assertTrue(e.getClass().equals(expected)); - } - try { - badUrlHttpStore.get(key); - } catch(Exception e) { - assertTrue(e.getClass().equals(expected)); - } - try { - badUrlHttpStore.delete(key, new VectorClock()); - } catch(Exception e) { - assertTrue(e.getClass().equals(expected)); - } - } - - public void testBadUrl() { - testBadUrlOrPort("asfgsadfsda", 80, UnreachableStoreException.class); - } - - public void testBadPort() { - testBadUrlOrPort("localhost", 7777, UnreachableStoreException.class); - } - - @Override - public void tearDown() throws Exception { - super.tearDown(); - httpStore.close(); - server.stop(); - context.destroy(); - } - - @Override - public Store<byte[],byte[]> getStore() { - return httpStore; - } + private HttpStore httpStore; + private Server server; + private Context context; + + @Override + public void setUp() throws Exception { + super.setUp(); + Cluster cluster = VoldemortTestConstants.getOneNodeCluster(); + Node node = cluster.getNodes().iterator().next(); + context = ServerTestUtils.getJettyServer(VoldemortTestConstants.getOneNodeClusterXml(), + VoldemortTestConstants.getSimpleStoreDefinitionsXml(), + "users", + node.getHttpPort()); + server = context.getServer(); + httpStore = ServerTestUtils.getHttpStore("users", node.getHttpPort()); + } + + public <T extends Exception> void testBadUrlOrPort(String url, int port, Class<T> expected) { + byte[] key = "test".getBytes(); + HttpStore badUrlHttpStore = new HttpStore("test", url, port, new HttpClient()); + try { + badUrlHttpStore.put(key, new Versioned<byte[]>("value".getBytes(), new VectorClock())); + } catch(Exception e) { + assertTrue(e.getClass().equals(expected)); + } + try { + badUrlHttpStore.get(key); + } catch(Exception e) { + assertTrue(e.getClass().equals(expected)); + } + try { + badUrlHttpStore.delete(key, new VectorClock()); + } catch(Exception e) { + assertTrue(e.getClass().equals(expected)); + } + } + + public void testBadUrl() { + testBadUrlOrPort("asfgsadfsda", 80, UnreachableStoreException.class); + } + + public void testBadPort() { + testBadUrlOrPort("localhost", 7777, UnreachableStoreException.class); + } + + @Override + public void tearDown() throws Exception { + super.tearDown(); + httpStore.close(); + server.stop(); + context.destroy(); + } + + @Override + public Store<byte[], byte[]> getStore() { + return httpStore; + } } test/unit/voldemort/store/http/HttpStoreTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.logging; import java.util.List; @@ -8,7 +24,7 @@ import voldemort.store.memory.InMemoryStorageEngine; /** * @author jay - * + * */ public class LoggingStoreTest extends BasicStoreTest<String, String> { @@ -19,7 +35,7 @@ public class LoggingStoreTest extends BasicStoreTest<String, String> { @Override public Store<String, String> getStore() { - return new LoggingStore<String,String>(new InMemoryStorageEngine<String,String>("test-store")); + return new LoggingStore<String, String>(new InMemoryStorageEngine<String, String>("test-store")); } @Override test/unit/voldemort/store/logging/LoggingStoreTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.memory; import java.util.List; test/unit/voldemort/store/memory/CacheStorageEngineTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.memory; import java.util.ArrayList; @@ -9,18 +25,18 @@ import voldemort.store.StorageEngineTest; public class InMemoryStorageEngineTest extends StorageEngineTest { - private InMemoryStorageEngine<byte[],byte[]> store; - - @Override - public StorageEngine<byte[],byte[]> getStorageEngine() { - return store; - } - - @Override - public void setUp() throws Exception { - super.setUp(); - this.store = new InMemoryStorageEngine<byte[],byte[]>("test"); - } + private InMemoryStorageEngine<byte[], byte[]> store; + + @Override + public StorageEngine<byte[], byte[]> getStorageEngine() { + return store; + } + + @Override + public void setUp() throws Exception { + super.setUp(); + this.store = new InMemoryStorageEngine<byte[], byte[]>("test"); + } @Override public List<byte[]> getKeys(int numKeys) { test/unit/voldemort/store/memory/InMemoryStorageEngineTest.java @@ -1,11 +1,27 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.metadata; import junit.framework.TestCase; public class MetadataStoreTest extends TestCase { - public void testToWrite() { - - } - + public void testToWrite() { + + } + } test/unit/voldemort/store/metadata/MetadataStoreTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.mysql; import java.sql.Connection; @@ -12,9 +28,9 @@ import voldemort.store.StorageEngine; import voldemort.store.StorageEngineTest; public class MysqlStorageEngineTest extends StorageEngineTest { - + private MysqlStorageEngine engine; - + public void setUp() throws Exception { this.engine = (MysqlStorageEngine) getStorageEngine(); engine.destroy(); @@ -23,14 +39,14 @@ public class MysqlStorageEngineTest extends StorageEngineTest { } @Override - public StorageEngine<byte[],byte[]> getStorageEngine() { + public StorageEngine<byte[], byte[]> getStorageEngine() { return new MysqlStorageEngine("test_store", getDataSource()); } - + public void tearDown() { engine.destroy(); } - + private DataSource getDataSource() { BasicDataSource ds = new BasicDataSource(); ds.setUrl("jdbc:mysql://localhost:3306/test"); @@ -39,7 +55,7 @@ public class MysqlStorageEngineTest extends StorageEngineTest { ds.setDriverClassName("com.mysql.jdbc.Driver"); return ds; } - + public void executeQuery(DataSource datasource, String query) throws SQLException { Connection c = datasource.getConnection(); PreparedStatement s = c.prepareStatement(query); test/unit/voldemort/store/mysql/MysqlStorageEngineTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.readonly; import java.util.ArrayList; test/unit/voldemort/store/readonly/ExternalSorterTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.readonly; import java.io.BufferedReader; test/unit/voldemort/store/readonly/JsonStoreBuilderTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.routed; import static java.util.Arrays.asList; @@ -17,139 +33,143 @@ import com.google.common.collect.Sets; /** * @author jay - * + * */ @SuppressWarnings("unchecked") -public class ReadRepairerTest extends TestCase -{ - - private ReadRepairer<String,Integer> repairer = new ReadRepairer<String,Integer>(); - private List<NodeValue<String,Integer>> empty = new ArrayList<NodeValue<String,Integer>>(); - private Random random = new Random(1456); - - public void testEmptyList() throws Exception { - assertEquals(empty, repairer.getRepairs(empty)); - } - - public void testSingleValue() throws Exception { - assertEquals(empty, repairer.getRepairs(asList(getValue(1, 1, new int[]{1})))); - } - - public void testAllEqual() throws Exception { - List<NodeValue<String,Integer>> values = asList(getValue(1, 1, new int[]{1}), - getValue(2, 1, new int[]{1}), - getValue(3, 1, new int[]{1})); - assertEquals(empty, repairer.getRepairs(values)); - } - - public void testSingleSuccessor() throws Exception { - assertVariationsEqual(singletonList(getValue(1, 1, new int[]{1,1})), - asList(getValue(1, 1, new int[]{1}), - getValue(2, 1, new int[]{1,1}))); - } - - public void testAllConcurrent() throws Exception { - assertVariationsEqual(asList(getValue(1, 1, new int[]{2}), - getValue(1, 1, new int[]{3}), - getValue(2, 1, new int[]{1}), - getValue(2, 1, new int[]{3}), - getValue(3, 1, new int[]{1}), - getValue(3, 1, new int[]{2})), - asList(getValue(1, 1, new int[]{1}), - getValue(2, 1, new int[]{2}), - getValue(3, 1, new int[]{3}))); - } - - public void testTwoAncestorsToOneSuccessor() throws Exception { - int[] expected = new int[]{1,1,2,2}; - assertVariationsEqual(asList(getValue(2, 1, expected), - getValue(3, 1, expected)), - asList(getValue(1, 1, expected), - getValue(2, 1, new int[]{1}), - getValue(3, 1, new int[]{2}))); - } - - public void testOneAcestorToTwoSuccessors() throws Exception { - int[] expected = new int[]{1,1,2,2}; - assertVariationsEqual(asList(getValue(2, 1, expected), - getValue(3, 1, expected)), - asList(getValue(1, 1, expected), - getValue(2, 1, new int[]{1}), - getValue(3, 1, new int[]{2}))); - } - - public void testEqualObsoleteVersions() throws Exception { - int[] expected = new int[]{1,1}; - assertVariationsEqual(asList(getValue(1, 1, expected), - getValue(2, 1, expected), - getValue(3, 1, expected)), - asList(getValue(1, 1, new int[]{}), - getValue(2, 1, new int[]{1}), - getValue(3, 1, new int[]{1}), - getValue(4, 1, expected))); - } - - public void testDiamondPattern() throws Exception { - int[] expected = new int[]{1,1,2,2}; - assertVariationsEqual(asList(getValue(1, 1, expected), - getValue(2, 1, expected), - getValue(3, 1, expected)), - asList(getValue(1, 1, new int[]{}), - getValue(2, 1, new int[]{1}), - getValue(3, 1, new int[]{2}), - getValue(4, 1, expected))); - } - - public void testConcurrentToOneDoesNotImplyConcurrentToAll() throws Exception { - assertVariationsEqual(asList(getValue(1, 1, new int[]{1,3,3}), - getValue(1, 1, new int[]{1,2}), - getValue(2, 1, new int[]{1,3,3}), - getValue(3, 1, new int[]{1,2})), - asList(getValue(1, 1, new int[]{3,3}), - getValue(2, 1, new int[]{1,2}), - getValue(3, 1, new int[]{1,3,3}))); - } - - public void testLotsOfVersions() throws Exception { - assertVariationsEqual(asList(getValue(1, 1, new int[]{1,2,2,3}), - getValue(1, 1, new int[]{1,2,3,3}), - getValue(2, 1, new int[]{1,2,2,3}), - getValue(2, 1, new int[]{1,2,3,3}), - getValue(3, 1, new int[]{1,2,2,3}), - getValue(3, 1, new int[]{1,2,3,3}), - getValue(4, 1, new int[]{1,2,3,3}), - getValue(5, 1, new int[]{1,2,2,3}), - getValue(6, 1, new int[]{1,2,2,3}), - getValue(6, 1, new int[]{1,2,3,3})), - asList(getValue(1, 1, new int[]{1,3}), - getValue(2, 1, new int[]{1,2}), - getValue(3, 1, new int[]{2,2}), - getValue(4, 1, new int[]{1,2,2,3}), - getValue(5, 1, new int[]{1,2,3,3}), - getValue(6, 1, new int[]{3,3}))); - } - - /** - * Test the equality with a few variations on ordering - * @param expected List of expected values - * @param input List of actual values - */ - public void assertVariationsEqual(List<NodeValue<String,Integer>> expected, List<NodeValue<String,Integer>> input) { - List<NodeValue<String,Integer>> copy = new ArrayList<NodeValue<String,Integer>>(input); - for(int i = 0; i < Math.min(5, copy.size()); i++) { - int j = random.nextInt(copy.size()); - int k = random.nextInt(copy.size()); - Collections.swap(copy, j, k); - Set<NodeValue<String,Integer>> expSet = Sets.newHashSet(expected); - List<NodeValue<String,Integer>> repairs = repairer.getRepairs(copy); - Set<NodeValue<String,Integer>> repairSet =Sets.newHashSet(repairs); - assertEquals("Repairs list contains duplicates on iteration" + i + ".", repairs.size(), repairSet.size()); - assertEquals("Expected repairs do not equal found repairs on iteration " + i + " : ", expSet, repairSet); +public class ReadRepairerTest extends TestCase { + + private ReadRepairer<String, Integer> repairer = new ReadRepairer<String, Integer>(); + private List<NodeValue<String, Integer>> empty = new ArrayList<NodeValue<String, Integer>>(); + private Random random = new Random(1456); + + public void testEmptyList() throws Exception { + assertEquals(empty, repairer.getRepairs(empty)); + } + + public void testSingleValue() throws Exception { + assertEquals(empty, repairer.getRepairs(asList(getValue(1, 1, new int[] { 1 })))); + } + + public void testAllEqual() throws Exception { + List<NodeValue<String, Integer>> values = asList(getValue(1, 1, new int[] { 1 }), + getValue(2, 1, new int[] { 1 }), + getValue(3, 1, new int[] { 1 })); + assertEquals(empty, repairer.getRepairs(values)); + } + + public void testSingleSuccessor() throws Exception { + assertVariationsEqual(singletonList(getValue(1, 1, new int[] { 1, 1 })), + asList(getValue(1, 1, new int[] { 1 }), getValue(2, 1, new int[] { 1, + 1 }))); + } + + public void testAllConcurrent() throws Exception { + assertVariationsEqual(asList(getValue(1, 1, new int[] { 2 }), + getValue(1, 1, new int[] { 3 }), + getValue(2, 1, new int[] { 1 }), + getValue(2, 1, new int[] { 3 }), + getValue(3, 1, new int[] { 1 }), + getValue(3, 1, new int[] { 2 })), + asList(getValue(1, 1, new int[] { 1 }), + getValue(2, 1, new int[] { 2 }), + getValue(3, 1, new int[] { 3 }))); + } + + public void testTwoAncestorsToOneSuccessor() throws Exception { + int[] expected = new int[] { 1, 1, 2, 2 }; + assertVariationsEqual(asList(getValue(2, 1, expected), getValue(3, 1, expected)), + asList(getValue(1, 1, expected), + getValue(2, 1, new int[] { 1 }), + getValue(3, 1, new int[] { 2 }))); + } + + public void testOneAcestorToTwoSuccessors() throws Exception { + int[] expected = new int[] { 1, 1, 2, 2 }; + assertVariationsEqual(asList(getValue(2, 1, expected), getValue(3, 1, expected)), + asList(getValue(1, 1, expected), + getValue(2, 1, new int[] { 1 }), + getValue(3, 1, new int[] { 2 }))); + } + + public void testEqualObsoleteVersions() throws Exception { + int[] expected = new int[] { 1, 1 }; + assertVariationsEqual(asList(getValue(1, 1, expected), + getValue(2, 1, expected), + getValue(3, 1, expected)), + asList(getValue(1, 1, new int[] {}), + getValue(2, 1, new int[] { 1 }), + getValue(3, 1, new int[] { 1 }), + getValue(4, 1, expected))); + } + + public void testDiamondPattern() throws Exception { + int[] expected = new int[] { 1, 1, 2, 2 }; + assertVariationsEqual(asList(getValue(1, 1, expected), + getValue(2, 1, expected), + getValue(3, 1, expected)), + asList(getValue(1, 1, new int[] {}), + getValue(2, 1, new int[] { 1 }), + getValue(3, 1, new int[] { 2 }), + getValue(4, 1, expected))); + } + + public void testConcurrentToOneDoesNotImplyConcurrentToAll() throws Exception { + assertVariationsEqual(asList(getValue(1, 1, new int[] { 1, 3, 3 }), + getValue(1, 1, new int[] { 1, 2 }), + getValue(2, 1, new int[] { 1, 3, 3 }), + getValue(3, 1, new int[] { 1, 2 })), + asList(getValue(1, 1, new int[] { 3, 3 }), getValue(2, 1, new int[] { + 1, 2 }), getValue(3, 1, new int[] { 1, 3, 3 }))); + } + + public void testLotsOfVersions() throws Exception { + assertVariationsEqual(asList(getValue(1, 1, new int[] { 1, 2, 2, 3 }), + getValue(1, 1, new int[] { 1, 2, 3, 3 }), + getValue(2, 1, new int[] { 1, 2, 2, 3 }), + getValue(2, 1, new int[] { 1, 2, 3, 3 }), + getValue(3, 1, new int[] { 1, 2, 2, 3 }), + getValue(3, 1, new int[] { 1, 2, 3, 3 }), + getValue(4, 1, new int[] { 1, 2, 3, 3 }), + getValue(5, 1, new int[] { 1, 2, 2, 3 }), + getValue(6, 1, new int[] { 1, 2, 2, 3 }), + getValue(6, 1, new int[] { 1, 2, 3, 3 })), + asList(getValue(1, 1, new int[] { 1, 3 }), + getValue(2, 1, new int[] { 1, 2 }), + getValue(3, 1, new int[] { 2, 2 }), + getValue(4, 1, new int[] { 1, 2, 2, 3 }), + getValue(5, 1, new int[] { 1, 2, 3, 3 }), + getValue(6, 1, new int[] { 3, 3 }))); + } + + /** + * Test the equality with a few variations on ordering + * + * @param expected List of expected values + * @param input List of actual values + */ + public void assertVariationsEqual(List<NodeValue<String, Integer>> expected, + List<NodeValue<String, Integer>> input) { + List<NodeValue<String, Integer>> copy = new ArrayList<NodeValue<String, Integer>>(input); + for(int i = 0; i < Math.min(5, copy.size()); i++) { + int j = random.nextInt(copy.size()); + int k = random.nextInt(copy.size()); + Collections.swap(copy, j, k); + Set<NodeValue<String, Integer>> expSet = Sets.newHashSet(expected); + List<NodeValue<String, Integer>> repairs = repairer.getRepairs(copy); + Set<NodeValue<String, Integer>> repairSet = Sets.newHashSet(repairs); + assertEquals("Repairs list contains duplicates on iteration" + i + ".", + repairs.size(), + repairSet.size()); + assertEquals("Expected repairs do not equal found repairs on iteration " + i + " : ", + expSet, + repairSet); + } + } + + private NodeValue<String, Integer> getValue(int nodeId, int value, int[] version) { + return new NodeValue<String, Integer>(nodeId, + Integer.toString(value), + new Versioned<Integer>(value, getClock(version))); } - } - - private NodeValue<String,Integer> getValue(int nodeId, int value, int[] version) { - return new NodeValue<String, Integer>(nodeId, Integer.toString(value), new Versioned<Integer>(value, getClock(version))); - } } test/unit/voldemort/store/routed/ReadRepairerTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.routed; import static voldemort.TestUtils.getClock; @@ -31,249 +47,312 @@ import com.google.common.collect.Maps; * Basic tests for RoutedStore * * @author jay - * + * */ public class RoutedStoreTest extends ByteArrayStoreTest { - - private Cluster cluster; - private final byte[] aKey = "jay".getBytes(); - private final byte[] aValue = "kreps".getBytes(); - - @Override - public void setUp() throws Exception { - super.setUp(); - cluster = getNineNodeCluster(); - } - - @Override - public Store<byte[],byte[]> getStore() { - return new InconsistencyResolvingStore<byte[],byte[]>( - getStore(cluster, cluster.getNumberOfNodes(), cluster.getNumberOfNodes(), 4, 0), - new VectorClockInconsistencyResolver<byte[]>()); - } - - private RoutedStore getStore(Cluster cluster, - int reads, - int writes, - int threads, - int failing) { - return getStore(cluster, - reads, - writes, - cluster.getNumberOfNodes(), - threads, - failing, - 0, - new RouteToAllStrategy(cluster.getNodes()), - new VoldemortException()); - } - - private RoutedStore getStore(Cluster cluster, - int reads, - int writes, - int replicationFactor, - int threads, - int failing, - int sleepy, - RoutingStrategy strategy, - VoldemortException e) { - Map<Integer,Store<byte[],byte[]>> subStores = Maps.newHashMap(); - int count = 0; - for(Node n: cluster.getNodes()) { - if(count >= cluster.getNumberOfNodes()) - throw new IllegalArgumentException(failing + " failing nodes, " + sleepy + " sleepy nodes, but only " + - cluster.getNumberOfNodes() + " nodes in the cluster."); - else if(count < failing) - subStores.put(n.getId(), new FailingStore<byte[],byte[]>("test", e)); - else if(count < failing + sleepy) - subStores.put(n.getId(), new SleepyStore<byte[],byte[]>(Long.MAX_VALUE, - new InMemoryStorageEngine<byte[],byte[]>("test"))); - else - subStores.put(n.getId(), new InMemoryStorageEngine<byte[],byte[]>("test")); - - count += 1; - } - return new RoutedStore("test", subStores, strategy, reads, writes, threads, true, 1000L); - } - - private int countOccurances(RoutedStore routedStore, byte[] key, Versioned<byte[]> value) { - int count = 0; - for(Store<byte[],byte[]> store: routedStore.getInnerStores().values()) - try { - if(store.get(key).size() > 0 && Objects.deepEquals(store.get(key).get(0), value)) - count += 1; - } catch(VoldemortException e) { - // This is normal for the failing store... - } - return count; - } - - private void assertNEqual(RoutedStore routedStore, int expected, byte[] key, Versioned<byte[]> value) { - int count = countOccurances(routedStore, key, value); - assertEquals("Expected " + expected + " occurances of '" + key + "' with value '" + value + "', but found " + count + ".", expected, count); - } - - private void assertNOrMoreEqual(RoutedStore routedStore, int expected, byte[] key, Versioned<byte[]> value) { - int count = countOccurances(routedStore, key, value); - assertTrue("Expected " + expected + " or more occurances of '" + key + "' with value '" + value + "', but found " + count + ".", expected <= count); - } - - public void testBasicOperations(int reads, int writes, int failures, int threads) { - RoutedStore routedStore = getStore(cluster, reads, writes, threads, failures); - Store<byte[],byte[]> store = new InconsistencyResolvingStore<byte[],byte[]>(routedStore, new VectorClockInconsistencyResolver<byte[]>()); - VectorClock clock = getClock(1); - Versioned<byte[]> versioned = new Versioned<byte[]>(aValue, clock); - routedStore.put(aKey, versioned); - assertNOrMoreEqual(routedStore, cluster.getNumberOfNodes() - failures, aKey, versioned); - List<Versioned<byte[]>> found = store.get(aKey); - assertEquals(1, found.size()); - assertEquals(versioned, found.get(0)); - assertNOrMoreEqual(routedStore, cluster.getNumberOfNodes() - failures, aKey, versioned); - assertTrue(routedStore.delete(aKey, versioned.getVersion())); - assertNEqual(routedStore, 0, aKey, versioned); - assertTrue(!routedStore.delete(aKey, versioned.getVersion())); - } - - public void testBasicOperationsSingleThreaded() { - testBasicOperations(cluster.getNumberOfNodes(), cluster.getNumberOfNodes(), 0, 1); - } - - public void testBasicOperationsMultiThreaded() { - testBasicOperations(cluster.getNumberOfNodes(), cluster.getNumberOfNodes(), 0, 4); - } - - public void testBasicOperationsMultiThreadedWithFailures() { - testBasicOperations(cluster.getNumberOfNodes() - 2, cluster.getNumberOfNodes() - 2, 2, 4); - } - - public void testBasicOperationFailure(int reads, int writes, int failures, int threads) { - VectorClock clock = getClock(1); - Versioned<byte[]> versioned = new Versioned<byte[]>(aValue, clock); - RoutedStore routedStore = getStore(cluster, - reads, - cluster.getNumberOfNodes(), - writes, - threads, - failures, - 0, - new RouteToAllStrategy(cluster.getNodes()), - new UnreachableStoreException("no go")); - try { - routedStore.put(aKey, versioned); - fail("Put succeeded with too few operational nodes."); - } catch(InsufficientOperationalNodesException e) { - // expected - } - try { - routedStore.get(aKey); - fail("Get succeeded with too few operational nodes."); - } catch(InsufficientOperationalNodesException e) { - // expected - } - try { - routedStore.delete(aKey, versioned.getVersion()); - fail("Get succeeded with too few operational nodes."); - } catch(InsufficientOperationalNodesException e) { - // expected - } - } - - public void testBasicOperationFailureMultiThreaded() { - testBasicOperationFailure(cluster.getNumberOfNodes() - 2, cluster.getNumberOfNodes() - 2, 4, 4); - } - + + private Cluster cluster; + private final byte[] aKey = "jay".getBytes(); + private final byte[] aValue = "kreps".getBytes(); + + @Override + public void setUp() throws Exception { + super.setUp(); + cluster = getNineNodeCluster(); + } + + @Override + public Store<byte[], byte[]> getStore() { + return new InconsistencyResolvingStore<byte[], byte[]>(getStore(cluster, + cluster.getNumberOfNodes(), + cluster.getNumberOfNodes(), + 4, + 0), + new VectorClockInconsistencyResolver<byte[]>()); + } + + private RoutedStore getStore(Cluster cluster, int reads, int writes, int threads, int failing) { + return getStore(cluster, + reads, + writes, + cluster.getNumberOfNodes(), + threads, + failing, + 0, + new RouteToAllStrategy(cluster.getNodes()), + new VoldemortException()); + } + + private RoutedStore getStore(Cluster cluster, + int reads, + int writes, + int replicationFactor, + int threads, + int failing, + int sleepy, + RoutingStrategy strategy, + VoldemortException e) { + Map<Integer, Store<byte[], byte[]>> subStores = Maps.newHashMap(); + int count = 0; + for(Node n: cluster.getNodes()) { + if(count >= cluster.getNumberOfNodes()) + throw new IllegalArgumentException(failing + " failing nodes, " + sleepy + + " sleepy nodes, but only " + + cluster.getNumberOfNodes() + + " nodes in the cluster."); + else if(count < failing) + subStores.put(n.getId(), new FailingStore<byte[], byte[]>("test", e)); + else if(count < failing + sleepy) + subStores.put(n.getId(), + new SleepyStore<byte[], byte[]>(Long.MAX_VALUE, + new InMemoryStorageEngine<byte[], byte[]>("test"))); + else + subStores.put(n.getId(), new InMemoryStorageEngine<byte[], byte[]>("test")); + + count += 1; + } + return new RoutedStore("test", subStores, strategy, reads, writes, threads, true, 1000L); + } + + private int countOccurances(RoutedStore routedStore, byte[] key, Versioned<byte[]> value) { + int count = 0; + for(Store<byte[], byte[]> store: routedStore.getInnerStores().values()) + try { + if(store.get(key).size() > 0 && Objects.deepEquals(store.get(key).get(0), value)) + count += 1; + } catch(VoldemortException e) { + // This is normal for the failing store... + } + return count; + } + + private void assertNEqual(RoutedStore routedStore, + int expected, + byte[] key, + Versioned<byte[]> value) { + int count = countOccurances(routedStore, key, value); + assertEquals("Expected " + expected + " occurances of '" + key + "' with value '" + value + + "', but found " + count + ".", expected, count); + } + + private void assertNOrMoreEqual(RoutedStore routedStore, + int expected, + byte[] key, + Versioned<byte[]> value) { + int count = countOccurances(routedStore, key, value); + assertTrue("Expected " + expected + " or more occurances of '" + key + "' with value '" + + value + "', but found " + count + ".", expected <= count); + } + + public void testBasicOperations(int reads, int writes, int failures, int threads) { + RoutedStore routedStore = getStore(cluster, reads, writes, threads, failures); + Store<byte[], byte[]> store = new InconsistencyResolvingStore<byte[], byte[]>(routedStore, + new VectorClockInconsistencyResolver<byte[]>()); + VectorClock clock = getClock(1); + Versioned<byte[]> versioned = new Versioned<byte[]>(aValue, clock); + routedStore.put(aKey, versioned); + assertNOrMoreEqual(routedStore, cluster.getNumberOfNodes() - failures, aKey, versioned); + List<Versioned<byte[]>> found = store.get(aKey); + assertEquals(1, found.size()); + assertEquals(versioned, found.get(0)); + assertNOrMoreEqual(routedStore, cluster.getNumberOfNodes() - failures, aKey, versioned); + assertTrue(routedStore.delete(aKey, versioned.getVersion())); + assertNEqual(routedStore, 0, aKey, versioned); + assertTrue(!routedStore.delete(aKey, versioned.getVersion())); + } + + public void testBasicOperationsSingleThreaded() { + testBasicOperations(cluster.getNumberOfNodes(), cluster.getNumberOfNodes(), 0, 1); + } + + public void testBasicOperationsMultiThreaded() { + testBasicOperations(cluster.getNumberOfNodes(), cluster.getNumberOfNodes(), 0, 4); + } + + public void testBasicOperationsMultiThreadedWithFailures() { + testBasicOperations(cluster.getNumberOfNodes() - 2, cluster.getNumberOfNodes() - 2, 2, 4); + } + + public void testBasicOperationFailure(int reads, int writes, int failures, int threads) { + VectorClock clock = getClock(1); + Versioned<byte[]> versioned = new Versioned<byte[]>(aValue, clock); + RoutedStore routedStore = getStore(cluster, + reads, + cluster.getNumberOfNodes(), + writes, + threads, + failures, + 0, + new RouteToAllStrategy(cluster.getNodes()), + new UnreachableStoreException("no go")); + try { + routedStore.put(aKey, versioned); + fail("Put succeeded with too few operational nodes."); + } catch(InsufficientOperationalNodesException e) { + // expected + } + try { + routedStore.get(aKey); + fail("Get succeeded with too few operational nodes."); + } catch(InsufficientOperationalNodesException e) { + // expected + } + try { + routedStore.delete(aKey, versioned.getVersion()); + fail("Get succeeded with too few operational nodes."); + } catch(InsufficientOperationalNodesException e) { + // expected + } + } + + public void testBasicOperationFailureMultiThreaded() { + testBasicOperationFailure(cluster.getNumberOfNodes() - 2, + cluster.getNumberOfNodes() - 2, + 4, + 4); + } + public void testPutIncrementsVersion() { - Store<byte[],byte[]> store = getStore(); + Store<byte[], byte[]> store = getStore(); VectorClock clock = new VectorClock(); VectorClock copy = clock.clone(); store.put(aKey, new Versioned<byte[]>(getValue(), clock)); List<Versioned<byte[]>> found = store.get(aKey); assertEquals("Invalid number of items found.", 1, found.size()); - assertEquals("Version not incremented properly", Occured.BEFORE, copy.compare(found.get(0).getVersion())); + assertEquals("Version not incremented properly", + Occured.BEFORE, + copy.compare(found.get(0).getVersion())); } - + public void testObsoleteMasterFails() { - // write me + // write me } - + public void testOnlyNodeFailuresDisableNode() { RoutingStrategy strategy; Cluster cluster; - + // test put cluster = getNineNodeCluster(); strategy = new RouteToAllStrategy(cluster.getNodes()); - Store<byte[],byte[]> s1 = getStore(cluster, 1, 9, cluster.getNumberOfNodes(), 9, 9, 0, strategy, new VoldemortException()); + Store<byte[], byte[]> s1 = getStore(cluster, + 1, + 9, + cluster.getNumberOfNodes(), + 9, + 9, + 0, + strategy, + new VoldemortException()); try { s1.put(aKey, new Versioned<byte[]>(aValue)); fail("Failure is expected"); } catch(InsufficientOperationalNodesException e) { /* expected */} assertOperationalNodes(cluster, 9); - + cluster = getNineNodeCluster(); strategy = new RouteToAllStrategy(cluster.getNodes()); - Store<byte[],byte[]> s2 = getStore(cluster, 1, 9, cluster.getNumberOfNodes(), 9, 9, 0, strategy, new UnreachableStoreException("no go")); + Store<byte[], byte[]> s2 = getStore(cluster, + 1, + 9, + cluster.getNumberOfNodes(), + 9, + 9, + 0, + strategy, + new UnreachableStoreException("no go")); try { s2.put(aKey, new Versioned<byte[]>(aValue)); fail("Failure is expected"); } catch(InsufficientOperationalNodesException e) { /* expected */} assertOperationalNodes(cluster, 0); - + // test get cluster = getNineNodeCluster(); strategy = new RouteToAllStrategy(cluster.getNodes()); - s1 = getStore(cluster, 1, 9, cluster.getNumberOfNodes(), 9, 9, 0, strategy, new VoldemortException()); + s1 = getStore(cluster, + 1, + 9, + cluster.getNumberOfNodes(), + 9, + 9, + 0, + strategy, + new VoldemortException()); try { s1.get(aKey); fail("Failure is expected"); } catch(InsufficientOperationalNodesException e) { /* expected */} assertOperationalNodes(cluster, 9); - + cluster = getNineNodeCluster(); strategy = new RouteToAllStrategy(cluster.getNodes()); - s2 = getStore(cluster, 1, 9, cluster.getNumberOfNodes(), 9, 9, 0, strategy, new UnreachableStoreException("no go")); + s2 = getStore(cluster, + 1, + 9, + cluster.getNumberOfNodes(), + 9, + 9, + 0, + strategy, + new UnreachableStoreException("no go")); try { s2.get(aKey); fail("Failure is expected"); } catch(InsufficientOperationalNodesException e) { /* expected */} assertOperationalNodes(cluster, 0); - + // test delete cluster = getNineNodeCluster(); strategy = new RouteToAllStrategy(cluster.getNodes()); - s1 = getStore(cluster, 1, 9, cluster.getNumberOfNodes(), 9, 9, 0, strategy, new VoldemortException()); + s1 = getStore(cluster, + 1, + 9, + cluster.getNumberOfNodes(), + 9, + 9, + 0, + strategy, + new VoldemortException()); try { s1.delete(aKey, new VectorClock()); fail("Failure is expected"); } catch(InsufficientOperationalNodesException e) { /* expected */} assertOperationalNodes(cluster, 9); - + cluster = getNineNodeCluster(); strategy = new RouteToAllStrategy(cluster.getNodes()); - s2 = getStore(cluster, 1, 9, cluster.getNumberOfNodes(), 9, 9, 0, strategy, new UnreachableStoreException("no go")); + s2 = getStore(cluster, + 1, + 9, + cluster.getNumberOfNodes(), + 9, + 9, + 0, + strategy, + new UnreachableStoreException("no go")); try { s2.delete(aKey, new VectorClock()); fail("Failure is expected"); } catch(InsufficientOperationalNodesException e) { /* expected */} assertOperationalNodes(cluster, 0); } - + public void testStoreTimeouts() throws InterruptedException { - /* - Cluster cluster = getThreeNodeThreePartitionCluster(); - RoutingStrategy strategy = new RouteToAllStrategy(cluster); - final Store<byte[],byte[]> store = getStore(cluster, 1, 9, 9, 0, 9, strategy, new VoldemortException()); - store.put(aKey, new Versioned<byte[]>(new byte[0])); - */ + /* + * Cluster cluster = getThreeNodeThreePartitionCluster(); RoutingStrategy + * strategy = new RouteToAllStrategy(cluster); final Store<byte[],byte[]> + * store = getStore(cluster, 1, 9, 9, 0, 9, strategy, new + * VoldemortException()); store.put(aKey, new Versioned<byte[]>(new + * byte[0])); + */ } - + public void assertOperationalNodes(Cluster cluster, int expected) { int found = 0; for(Node n: cluster.getNodes()) if(n.getStatus().isAvailable()) - found ++; - assertEquals("Number of operational nodes not what was expected.", - expected, - found); + found++; + assertEquals("Number of operational nodes not what was expected.", expected, found); } } test/unit/voldemort/store/routed/RoutedStoreTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.serialized; import java.util.List; @@ -9,7 +25,7 @@ import voldemort.store.memory.InMemoryStorageEngine; /** * @author jay - * + * */ public class SerializingStoreTest extends BasicStoreTest<String, String> { @@ -20,10 +36,9 @@ public class SerializingStoreTest extends BasicStoreTest<String, String> { @Override public Store<String, String> getStore() { - return new SerializingStore<String, String>( - new InMemoryStorageEngine<byte[], byte[]>("test"), - new StringSerializer(), - new StringSerializer()); + return new SerializingStore<String, String>(new InMemoryStorageEngine<byte[], byte[]>("test"), + new StringSerializer(), + new StringSerializer()); } @Override test/unit/voldemort/store/serialized/SerializingStoreTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.slop; import java.util.Arrays; @@ -13,41 +29,41 @@ import voldemort.store.UnreachableStoreException; import voldemort.store.memory.InMemoryStorageEngine; import voldemort.versioning.Versioned; - public class SloppyStoreTest extends ByteArrayStoreTest { - + private static final byte[] testVal = "test".getBytes(); private static final int NODE_ID = 0; - @Override + @Override @SuppressWarnings("unchecked") - public Store<byte[],byte[]> getStore() { - Collection<InMemoryStorageEngine<byte[],Slop>> backups = Arrays.asList(new InMemoryStorageEngine<byte[],Slop>("test")); - return new SloppyStore(NODE_ID, new InMemoryStorageEngine<byte[],byte[]>("test"), backups); - } - + public Store<byte[], byte[]> getStore() { + Collection<InMemoryStorageEngine<byte[], Slop>> backups = Arrays.asList(new InMemoryStorageEngine<byte[], Slop>("test")); + return new SloppyStore(NODE_ID, new InMemoryStorageEngine<byte[], byte[]>("test"), backups); + } + @SuppressWarnings("unchecked") - public SloppyStore getSloppyStore(Store<byte[],byte[]> store) { - Collection<InMemoryStorageEngine<byte[],Slop>> backups = Arrays.asList(new InMemoryStorageEngine<byte[],Slop>("test")); + public SloppyStore getSloppyStore(Store<byte[], byte[]> store) { + Collection<InMemoryStorageEngine<byte[], Slop>> backups = Arrays.asList(new InMemoryStorageEngine<byte[], Slop>("test")); return new SloppyStore(NODE_ID, store, backups); } - - private void assertBackupHasOperation(Slop slop, List<Store<byte[],Slop>> backups) { - for(Store<byte[],Slop> backup: backups) { + + private void assertBackupHasOperation(Slop slop, List<Store<byte[], Slop>> backups) { + for(Store<byte[], Slop> backup: backups) { List<Versioned<Slop>> slops = backup.get(slop.makeKey()); for(Versioned<Slop> found: slops) { Slop foundSlop = found.getValue(); - if(foundSlop.getKey().equals(slop.getKey()) && - TestUtils.bytesEqual(foundSlop.getValue(), slop.getValue()) && - foundSlop.getOperation().equals(slop.getOperation())) + if(foundSlop.getKey().equals(slop.getKey()) + && TestUtils.bytesEqual(foundSlop.getValue(), slop.getValue()) + && foundSlop.getOperation().equals(slop.getOperation())) return; } } fail("Could not find slop " + slop + " in backup stores."); } - + public void testFailingStore() { - SloppyStore store = getSloppyStore(new FailingStore<byte[],byte[]>("test", new UnreachableStoreException("Unreachable store."))); + SloppyStore store = getSloppyStore(new FailingStore<byte[], byte[]>("test", + new UnreachableStoreException("Unreachable store."))); try { store.put(testVal, new Versioned<byte[]>(testVal)); fail("Failing store doesn't fail."); test/unit/voldemort/store/slop/SloppyStoreTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.store.socket; import java.util.concurrent.CountDownLatch; @@ -14,47 +30,48 @@ import voldemort.store.Store; import voldemort.versioning.Versioned; public class SocketStoreTest extends ByteArrayStoreTest { - + private SocketServer socketServer; private SocketStore socketStore; @Override protected void setUp() throws Exception { super.setUp(); - socketServer = ServerTestUtils.getSocketServer(VoldemortTestConstants.getOneNodeClusterXml(), + socketServer = ServerTestUtils.getSocketServer(VoldemortTestConstants.getOneNodeClusterXml(), VoldemortTestConstants.getSimpleStoreDefinitionsXml(), - "test", + "test", 6667); socketStore = ServerTestUtils.getSocketStore("test", 6667); } - + @Override - public Store<byte[],byte[]> getStore() { + public Store<byte[], byte[]> getStore() { return socketStore; } - + @Override public void tearDown() throws Exception { super.tearDown(); socketServer.shutdown(); socketStore.close(); } - + public void testThreadOverload() throws Exception { - final Store<byte[],byte[]> store = getStore(); + final Store<byte[], byte[]> store = getStore(); final AtomicInteger val = new AtomicInteger(0); final CountDownLatch latch = new CountDownLatch(100); Executor exec = Executors.newCachedThreadPool(); for(int i = 0; i < 100; i++) { exec.execute(new Runnable() { - public void run() { - store.put(TestUtils.randomString("abcdefghijklmnopqrs", 10).getBytes(), - new Versioned<byte[]>(TestUtils.randomBytes(8))); - latch.countDown(); - } + + public void run() { + store.put(TestUtils.randomString("abcdefghijklmnopqrs", 10).getBytes(), + new Versioned<byte[]>(TestUtils.randomBytes(8))); + latch.countDown(); + } }); } latch.await(); } - + } test/unit/voldemort/store/socket/SocketStoreTest.java @@ -1,14 +1,27 @@ -package voldemort.store.socket; +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ -import java.util.concurrent.*; +package voldemort.store.socket; -import voldemort.*; +import voldemort.BlockingInputStream; +import voldemort.BlockingOutputStream; public class SocketStreamHandlerTest { - + private BlockingInputStream istream; private BlockingOutputStream ostream; - - } test/unit/voldemort/store/socket/SocketStreamHandlerTest.java @@ -1,37 +1,52 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; import junit.framework.TestCase; - /** * @author jay - * + * */ public class ClockEntryTest extends TestCase { - public void testEquality() { - ClockEntry v1 = new ClockEntry((short) 0, (short) 1); - ClockEntry v2 = new ClockEntry((short) 0, (short) 1); - assertTrue(v1.equals(v1)); - assertTrue(!v1.equals(null)); - assertEquals(v1, v2); - - v1 = new ClockEntry((short) 0, (short) 1); - v2 = new ClockEntry((short) 0, (short) 2); - assertTrue(!v1.equals(v2)); - - v1 = new ClockEntry((short) Short.MAX_VALUE, (short) 256); - v2 = new ClockEntry((short) Short.MAX_VALUE, (short) 256); - assertEquals(v1, v2); - } - - public void testIncrement() { - ClockEntry v = new ClockEntry((short) 0, (short) 1); - assertEquals(v.getNodeId(), 0); - assertEquals(v.getVersion(), 1); - ClockEntry v2 = v.incremented(); - assertEquals(v.getVersion(), 1); - assertEquals(v2.getVersion(), 2); - } - + public void testEquality() { + ClockEntry v1 = new ClockEntry((short) 0, (short) 1); + ClockEntry v2 = new ClockEntry((short) 0, (short) 1); + assertTrue(v1.equals(v1)); + assertTrue(!v1.equals(null)); + assertEquals(v1, v2); + + v1 = new ClockEntry((short) 0, (short) 1); + v2 = new ClockEntry((short) 0, (short) 2); + assertTrue(!v1.equals(v2)); + + v1 = new ClockEntry((short) Short.MAX_VALUE, (short) 256); + v2 = new ClockEntry((short) Short.MAX_VALUE, (short) 256); + assertEquals(v1, v2); + } + + public void testIncrement() { + ClockEntry v = new ClockEntry((short) 0, (short) 1); + assertEquals(v.getNodeId(), 0); + assertEquals(v.getVersion(), 1); + ClockEntry v2 = v.incremented(); + assertEquals(v.getVersion(), 1); + assertEquals(v2.getVersion(), 2); + } + } test/unit/voldemort/versioning/ClockEntryTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; import java.util.ArrayList; @@ -8,46 +24,52 @@ import junit.framework.TestCase; import voldemort.TestUtils; public class VectorClockInconsistencyResolverTest extends TestCase { - - private InconsistencyResolver<Versioned<String>> resolver; - private Versioned<String> later; - private Versioned<String> prior; - private Versioned<String> current; - private Versioned<String> concurrent; - - public void setUp() { - resolver = new VectorClockInconsistencyResolver<String>(); - current = getVersioned(1,1,2,3); - prior = getVersioned(1,2,3); - concurrent = getVersioned(1,2,3,3); - later = getVersioned(1,1,2,2,3); - } - - private Versioned<String> getVersioned(int...nodes) { - return new Versioned<String>("my-value", TestUtils.getClock(nodes)); - } - - public void testEmptyList() { - assertEquals(0, resolver.resolveConflicts(new ArrayList<Versioned<String>>()).size()); - } - - @SuppressWarnings("unchecked") - public void testDuplicatesResolve() { - assertEquals(2, resolver.resolveConflicts(Arrays.asList(concurrent, current, current, concurrent, current)).size()); - } - - @SuppressWarnings("unchecked") - public void testResolveNormal() { - assertEquals(later, resolver.resolveConflicts(Arrays.asList(current, prior, later)).get(0)); - assertEquals(later, resolver.resolveConflicts(Arrays.asList(prior, current, later)).get(0)); - assertEquals(later, resolver.resolveConflicts(Arrays.asList(later, current, prior)).get(0)); - } - - @SuppressWarnings("unchecked") - public void testResolveConcurrent() { - List<Versioned<String>> resolved = resolver.resolveConflicts(Arrays.asList(current, concurrent, prior)); - assertEquals(2, resolved.size()); - assertTrue("Version not found", resolved.contains(current)); - assertTrue("Version not found", resolved.contains(concurrent)); - } + + private InconsistencyResolver<Versioned<String>> resolver; + private Versioned<String> later; + private Versioned<String> prior; + private Versioned<String> current; + private Versioned<String> concurrent; + + public void setUp() { + resolver = new VectorClockInconsistencyResolver<String>(); + current = getVersioned(1, 1, 2, 3); + prior = getVersioned(1, 2, 3); + concurrent = getVersioned(1, 2, 3, 3); + later = getVersioned(1, 1, 2, 2, 3); + } + + private Versioned<String> getVersioned(int... nodes) { + return new Versioned<String>("my-value", TestUtils.getClock(nodes)); + } + + public void testEmptyList() { + assertEquals(0, resolver.resolveConflicts(new ArrayList<Versioned<String>>()).size()); + } + + @SuppressWarnings("unchecked") + public void testDuplicatesResolve() { + assertEquals(2, resolver.resolveConflicts(Arrays.asList(concurrent, + current, + current, + concurrent, + current)).size()); + } + + @SuppressWarnings("unchecked") + public void testResolveNormal() { + assertEquals(later, resolver.resolveConflicts(Arrays.asList(current, prior, later)).get(0)); + assertEquals(later, resolver.resolveConflicts(Arrays.asList(prior, current, later)).get(0)); + assertEquals(later, resolver.resolveConflicts(Arrays.asList(later, current, prior)).get(0)); + } + + @SuppressWarnings("unchecked") + public void testResolveConcurrent() { + List<Versioned<String>> resolved = resolver.resolveConflicts(Arrays.asList(current, + concurrent, + prior)); + assertEquals(2, resolved.size()); + assertTrue("Version not found", resolved.contains(current)); + assertTrue("Version not found", resolved.contains(concurrent)); + } } test/unit/voldemort/versioning/VectorClockInconsistencyResolverTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; import static voldemort.TestUtils.getClock; test/unit/voldemort/versioning/VectorClockTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.versioning; import junit.framework.TestCase; test/unit/voldemort/versioning/VersionedTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.xml; import java.io.StringReader; @@ -10,22 +26,22 @@ import voldemort.cluster.Node; public class ClusterMapperTest extends TestCase { - public void testClusterMapperValues() { - ClusterMapper mapper = new ClusterMapper(); - Cluster cluster = mapper.readCluster(new StringReader(VoldemortTestConstants.getOneNodeClusterXml())); - assertEquals(cluster.getNumberOfNodes(), 1); - assertEquals(cluster.getName(), "mycluster"); - Node node = cluster.getNodes().iterator().next(); - assertNotNull(node); - assertEquals(node.getId(), 0); - List<Integer> tags = node.getPartitionIds(); - assertTrue("Tag not found.", tags.contains(0)); - assertTrue("Tag not found.", tags.contains(1)); - } + public void testClusterMapperValues() { + ClusterMapper mapper = new ClusterMapper(); + Cluster cluster = mapper.readCluster(new StringReader(VoldemortTestConstants.getOneNodeClusterXml())); + assertEquals(cluster.getNumberOfNodes(), 1); + assertEquals(cluster.getName(), "mycluster"); + Node node = cluster.getNodes().iterator().next(); + assertNotNull(node); + assertEquals(node.getId(), 0); + List<Integer> tags = node.getPartitionIds(); + assertTrue("Tag not found.", tags.contains(0)); + assertTrue("Tag not found.", tags.contains(1)); + } - public void testOtherClusters() { - ClusterMapper mapper = new ClusterMapper(); - mapper.readCluster(new StringReader(VoldemortTestConstants.getNineNodeClusterXml())); - mapper.readCluster(new StringReader(VoldemortTestConstants.getTwoNodeClusterXml())); - } + public void testOtherClusters() { + ClusterMapper mapper = new ClusterMapper(); + mapper.readCluster(new StringReader(VoldemortTestConstants.getNineNodeClusterXml())); + mapper.readCluster(new StringReader(VoldemortTestConstants.getTwoNodeClusterXml())); + } } test/unit/voldemort/xml/ClusterMapperTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2008-2009 LinkedIn, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + package voldemort.xml; import static voldemort.VoldemortTestConstants.getSimpleStoreDefinitionsXml; @@ -17,7 +33,7 @@ public class StoreDefinitionMapperTest extends TestCase { String output = mapper.writeStoreList(storeDefs); List<StoreDefinition> found = mapper.readStoreList(new StringReader(output)); assertEqual(storeDefs, found); - for(StoreDefinition def : storeDefs) { + for(StoreDefinition def: storeDefs) { String xml = mapper.writeStore(def); StoreDefinition newDef = mapper.readStore(new StringReader(xml)); assertEquals(def, newDef); test/unit/voldemort/xml/StoreDefinitionMapperTest.java license.txt e0cff171a39181ae28ae70560ed75374d7110215 Jay Kreps jay.kreps@gmail.com http://github.com/voldemort/voldemort/commit/1e68b44ad9db865751770bc2e2df1f01e109faeb 1e68b44ad9db865751770bc2e2df1f01e109faeb 2009-01-13T14:59:15-08:00 2009-01-13T14:59:15-08:00 Add license header to source files. b4d5a95c5c6c00997b8d4635e41a28da8e2d2ffb Jay Kreps jay.kreps@gmail.com