diff --git a/build.xml b/build.xml index f7692224a8..7dc08e0257 100644 --- a/build.xml +++ b/build.xml @@ -1,4 +1,22 @@ + diff --git a/conf/storage-conf.xml b/conf/storage-conf.xml index f78d409499..f4a99b3e93 100644 --- a/conf/storage-conf.xml +++ b/conf/storage-conf.xml @@ -1,3 +1,21 @@ + diff --git a/lib/JSAP-2.1.jar b/lib/JSAP-2.1.jar deleted file mode 100644 index 15d1f37a78..0000000000 Binary files a/lib/JSAP-2.1.jar and /dev/null differ diff --git a/lib/asm-all-2.2.1.jar b/lib/asm-all-2.2.1.jar deleted file mode 100644 index 8e7ee3186d..0000000000 Binary files a/lib/asm-all-2.2.1.jar and /dev/null differ diff --git a/lib/pcj.jar b/lib/pcj.jar deleted file mode 100644 index 0b6a0e879e..0000000000 Binary files a/lib/pcj.jar and /dev/null differ diff --git a/src/java/org/apache/cassandra/concurrent/ContinuationContext.java b/src/java/org/apache/cassandra/concurrent/ContinuationContext.java index 8a04751029..98e48f0fce 100644 --- a/src/java/org/apache/cassandra/concurrent/ContinuationContext.java +++ b/src/java/org/apache/cassandra/concurrent/ContinuationContext.java @@ -18,7 +18,6 @@ package org.apache.cassandra.concurrent; -import org.apache.cassandra.continuations.Suspendable; import org.apache.commons.javaflow.Continuation; public class ContinuationContext diff --git a/src/java/org/apache/cassandra/concurrent/ContinuationStage.java b/src/java/org/apache/cassandra/concurrent/ContinuationStage.java index d8bdfc037f..c1f6189cff 100644 --- a/src/java/org/apache/cassandra/concurrent/ContinuationStage.java +++ b/src/java/org/apache/cassandra/concurrent/ContinuationStage.java @@ -25,8 +25,6 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.continuations.Suspendable; - public class ContinuationStage implements IStage { diff --git a/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorMBean.java b/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorMBean.java index 798a888b51..4c6abcc81e 100644 --- a/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorMBean.java +++ b/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorMBean.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.concurrent; public interface DebuggableThreadPoolExecutorMBean diff --git a/src/java/org/apache/cassandra/continuations/CAgent.java b/src/java/org/apache/cassandra/continuations/CAgent.java deleted file mode 100644 index e6a9459ed1..0000000000 --- a/src/java/org/apache/cassandra/continuations/CAgent.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 org.apache.cassandra.continuations; - -import java.lang.instrument.Instrumentation; - -import org.apache.commons.javaflow.bytecode.transformation.bcel.BcelClassTransformer; - - -/** - * Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com ) - */ - -public class CAgent -{ - public static void premain(String agentArguments, Instrumentation instrumentation) - { - instrumentation.addTransformer(new ContinuationClassTransformer(agentArguments, new BcelClassTransformer())); - } -} diff --git a/src/java/org/apache/cassandra/continuations/ContinuationClassTransformer.java b/src/java/org/apache/cassandra/continuations/ContinuationClassTransformer.java deleted file mode 100644 index 285c97e972..0000000000 --- a/src/java/org/apache/cassandra/continuations/ContinuationClassTransformer.java +++ /dev/null @@ -1,74 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 org.apache.cassandra.continuations; - -import java.lang.annotation.Annotation; -import java.lang.instrument.ClassFileTransformer; -import java.lang.instrument.IllegalClassFormatException; -import java.security.ProtectionDomain; -import java.util.List; -import java.util.Set; -import java.util.HashSet; -import java.util.StringTokenizer; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.tree.AnnotationNode; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.MethodNode; -import org.apache.commons.javaflow.bytecode.transformation.ResourceTransformer; -import org.apache.commons.javaflow.bytecode.transformation.bcel.BcelClassTransformer; - - -/** - * Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com ) - */ - -class ContinuationClassTransformer implements ClassFileTransformer -{ - private static final String targetAnnotation_ = "Suspendable"; - private ResourceTransformer transformer_; - - public ContinuationClassTransformer(String agentArguments, ResourceTransformer transformer) - { - super(); - transformer_ = transformer; - } - - public byte[] transform(ClassLoader classLoader, String className, Class redefiningClass, ProtectionDomain domain, byte[] bytes) throws IllegalClassFormatException - { - /* - * Use the ASM class reader to see which classes support - * the Suspendable annotation. If they do then those - * classes need to have their bytecodes transformed for - * Continuation support. - */ - ClassReader classReader = new ClassReader(bytes); - ClassNode classNode = new ClassNode(); - classReader.accept(classNode, true); - List annotationNodes = classNode.visibleAnnotations; - - for( AnnotationNode annotationNode : annotationNodes ) - { - if (annotationNode.desc.contains(ContinuationClassTransformer.targetAnnotation_)) - { - bytes = transformer_.transform(bytes); - } - } - return bytes; - } -} diff --git a/src/java/org/apache/cassandra/continuations/Suspendable.java b/src/java/org/apache/cassandra/continuations/Suspendable.java deleted file mode 100644 index 566cb8a974..0000000000 --- a/src/java/org/apache/cassandra/continuations/Suspendable.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 org.apache.cassandra.continuations; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -@Retention(RetentionPolicy.RUNTIME) - -/** - * Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com ) - */ - -public @interface Suspendable -{ - -} diff --git a/src/java/org/apache/cassandra/db/DBConstants.java b/src/java/org/apache/cassandra/db/DBConstants.java index 141689cc02..40b9f977bf 100644 --- a/src/java/org/apache/cassandra/db/DBConstants.java +++ b/src/java/org/apache/cassandra/db/DBConstants.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; final class DBConstants diff --git a/src/java/org/apache/cassandra/db/DataFileVerbHandler.java b/src/java/org/apache/cassandra/db/DataFileVerbHandler.java index db959a5f0d..eaee494269 100644 --- a/src/java/org/apache/cassandra/db/DataFileVerbHandler.java +++ b/src/java/org/apache/cassandra/db/DataFileVerbHandler.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.ByteArrayOutputStream; diff --git a/src/java/org/apache/cassandra/db/FileNameComparator.java b/src/java/org/apache/cassandra/db/FileNameComparator.java index 406f2fc55f..60beec347a 100644 --- a/src/java/org/apache/cassandra/db/FileNameComparator.java +++ b/src/java/org/apache/cassandra/db/FileNameComparator.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.util.Comparator; diff --git a/src/java/org/apache/cassandra/db/FileStructComparator.java b/src/java/org/apache/cassandra/db/FileStructComparator.java index ae3608f69c..fc6626b290 100644 --- a/src/java/org/apache/cassandra/db/FileStructComparator.java +++ b/src/java/org/apache/cassandra/db/FileStructComparator.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.util.Comparator; diff --git a/src/java/org/apache/cassandra/db/IFilter.java b/src/java/org/apache/cassandra/db/IFilter.java index 830ec3668f..c9fc38d222 100644 --- a/src/java/org/apache/cassandra/db/IFilter.java +++ b/src/java/org/apache/cassandra/db/IFilter.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.DataInputStream; diff --git a/src/java/org/apache/cassandra/db/IScanner.java b/src/java/org/apache/cassandra/db/IScanner.java index 7bfd271ec7..0d5a34182a 100644 --- a/src/java/org/apache/cassandra/db/IScanner.java +++ b/src/java/org/apache/cassandra/db/IScanner.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.Closeable; diff --git a/src/java/org/apache/cassandra/db/IdentityFilter.java b/src/java/org/apache/cassandra/db/IdentityFilter.java index d935489a56..2656667ff4 100644 --- a/src/java/org/apache/cassandra/db/IdentityFilter.java +++ b/src/java/org/apache/cassandra/db/IdentityFilter.java @@ -1,11 +1,27 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.DataInputStream; import java.io.IOException; import java.util.Collection; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.continuations.Suspendable; import org.apache.cassandra.io.DataInputBuffer; import org.apache.cassandra.io.SSTable; diff --git a/src/java/org/apache/cassandra/db/RangeCommand.java b/src/java/org/apache/cassandra/db/RangeCommand.java index be346d5b10..4b61ba6dcf 100644 --- a/src/java/org/apache/cassandra/db/RangeCommand.java +++ b/src/java/org/apache/cassandra/db/RangeCommand.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.DataOutputStream; diff --git a/src/java/org/apache/cassandra/db/RangeReply.java b/src/java/org/apache/cassandra/db/RangeReply.java index 7237a68cd8..2840b32064 100644 --- a/src/java/org/apache/cassandra/db/RangeReply.java +++ b/src/java/org/apache/cassandra/db/RangeReply.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.util.List; diff --git a/src/java/org/apache/cassandra/db/TableNotDefinedException.java b/src/java/org/apache/cassandra/db/TableNotDefinedException.java index e1b6437c9d..48e705f899 100644 --- a/src/java/org/apache/cassandra/db/TableNotDefinedException.java +++ b/src/java/org/apache/cassandra/db/TableNotDefinedException.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import org.apache.cassandra.service.InvalidRequestException; diff --git a/src/java/org/apache/cassandra/db/TouchMessage.java b/src/java/org/apache/cassandra/db/TouchMessage.java index 9ddd13418d..3a79228789 100644 --- a/src/java/org/apache/cassandra/db/TouchMessage.java +++ b/src/java/org/apache/cassandra/db/TouchMessage.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.ByteArrayOutputStream; diff --git a/src/java/org/apache/cassandra/db/TouchVerbHandler.java b/src/java/org/apache/cassandra/db/TouchVerbHandler.java index 4c02587324..949c5ec0c2 100644 --- a/src/java/org/apache/cassandra/db/TouchVerbHandler.java +++ b/src/java/org/apache/cassandra/db/TouchVerbHandler.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.IOException; diff --git a/src/java/org/apache/cassandra/dht/BigIntegerToken.java b/src/java/org/apache/cassandra/dht/BigIntegerToken.java index 2615b2d9b5..8cd2cd636c 100644 --- a/src/java/org/apache/cassandra/dht/BigIntegerToken.java +++ b/src/java/org/apache/cassandra/dht/BigIntegerToken.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.dht; import java.math.BigInteger; diff --git a/src/java/org/apache/cassandra/dht/StringToken.java b/src/java/org/apache/cassandra/dht/StringToken.java index 5b6ebe71fd..caf8374361 100644 --- a/src/java/org/apache/cassandra/dht/StringToken.java +++ b/src/java/org/apache/cassandra/dht/StringToken.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.dht; public class StringToken extends Token diff --git a/src/java/org/apache/cassandra/dht/Token.java b/src/java/org/apache/cassandra/dht/Token.java index e956a8d87c..dc30799fc6 100644 --- a/src/java/org/apache/cassandra/dht/Token.java +++ b/src/java/org/apache/cassandra/dht/Token.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.dht; import java.io.DataInputStream; diff --git a/src/java/org/apache/cassandra/io/ChecksumManager.java b/src/java/org/apache/cassandra/io/ChecksumManager.java index e55de05c15..bcf0b978c5 100644 --- a/src/java/org/apache/cassandra/io/ChecksumManager.java +++ b/src/java/org/apache/cassandra/io/ChecksumManager.java @@ -17,10 +17,7 @@ */ package org.apache.cassandra.io; -import java.io.BufferedInputStream; -import java.io.DataInputStream; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.RandomAccessFile; import java.lang.reflect.Method; @@ -29,7 +26,6 @@ import java.nio.channels.FileChannel; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -41,8 +37,6 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.utils.FileUtils; import org.apache.cassandra.utils.LogUtil; import org.apache.log4j.Logger; -import bak.pcj.map.AbstractLongKeyLongMap; -import bak.pcj.map.LongKeyLongChainedHashMap; /** * This class manages the persistence of checksums and keeps @@ -64,7 +58,7 @@ public class ChecksumManager private static final long chunkMask_ = 0x00000000FFFFFFFFL; private static final long fileIdMask_ = 0x7FFFFFFF00000000L; /* Map where checksums are cached. */ - private static AbstractLongKeyLongMap chksums_ = new LongKeyLongChainedHashMap(); + private static Map chksums_ = new HashMap(); public static ChecksumManager instance(String dataFile) throws IOException { diff --git a/src/java/org/apache/cassandra/io/DataInputBuffer.java b/src/java/org/apache/cassandra/io/DataInputBuffer.java index 790106b443..c1cecadcc0 100644 --- a/src/java/org/apache/cassandra/io/DataInputBuffer.java +++ b/src/java/org/apache/cassandra/io/DataInputBuffer.java @@ -19,10 +19,6 @@ package org.apache.cassandra.io; import java.io.*; -import java.nio.ByteBuffer; -import java.util.Random; - -import org.apache.cassandra.continuations.Suspendable; /** diff --git a/src/java/org/apache/cassandra/io/DataOutputBuffer.java b/src/java/org/apache/cassandra/io/DataOutputBuffer.java index 0c9f6d7a91..d45839b663 100644 --- a/src/java/org/apache/cassandra/io/DataOutputBuffer.java +++ b/src/java/org/apache/cassandra/io/DataOutputBuffer.java @@ -18,13 +18,10 @@ package org.apache.cassandra.io; -import java.io.*; -import java.nio.ByteBuffer; -import java.nio.MappedByteBuffer; -import java.nio.channels.FileChannel; -import java.util.Arrays; - -import org.apache.cassandra.continuations.Suspendable; +import java.io.ByteArrayOutputStream; +import java.io.DataInput; +import java.io.DataOutputStream; +import java.io.IOException; /** diff --git a/src/java/org/apache/cassandra/loader/ColumnFamilyType.java b/src/java/org/apache/cassandra/loader/ColumnFamilyType.java index 277c389b2f..b87683de3f 100644 --- a/src/java/org/apache/cassandra/loader/ColumnFamilyType.java +++ b/src/java/org/apache/cassandra/loader/ColumnFamilyType.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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. +*/ // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See http://java.sun.com/xml/jaxb diff --git a/src/java/org/apache/cassandra/loader/ColumnType.java b/src/java/org/apache/cassandra/loader/ColumnType.java index e564ff709c..09e7087e7a 100644 --- a/src/java/org/apache/cassandra/loader/ColumnType.java +++ b/src/java/org/apache/cassandra/loader/ColumnType.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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. +*/ // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See http://java.sun.com/xml/jaxb diff --git a/src/java/org/apache/cassandra/loader/FieldCollection.java b/src/java/org/apache/cassandra/loader/FieldCollection.java index b4806c920e..6442ac4cbc 100644 --- a/src/java/org/apache/cassandra/loader/FieldCollection.java +++ b/src/java/org/apache/cassandra/loader/FieldCollection.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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. +*/ // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See http://java.sun.com/xml/jaxb diff --git a/src/java/org/apache/cassandra/loader/Importer.java b/src/java/org/apache/cassandra/loader/Importer.java index a7c51c0cc6..7874a57974 100644 --- a/src/java/org/apache/cassandra/loader/Importer.java +++ b/src/java/org/apache/cassandra/loader/Importer.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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. +*/ // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See http://java.sun.com/xml/jaxb diff --git a/src/java/org/apache/cassandra/loader/KeyType.java b/src/java/org/apache/cassandra/loader/KeyType.java index 2183b00b2f..cc354b3430 100644 --- a/src/java/org/apache/cassandra/loader/KeyType.java +++ b/src/java/org/apache/cassandra/loader/KeyType.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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. +*/ // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See http://java.sun.com/xml/jaxb diff --git a/src/java/org/apache/cassandra/loader/Loader.java b/src/java/org/apache/cassandra/loader/Loader.java index fd70d4bc85..8c468ad9b3 100644 --- a/src/java/org/apache/cassandra/loader/Loader.java +++ b/src/java/org/apache/cassandra/loader/Loader.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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. +*/ /** * */ diff --git a/src/java/org/apache/cassandra/loader/ObjectFactory.java b/src/java/org/apache/cassandra/loader/ObjectFactory.java index 3ecb43f17c..7eafdd257f 100644 --- a/src/java/org/apache/cassandra/loader/ObjectFactory.java +++ b/src/java/org/apache/cassandra/loader/ObjectFactory.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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. +*/ // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See http://java.sun.com/xml/jaxb diff --git a/src/java/org/apache/cassandra/loader/SuperColumnType.java b/src/java/org/apache/cassandra/loader/SuperColumnType.java index 82f84aec19..eac22beb65 100644 --- a/src/java/org/apache/cassandra/loader/SuperColumnType.java +++ b/src/java/org/apache/cassandra/loader/SuperColumnType.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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. +*/ // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See http://java.sun.com/xml/jaxb diff --git a/src/java/org/apache/cassandra/loader/TimestampType.java b/src/java/org/apache/cassandra/loader/TimestampType.java index 7875e510e5..ecd9938662 100644 --- a/src/java/org/apache/cassandra/loader/TimestampType.java +++ b/src/java/org/apache/cassandra/loader/TimestampType.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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. +*/ // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See http://java.sun.com/xml/jaxb diff --git a/src/java/org/apache/cassandra/loader/ValueType.java b/src/java/org/apache/cassandra/loader/ValueType.java index e8b4300d2d..f309e14002 100644 --- a/src/java/org/apache/cassandra/loader/ValueType.java +++ b/src/java/org/apache/cassandra/loader/ValueType.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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. +*/ // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See http://java.sun.com/xml/jaxb diff --git a/src/java/org/apache/cassandra/locator/AbstractStrategy.java b/src/java/org/apache/cassandra/locator/AbstractStrategy.java index 1246069c0c..93a6a91119 100644 --- a/src/java/org/apache/cassandra/locator/AbstractStrategy.java +++ b/src/java/org/apache/cassandra/locator/AbstractStrategy.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.locator; import java.util.ArrayList; diff --git a/src/java/org/apache/cassandra/locator/RackAwareStrategy.java b/src/java/org/apache/cassandra/locator/RackAwareStrategy.java index cbedac5a7b..192c13c6f5 100644 --- a/src/java/org/apache/cassandra/locator/RackAwareStrategy.java +++ b/src/java/org/apache/cassandra/locator/RackAwareStrategy.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.locator; import java.net.UnknownHostException; diff --git a/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java b/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java index ed79717c76..f7feb69db6 100644 --- a/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java +++ b/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.locator; import java.util.ArrayList; diff --git a/src/java/org/apache/cassandra/net/MessageDeliveryTask.java b/src/java/org/apache/cassandra/net/MessageDeliveryTask.java index b76ad64e05..b8d16be155 100644 --- a/src/java/org/apache/cassandra/net/MessageDeliveryTask.java +++ b/src/java/org/apache/cassandra/net/MessageDeliveryTask.java @@ -18,8 +18,6 @@ package org.apache.cassandra.net; -import org.apache.cassandra.continuations.Suspendable; -import org.apache.cassandra.utils.LogUtil; import org.apache.log4j.Logger; diff --git a/src/java/org/apache/cassandra/net/http/ColumnFamilyFormatter.java b/src/java/org/apache/cassandra/net/http/ColumnFamilyFormatter.java index cc991902c0..e6924f4691 100644 --- a/src/java/org/apache/cassandra/net/http/ColumnFamilyFormatter.java +++ b/src/java/org/apache/cassandra/net/http/ColumnFamilyFormatter.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.net.http; import java.util.Collection; diff --git a/src/java/org/apache/cassandra/procedures/GroovyScriptRunner.java b/src/java/org/apache/cassandra/procedures/GroovyScriptRunner.java index a7e2e9ecd8..a6ff3d158c 100644 --- a/src/java/org/apache/cassandra/procedures/GroovyScriptRunner.java +++ b/src/java/org/apache/cassandra/procedures/GroovyScriptRunner.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.procedures; import groovy.lang.GroovyShell; diff --git a/src/java/org/apache/cassandra/service/Constants.java b/src/java/org/apache/cassandra/service/Constants.java index 1171df7633..3277b0d8a5 100644 --- a/src/java/org/apache/cassandra/service/Constants.java +++ b/src/java/org/apache/cassandra/service/Constants.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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. +*/ /** * Autogenerated by Thrift * diff --git a/src/java/org/apache/cassandra/service/RangeVerbHandler.java b/src/java/org/apache/cassandra/service/RangeVerbHandler.java index c0ac3b3b42..d9ed6883de 100644 --- a/src/java/org/apache/cassandra/service/RangeVerbHandler.java +++ b/src/java/org/apache/cassandra/service/RangeVerbHandler.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.service; import java.io.IOException; diff --git a/src/java/org/apache/cassandra/service/StorageProxyMBean.java b/src/java/org/apache/cassandra/service/StorageProxyMBean.java index faee5371e3..8b2cea9e2d 100644 --- a/src/java/org/apache/cassandra/service/StorageProxyMBean.java +++ b/src/java/org/apache/cassandra/service/StorageProxyMBean.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.service; public interface StorageProxyMBean diff --git a/src/java/org/apache/cassandra/test/StressTest.java b/src/java/org/apache/cassandra/test/StressTest.java deleted file mode 100644 index 6c4d862624..0000000000 --- a/src/java/org/apache/cassandra/test/StressTest.java +++ /dev/null @@ -1,835 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 org.apache.cassandra.test; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Random; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.TimeUnit; - -import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor; -import org.apache.cassandra.concurrent.ThreadFactoryImpl; -import org.apache.cassandra.db.ColumnReadCommand; -import org.apache.cassandra.db.ReadCommand; -import org.apache.cassandra.db.Row; -import org.apache.cassandra.db.RowMutation; -import org.apache.cassandra.db.RowMutationMessage; -import org.apache.cassandra.net.EndPoint; -import org.apache.cassandra.net.Message; -import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.service.Cassandra; -import org.apache.cassandra.service.IResponseResolver; -import org.apache.cassandra.service.QuorumResponseHandler; -import org.apache.cassandra.service.ReadResponseResolver; -import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.service.batch_mutation_super_t; -import org.apache.cassandra.service.batch_mutation_t; -import org.apache.cassandra.service.column_t; -import org.apache.cassandra.service.superColumn_t; -import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.LogUtil; -import org.apache.log4j.Logger; -import org.apache.thrift.protocol.TBinaryProtocol; -import org.apache.thrift.transport.TSocket; -import org.apache.thrift.transport.TTransport; -import com.martiansoftware.jsap.*; - -/** - * Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com ) - */ - -public class StressTest -{ - private static Logger logger_ = Logger.getLogger(StressTest.class); - - private static final String tablename_ = new String("Test"); - - public static EndPoint from_ = new EndPoint("172.24.24.209", 10001); - - public static EndPoint to_ = new EndPoint("hadoop071.sf2p.facebook.com", 7000); - private static String server_ = new String("hadoop071.sf2p.facebook.com"); - private static final String columnFamilyColumn_ = new String("ColumnList"); - private static final String columnFamilySuperColumn_ = new String("SuperColumnList"); - private static final String keyFix_ = new String(""); - private static final String columnFix_ = new String("Column-"); - private static final String superColumnFix_ = new String("SuperColumn-"); - - private Cassandra.Client peerstorageClient_ = null; - TTransport transport_ = null; - private int requestsPerSecond_ = 1000; - private ExecutorService runner_ = null; - - - class LoadManager implements Runnable - { - private RowMutationMessage rmsg_ = null; - private batch_mutation_t bt_ = null; - private batch_mutation_super_t bts_ = null; - - LoadManager(RowMutationMessage rmsg) - { - rmsg_ = rmsg; - } - LoadManager(batch_mutation_t bt) - { - bt_ = bt; - } - LoadManager(batch_mutation_super_t bts) - { - bts_ = bts; - } - - public void run() - { - if( rmsg_ != null ) - { - try - { - MessagingService.getMessagingInstance().sendOneWay(rmsg_.makeRowMutationMessage(), to_); - } - catch (IOException e) - { - throw new RuntimeException(e); - } - } - - } - } - - - /* - * This function will apply the given task . It is based on a requests per - * second member variable which can be set to teh required ammount , it will - * generate only those many requests and if thos emany requests have already - * been entered then it will sleep . This function assumes that there is no - * waiting in any other part of the code so the requests are being generated - * instantaniously . - */ - public void applyLoad(RowMutation rm) throws IOException { - try - { - long t = System.currentTimeMillis(); - RowMutationMessage rmMsg = new RowMutationMessage(rm); - MessagingService.getMessagingInstance().sendOneWay(rmMsg.makeRowMutationMessage(), to_); - Thread.sleep(1, 1000000000/requestsPerSecond_); - - } - catch (Exception e) - { - e.printStackTrace(); - } - - } - - public void readLoad(ReadCommand readCommand) - { - try - { - MessagingService.getMessagingInstance().sendOneWay(readCommand.makeReadMessage(), to_); - } - catch (IOException e) - { - throw new RuntimeException(e); - } - } - - public void randomReadColumn (int keys, int columns, int size, int tps) - { - Random random = new Random(); - try - { - while(true) - { - int key = random.nextInt(keys) + 1; - String stringKey = new Integer(key).toString(); - stringKey = stringKey + keyFix_ ; - int j = random.nextInt(columns) + 1; - ReadCommand rm = new ColumnReadCommand(tablename_, stringKey, columnFamilyColumn_ + ":" + columnFix_ + j); - readLoad(rm); - if ( requestsPerSecond_ > 1000) - Thread.sleep(0, 1000000000/requestsPerSecond_); - else - Thread.sleep(1000/requestsPerSecond_); - } - } - catch(Exception ex) - { - ex.printStackTrace(); - } - } - - public void randomWriteColumn(int keys, int columns, int size, int tps) - { - Random random = new Random(); - byte[] bytes = new byte[size]; - int ts = 1; - try - { - while(true) - { - int key = random.nextInt(keys) + 1; - String stringKey = new Integer(key).toString(); - stringKey = stringKey + keyFix_ ; - RowMutation rm = new RowMutation(tablename_, stringKey); - int j = random.nextInt(columns) + 1; - random.nextBytes(bytes); - rm.add( columnFamilyColumn_ + ":" + columnFix_ + j, bytes, ts); - if ( ts == Integer.MAX_VALUE) - { - ts = 0 ; - } - ts++; - for(int k = 0 ; k < requestsPerSecond_/1000 +1 ; k++ ) - { - runner_.submit(new LoadManager(new RowMutationMessage(rm))); - } - try - { - if ( requestsPerSecond_ > 1000) - Thread.sleep(1); - else - Thread.sleep(1000/requestsPerSecond_); - } - catch ( Exception ex) - { - - } - } - } - catch(Exception ex) - { - ex.printStackTrace(); - } - } - - public void randomReadSuperColumn(int keys, int superColumns, int columns, int size, int tps) - { - Random random = new Random(); - try - { - while(true) - { - int key = random.nextInt(keys) + 1; - String stringKey = new Integer(key).toString(); - stringKey = stringKey + keyFix_ ; - int i = random.nextInt(superColumns) + 1; - int j = random.nextInt(columns) + 1; - ReadCommand rm = new ColumnReadCommand(tablename_, stringKey, columnFamilySuperColumn_ + ":" + superColumnFix_ + i + ":" + columnFix_ + j); - readLoad(rm); - } - } - catch(Exception ex) - { - ex.printStackTrace(); - } - } - - - public void randomWriteSuperColumn(int keys, int superColumns,int columns, int size, int tps) - { - Random random = new Random(); - byte[] bytes = new byte[size]; - int ts = 1; - try - { - while(true) - { - int key = random.nextInt(keys) + 1; - String stringKey = new Integer(key).toString(); - stringKey = stringKey + keyFix_ ; - RowMutation rm = new RowMutation(tablename_, stringKey); - int i = random.nextInt(superColumns) + 1; - int j = random.nextInt(columns) + 1; - random.nextBytes(bytes); - rm.add( columnFamilySuperColumn_ + ":" + superColumnFix_ + i + ":" + columnFix_ + j, bytes, ts); - if ( ts == Integer.MAX_VALUE ) - { - ts = 0 ; - } - ts++; - for(int k = 0 ; k < requestsPerSecond_/1000 +1 ; k++ ) - { - runner_.submit(new LoadManager(new RowMutationMessage(rm))); - } - try - { - if ( requestsPerSecond_ > 1000) - Thread.sleep(1); - else - Thread.sleep(1000/requestsPerSecond_); - } - catch ( Exception ex) - { - - } - } - } - catch(Exception ex) - { - ex.printStackTrace(); - } - } - - public void bulkWriteColumn(int keys, int columns, int size, int tps) - { - Random random = new Random(); - byte[] bytes = new byte[size]; - int ts = 1; - long time = System.currentTimeMillis(); - try - { - for(int key = 1; key <= keys ; key++) - { - String stringKey = new Integer(key).toString(); - stringKey = stringKey + keyFix_ ; - RowMutation rm = new RowMutation(tablename_, stringKey); - for( int j = 1; j <= columns ; j++) - { - random.nextBytes(bytes); - rm.add( columnFamilyColumn_ + ":" + columnFix_ + j, bytes, ts); - } - RowMutationMessage rmMsg = new RowMutationMessage(rm); - - for(int k = 0 ; k < requestsPerSecond_/1000 +1 ; k++ ) - { - runner_.submit(new LoadManager(rmMsg)); - } - try - { - if ( requestsPerSecond_ > 1000) - Thread.sleep(1); - else - Thread.sleep(1000/requestsPerSecond_); - } - catch ( Exception ex) - { - - } - - } - } - catch(Exception ex) - { - ex.printStackTrace(); - } - System.out.println(System.currentTimeMillis() - time); - } - - public void bulkWriteSuperColumn(int keys, int superColumns, int columns, int size, int tps) - { - Random random = new Random(); - byte[] bytes = new byte[size]; - int ts = 1; - try - { - for(int key = 1; key <= keys ; key++) - { - String stringKey = new Integer(key).toString(); - stringKey = stringKey + keyFix_ ; - RowMutation rm = new RowMutation(tablename_, stringKey); - for( int i = 1; i <= superColumns ; i++) - { - for( int j = 1; j <= columns ; j++) - { - random.nextBytes(bytes); - rm.add( columnFamilySuperColumn_ + ":" + superColumnFix_ + i + ":" + columnFix_ + j, bytes, ts); - } - } - RowMutationMessage rmMsg = new RowMutationMessage(rm); - for(int k = 0 ; k < requestsPerSecond_/1000 +1 ; k++ ) - { - runner_.submit(new LoadManager(rmMsg)); - } - try - { - if ( requestsPerSecond_ > 1000) - Thread.sleep(1); - else - Thread.sleep(1000/requestsPerSecond_); - } - catch ( Exception ex) - { - - } - } - } - catch(Exception ex) - { - ex.printStackTrace(); - } - } - - // Stress the server using the thrift API - - public Cassandra.Client connect() { - int port = 9160; - TSocket socket = new TSocket(server_, port); - if(transport_ != null) - transport_.close(); - transport_ = socket; - - TBinaryProtocol binaryProtocol = new TBinaryProtocol(transport_, false, - false); - Cassandra.Client peerstorageClient = new Cassandra.Client( - binaryProtocol); - try - { - transport_.open(); - } - catch(Exception e) - { - e.printStackTrace(); - } - return peerstorageClient; - } - - public void applyThrift(String table, String key, String columnFamily, byte[] bytes, long ts ) { - - try { - if ( requestsPerSecond_ > 1000) - Thread.sleep(0, 1000000000/requestsPerSecond_); - else - Thread.sleep(1000/requestsPerSecond_); - peerstorageClient_.insert(table, key, columnFamily, bytes, ts, false); - } catch (Exception e) { - try { - peerstorageClient_ = connect(); - peerstorageClient_.insert(table, key, columnFamily, bytes, ts, false); - } catch (Exception e1) { - e1.printStackTrace(); - } - } - } - - - public void apply(batch_mutation_t batchMutation) { - - try { - if ( requestsPerSecond_ > 1000) - Thread.sleep(0, 1000000000/requestsPerSecond_); - else - Thread.sleep(1000/requestsPerSecond_); - peerstorageClient_.batch_insert(batchMutation, false); - } catch (Exception e) { - try { - peerstorageClient_ = connect(); - peerstorageClient_.batch_insert(batchMutation, false); - } catch (Exception e1) { - e1.printStackTrace(); - } - } - } - - public void apply(batch_mutation_super_t batchMutation) { - - try { - if ( requestsPerSecond_ > 1000) - Thread.sleep(0, 1000000000/requestsPerSecond_); - else - Thread.sleep(1000/requestsPerSecond_); - long t = System.currentTimeMillis(); - peerstorageClient_.batch_insert_superColumn(batchMutation, false); - logger_.debug("Time taken for thrift..." - + (System.currentTimeMillis() - t)); - } catch (Exception e) { - try { - peerstorageClient_ = connect(); - peerstorageClient_.batch_insert_superColumn(batchMutation, false); - } catch (Exception e1) { - e1.printStackTrace(); - } - } - } - - public void readLoadColumn(String tableName, String key, String cf) - { - try - { - column_t column = peerstorageClient_.get_column(tableName, key, cf); - } - catch(Exception ex) - { - peerstorageClient_ = connect(); - ex.printStackTrace(); - } - } - - public void randomReadColumnThrift(int keys, int columns, int size, int tps) - { - Random random = new Random(); - try - { - while(true) - { - int key = random.nextInt(keys) + 1; - String stringKey = new Integer(key).toString(); - stringKey = stringKey + keyFix_ ; - int j = random.nextInt(columns) + 1; - readLoadColumn(tablename_, stringKey, columnFamilyColumn_ + ":" + columnFix_ + j); - if ( requestsPerSecond_ > 1000) - Thread.sleep(0, 1000000000/requestsPerSecond_); - else - Thread.sleep(1000/requestsPerSecond_); - } - } - catch(Exception ex) - { - ex.printStackTrace(); - } - } - - public void randomWriteColumnThrift(int keys, int columns, int size, int tps) - { - Random random = new Random(); - byte[] bytes = new byte[size]; - int ts = 1; - try - { - while(true) - { - int key = random.nextInt(keys) + 1; - String stringKey = new Integer(key).toString(); - stringKey = stringKey + keyFix_ ; - int j = random.nextInt(columns) + 1; - random.nextBytes(bytes); - if ( ts == Integer.MAX_VALUE) - { - ts = 0 ; - } - ts++; - applyThrift(tablename_, stringKey, columnFamilyColumn_ + ":" + columnFix_ + j, bytes, ts); - } - } - catch(Exception ex) - { - ex.printStackTrace(); - } - } - - public void randomReadSuperColumnThrift(int keys, int superColumns, int columns, int size, int tps) - { - Random random = new Random(); - try - { - while(true) - { - int key = random.nextInt(keys) + 1; - String stringKey = new Integer(key).toString(); - stringKey = stringKey + keyFix_ ; - int i = random.nextInt(superColumns) + 1; - int j = random.nextInt(columns) + 1; - readLoadColumn(tablename_, stringKey, columnFamilySuperColumn_ + ":" + superColumnFix_ + i + ":" + columnFix_ + j); - } - } - catch(Exception ex) - { - ex.printStackTrace(); - } - } - - - public void randomWriteSuperColumnThrift(int keys, int superColumns,int columns, int size, int tps) - { - Random random = new Random(); - byte[] bytes = new byte[size]; - int ts = 1; - try - { - while(true) - { - int key = random.nextInt(keys) + 1; - String stringKey = new Integer(key).toString(); - stringKey = stringKey + keyFix_ ; - int i = random.nextInt(superColumns) + 1; - int j = random.nextInt(columns) + 1; - random.nextBytes(bytes); - if ( ts == Integer.MAX_VALUE) - { - ts = 0 ; - } - ts++; - applyThrift(tablename_, stringKey, columnFamilySuperColumn_ + ":" + superColumnFix_ + i + ":" + columnFix_ + j, bytes, ts); - } - } - catch(Exception ex) - { - ex.printStackTrace(); - } - - - } - - public void bulkWriteColumnThrift(int keys, int columns, int size, int tps) - { - Random random = new Random(); - byte[] bytes = new byte[size]; - int ts = 1; - long time = System.currentTimeMillis(); - try - { - for(int key = 1; key <= keys ; key++) - { - String stringKey = new Integer(key).toString(); - stringKey = stringKey + keyFix_ ; - batch_mutation_t bt = new batch_mutation_t(); - bt.key = stringKey; - bt.table = tablename_; - bt.cfmap = new HashMap>(); - ArrayList column_arr = new ArrayList(); - for( int j = 1; j <= columns ; j++) - { - random.nextBytes(bytes); - column_arr.add(new column_t(columnFix_ + j, bytes, ts)); - } - bt.cfmap.put(columnFamilyColumn_, column_arr); - apply(bt); - } - } - catch(Exception ex) - { - ex.printStackTrace(); - } - System.out.println(System.currentTimeMillis() - time); - } - - public void bulkWriteSuperColumnThrift(int keys, int supercolumns, int columns, int size, int tps) - { - Random random = new Random(); - byte[] bytes = new byte[size]; - int ts = 1; - long time = System.currentTimeMillis(); - try - { - for(int key = 1; key <= keys ; key++) - { - String stringKey = new Integer(key).toString(); - stringKey = stringKey + keyFix_ ; - batch_mutation_super_t bt = new batch_mutation_super_t(); - bt.key = stringKey; - bt.table = tablename_; - bt.cfmap = new HashMap>(); - ArrayList superColumn_arr = new ArrayList(); - - for( int i = 1; i <= supercolumns; i++ ) - { - ArrayList column_arr = new ArrayList(); - for( int j = 1; j <= columns ; j++) - { - random.nextBytes(bytes); - column_arr.add(new column_t(columnFix_ + j, bytes, ts)); - } - superColumn_arr.add(new superColumn_t(superColumnFix_ + i, column_arr)); - } - bt.cfmap.put(columnFamilySuperColumn_, superColumn_arr); - apply(bt); - } - } - catch(Exception ex) - { - ex.printStackTrace(); - } - System.out.println(System.currentTimeMillis() - time); - } - - JSAPResult ParseArguments(String[] args) - { - JSAPResult config = null; - try - { - - SimpleJSAP jsap = new SimpleJSAP( - "StressTest", - "Runs stress test for Cassandra", - new Parameter[] { - new FlaggedOption( "keys", JSAP.INTEGER_PARSER, "10000", JSAP.REQUIRED, 'k', JSAP.NO_LONGFLAG, - "The number of keys from 1 to this number" ), - new FlaggedOption( "columns", JSAP.INTEGER_PARSER, "1000", JSAP.REQUIRED, 'c', JSAP.NO_LONGFLAG, - "The number of columns from 1 to this number" ), - new FlaggedOption( "supercolumns", JSAP.INTEGER_PARSER, "0", JSAP.NOT_REQUIRED, 'u', JSAP.NO_LONGFLAG, - "The number of super columns from 1 to this number" ), - new FlaggedOption( "size", JSAP.INTEGER_PARSER, "1000", JSAP.REQUIRED, 's', JSAP.NO_LONGFLAG, - "The Size in bytes of each column" ), - new FlaggedOption( "tps", JSAP.INTEGER_PARSER, "1000", JSAP.REQUIRED, 't', JSAP.NO_LONGFLAG, - "Requests per second" ), - new FlaggedOption( "thrift", JSAP.INTEGER_PARSER, "0", JSAP.REQUIRED, 'h', JSAP.NO_LONGFLAG, - "Use Thrift - 1 , use messaging - 0" ), - new FlaggedOption( "mailboxstress", JSAP.INTEGER_PARSER, "0", JSAP.REQUIRED, 'M', JSAP.NO_LONGFLAG, - "Run mailbox stress - 1 , hmm default - 0" ), - new FlaggedOption( "commitLogTest", JSAP.INTEGER_PARSER, "0", JSAP.REQUIRED, 'C', JSAP.NO_LONGFLAG, - "Run mailbox stress - 1 , hmm default - 0" ), - new QualifiedSwitch( "randomize", JSAP.STRING_PARSER, JSAP.NO_DEFAULT, JSAP.NOT_REQUIRED, 'z', "randomize", - "Random reads or writes" ).setList( true ).setListSeparator( ',' ), - new QualifiedSwitch( "reads", JSAP.STRING_PARSER, JSAP.NO_DEFAULT, JSAP.NOT_REQUIRED, 'r', "reads", - "Read data" ).setList( true ).setListSeparator( ',' ), - new QualifiedSwitch( "writes", JSAP.STRING_PARSER, JSAP.NO_DEFAULT, JSAP.NOT_REQUIRED, 'w', "writes", - "Write Data" ).setList( false ).setListSeparator( ',' ), - new QualifiedSwitch( "bulkwrites", JSAP.STRING_PARSER, JSAP.NO_DEFAULT, JSAP.NOT_REQUIRED, 'b', "bulkwrites", - "Bulk Write Data" ).setList( false ).setListSeparator( ',' ), - new UnflaggedOption( "Server", JSAP.STRING_PARSER, JSAP.REQUIRED, "Name of the server the request needs to be sent to." ) } - ) ; - - - config = jsap.parse(args); - if( !config.success()) - { - System.err.println(); - System.err.println("Usage: java " - + StressTest.class.getName()); - System.err.println(" " - + jsap.getUsage()); - System.err.println(); - // show full help as well - System.err.println(jsap.getHelp()); - System.err.println("**********Errors*************"); - } - if ( jsap.messagePrinted() ) return null; - String hostName = FBUtilities.getHostAddress(); - from_ = new EndPoint(hostName,10001); - MessagingService.getMessagingInstance().listen(from_, false); - } - catch ( Exception ex) - { - logger_.debug(LogUtil.throwableToString(ex)); - } - return config; - } - - void run( JSAPResult config ) throws Throwable - { - requestsPerSecond_ = config.getInt("tps"); - int numThreads = requestsPerSecond_/1000 + 1; - if(config.getString("Server") != null) - { - server_ = config.getString("Server"); - to_ = new EndPoint(config.getString("Server"), 7000); - } - runner_ = new DebuggableThreadPoolExecutor( numThreads, - numThreads, - Integer.MAX_VALUE, - TimeUnit.SECONDS, - new LinkedBlockingQueue(), - new ThreadFactoryImpl("MEMTABLE-FLUSHER-POOL") - ); - if(config.getInt("mailboxstress") == 1) - { -// stressMailboxWrites(); - return; - } - if(config.getInt("thrift") == 0) - { - if(config.getInt("supercolumns") == 0) - { - if(config.getBoolean("reads")) - { - randomReadColumn(config.getInt("keys"), config.getInt("columns"), config.getInt("size"), config.getInt("tps")); - return; - } - if(config.getBoolean("bulkwrites")) - { - bulkWriteColumn(config.getInt("keys"), config.getInt("columns"), config.getInt("size"), config.getInt("tps")); - return; - } - if(config.getBoolean("writes")) - { - randomWriteColumn(config.getInt("keys"), config.getInt("columns"), config.getInt("size"), config.getInt("tps")); - return; - } - } - else - { - if(config.getBoolean("reads")) - { - randomReadSuperColumn(config.getInt("keys"), config.getInt("supercolumns"), config.getInt("columns"), config.getInt("size"), config.getInt("tps")); - return; - } - if(config.getBoolean("bulkwrites")) - { - bulkWriteSuperColumn(config.getInt("keys"), config.getInt("supercolumns"), config.getInt("columns"), config.getInt("size"), config.getInt("tps")); - return; - } - if(config.getBoolean("writes")) - { - randomWriteSuperColumn(config.getInt("keys"), config.getInt("supercolumns"), config.getInt("columns"), config.getInt("size"), config.getInt("tps")); - return; - } - - } - } - else - { - peerstorageClient_ = connect(); - if(config.getInt("supercolumns") == 0) - { - if(config.getBoolean("reads")) - { - randomReadColumnThrift(config.getInt("keys"), config.getInt("columns"), config.getInt("size"), config.getInt("tps")); - return; - } - if(config.getBoolean("bulkwrites")) - { - bulkWriteColumnThrift(config.getInt("keys"), config.getInt("columns"), config.getInt("size"), config.getInt("tps")); - return; - } - if(config.getBoolean("writes")) - { - randomWriteColumnThrift(config.getInt("keys"), config.getInt("columns"), config.getInt("size"), config.getInt("tps")); - return; - } - } - else - { - if(config.getBoolean("reads")) - { - randomReadSuperColumnThrift(config.getInt("keys"), config.getInt("supercolumns"), config.getInt("columns"), config.getInt("size"), config.getInt("tps")); - return; - } - if(config.getBoolean("bulkwrites")) - { - bulkWriteSuperColumnThrift(config.getInt("keys"), config.getInt("supercolumns"), config.getInt("columns"), config.getInt("size"), config.getInt("tps")); - return; - } - if(config.getBoolean("writes")) - { - randomWriteSuperColumnThrift(config.getInt("keys"), config.getInt("supercolumns"), config.getInt("columns"), config.getInt("size"), config.getInt("tps")); - return; - } - - } - - } - System.out.println(" StressTest : Done !!!!!!"); - } - - /** - * @param args - */ - public static void main(String[] args) throws Throwable - { - LogUtil.init(); - StressTest stressTest = new StressTest(); - JSAPResult config = stressTest.ParseArguments( args ); - if( config == null ) System.exit(-1); - stressTest.run(config); - } - -} diff --git a/src/java/org/apache/cassandra/test/TestRunner.java b/src/java/org/apache/cassandra/test/TestRunner.java index 57f07950fc..e7317a4188 100644 --- a/src/java/org/apache/cassandra/test/TestRunner.java +++ b/src/java/org/apache/cassandra/test/TestRunner.java @@ -22,7 +22,6 @@ import java.util.Random; import java.util.ArrayList; import java.util.List; -import org.apache.cassandra.continuations.Suspendable; import org.apache.cassandra.db.ColumnFamily; import org.apache.cassandra.db.IColumn; import org.apache.cassandra.db.RowMutation; @@ -236,7 +235,6 @@ public class TestRunner } } -@Suspendable class Scanner implements Runnable { private static final Logger logger_ = Logger.getLogger(Scanner.class); diff --git a/src/java/org/apache/cassandra/test/UtilsTest.java b/src/java/org/apache/cassandra/test/UtilsTest.java index e203faef84..05d12fb5a5 100644 --- a/src/java/org/apache/cassandra/test/UtilsTest.java +++ b/src/java/org/apache/cassandra/test/UtilsTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.test; import java.math.BigInteger; diff --git a/src/java/org/apache/cassandra/utils/AbstractStatsDeque.java b/src/java/org/apache/cassandra/utils/AbstractStatsDeque.java index 16521c025b..f6516d5bd5 100644 --- a/src/java/org/apache/cassandra/utils/AbstractStatsDeque.java +++ b/src/java/org/apache/cassandra/utils/AbstractStatsDeque.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.utils; import java.util.Iterator; diff --git a/src/java/org/apache/cassandra/utils/BitSetSerializer.java b/src/java/org/apache/cassandra/utils/BitSetSerializer.java index 5449df389c..715ea397d9 100644 --- a/src/java/org/apache/cassandra/utils/BitSetSerializer.java +++ b/src/java/org/apache/cassandra/utils/BitSetSerializer.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.utils; import java.io.DataOutputStream; diff --git a/src/java/org/apache/cassandra/utils/BoundedStatsDeque.java b/src/java/org/apache/cassandra/utils/BoundedStatsDeque.java index 9c653acade..32565642de 100644 --- a/src/java/org/apache/cassandra/utils/BoundedStatsDeque.java +++ b/src/java/org/apache/cassandra/utils/BoundedStatsDeque.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.utils; import java.util.ArrayDeque; diff --git a/src/java/org/apache/cassandra/utils/DestructivePQIterator.java b/src/java/org/apache/cassandra/utils/DestructivePQIterator.java index 0ed96f8364..7c52e98d60 100644 --- a/src/java/org/apache/cassandra/utils/DestructivePQIterator.java +++ b/src/java/org/apache/cassandra/utils/DestructivePQIterator.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.utils; import java.util.Iterator; diff --git a/src/java/org/apache/cassandra/utils/FastHash.java b/src/java/org/apache/cassandra/utils/FastHash.java index 11b0b60d56..36fae5411c 100644 --- a/src/java/org/apache/cassandra/utils/FastHash.java +++ b/src/java/org/apache/cassandra/utils/FastHash.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.utils; import java.util.Random; diff --git a/src/java/org/apache/cassandra/utils/FastHashMap.java b/src/java/org/apache/cassandra/utils/FastHashMap.java index 8351a2258c..3a669d7567 100644 --- a/src/java/org/apache/cassandra/utils/FastHashMap.java +++ b/src/java/org/apache/cassandra/utils/FastHashMap.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.utils; import java.io.*; diff --git a/src/java/org/apache/cassandra/utils/FastObjectHash.java b/src/java/org/apache/cassandra/utils/FastObjectHash.java index b434c6a499..a2bf08d45b 100644 --- a/src/java/org/apache/cassandra/utils/FastObjectHash.java +++ b/src/java/org/apache/cassandra/utils/FastObjectHash.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.utils; import java.util.Arrays; diff --git a/src/java/org/apache/cassandra/utils/Filter.java b/src/java/org/apache/cassandra/utils/Filter.java index 287cee53eb..ff9c0466bc 100644 --- a/src/java/org/apache/cassandra/utils/Filter.java +++ b/src/java/org/apache/cassandra/utils/Filter.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.utils; import java.io.UnsupportedEncodingException; diff --git a/src/java/org/apache/cassandra/utils/PrimeFinder.java b/src/java/org/apache/cassandra/utils/PrimeFinder.java index f24f0e471a..4df63d9ab7 100644 --- a/src/java/org/apache/cassandra/utils/PrimeFinder.java +++ b/src/java/org/apache/cassandra/utils/PrimeFinder.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.utils; import java.util.Arrays; diff --git a/src/java/org/apache/cassandra/utils/TimedStatsDeque.java b/src/java/org/apache/cassandra/utils/TimedStatsDeque.java index 46938cb87f..fcc1ef35c5 100644 --- a/src/java/org/apache/cassandra/utils/TimedStatsDeque.java +++ b/src/java/org/apache/cassandra/utils/TimedStatsDeque.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.utils; import java.util.Iterator; diff --git a/test/conf/storage-conf.xml b/test/conf/storage-conf.xml index 2737444065..d3220895c8 100644 --- a/test/conf/storage-conf.xml +++ b/test/conf/storage-conf.xml @@ -1,3 +1,21 @@ + Test Cluster org.apache.cassandra.dht.OrderPreservingPartitioner diff --git a/test/unit/org/apache/cassandra/CleanupHelper.java b/test/unit/org/apache/cassandra/CleanupHelper.java index ea9f872716..778d0a6f95 100644 --- a/test/unit/org/apache/cassandra/CleanupHelper.java +++ b/test/unit/org/apache/cassandra/CleanupHelper.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra; import java.io.File; diff --git a/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java b/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java index 3030494a64..c36917f4d8 100644 --- a/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java +++ b/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.config; import static org.junit.Assert.assertNotNull; diff --git a/test/unit/org/apache/cassandra/db/ColumnComparatorFactoryTest.java b/test/unit/org/apache/cassandra/db/ColumnComparatorFactoryTest.java index e35733a4b4..42fad57904 100644 --- a/test/unit/org/apache/cassandra/db/ColumnComparatorFactoryTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnComparatorFactoryTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.util.Comparator; diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java index b55bc7c215..d6bd2a72cf 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.File; diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java index c7a0d4b767..d81f4c866d 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/db/CommitLogTest.java b/test/unit/org/apache/cassandra/db/CommitLogTest.java index aa68be10e4..c9b2b48b2d 100644 --- a/test/unit/org/apache/cassandra/db/CommitLogTest.java +++ b/test/unit/org/apache/cassandra/db/CommitLogTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/db/CompactionsTest.java b/test/unit/org/apache/cassandra/db/CompactionsTest.java index ca65bd0177..42af47fd53 100644 --- a/test/unit/org/apache/cassandra/db/CompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/CompactionsTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/db/DBManagerTest.java b/test/unit/org/apache/cassandra/db/DBManagerTest.java index ca065797c4..5d194e52a5 100644 --- a/test/unit/org/apache/cassandra/db/DBManagerTest.java +++ b/test/unit/org/apache/cassandra/db/DBManagerTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/NameSortTest.java b/test/unit/org/apache/cassandra/db/NameSortTest.java index 064ac58813..ebe30a227e 100644 --- a/test/unit/org/apache/cassandra/db/NameSortTest.java +++ b/test/unit/org/apache/cassandra/db/NameSortTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/db/OneCompactionTest.java b/test/unit/org/apache/cassandra/db/OneCompactionTest.java index 418386bd03..300672ebfc 100644 --- a/test/unit/org/apache/cassandra/db/OneCompactionTest.java +++ b/test/unit/org/apache/cassandra/db/OneCompactionTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/db/ReadMessageTest.java b/test/unit/org/apache/cassandra/db/ReadMessageTest.java index c1badd7463..0ac26560a2 100644 --- a/test/unit/org/apache/cassandra/db/ReadMessageTest.java +++ b/test/unit/org/apache/cassandra/db/ReadMessageTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import static org.junit.Assert.*; diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java index 99c27a5952..0e2c7324c9 100644 --- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java +++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java index 61d55a978c..9b817a6ddd 100644 --- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java +++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java index fc9035f10b..f65109482e 100644 --- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java +++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java index 54c27db490..2d424ba38f 100644 --- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java +++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnTest.java b/test/unit/org/apache/cassandra/db/RemoveColumnTest.java index cf2b33f010..82eeb5a504 100644 --- a/test/unit/org/apache/cassandra/db/RemoveColumnTest.java +++ b/test/unit/org/apache/cassandra/db/RemoveColumnTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java b/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java index 4efd73a949..e91ce619c9 100644 --- a/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java +++ b/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java b/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java index 9785ce5180..32b0dcbbec 100644 --- a/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java +++ b/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/db/RowTest.java b/test/unit/org/apache/cassandra/db/RowTest.java index f6c7f011d6..22e22ba796 100644 --- a/test/unit/org/apache/cassandra/db/RowTest.java +++ b/test/unit/org/apache/cassandra/db/RowTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.util.Arrays; diff --git a/test/unit/org/apache/cassandra/db/SuperColumnTest.java b/test/unit/org/apache/cassandra/db/SuperColumnTest.java index af6cb6f878..2f0ccddfd6 100644 --- a/test/unit/org/apache/cassandra/db/SuperColumnTest.java +++ b/test/unit/org/apache/cassandra/db/SuperColumnTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/SystemTableTest.java b/test/unit/org/apache/cassandra/db/SystemTableTest.java index 54da8278ff..678584a490 100644 --- a/test/unit/org/apache/cassandra/db/SystemTableTest.java +++ b/test/unit/org/apache/cassandra/db/SystemTableTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/db/TimeSortTest.java b/test/unit/org/apache/cassandra/db/TimeSortTest.java index 86cee56deb..71c9fc07bc 100644 --- a/test/unit/org/apache/cassandra/db/TimeSortTest.java +++ b/test/unit/org/apache/cassandra/db/TimeSortTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.db; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/dht/RangeTest.java b/test/unit/org/apache/cassandra/dht/RangeTest.java index 7492af8ce9..22ec8e391e 100644 --- a/test/unit/org/apache/cassandra/dht/RangeTest.java +++ b/test/unit/org/apache/cassandra/dht/RangeTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.dht; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/io/DataInputBufferTest.java b/test/unit/org/apache/cassandra/io/DataInputBufferTest.java index e778f23297..da41d028de 100644 --- a/test/unit/org/apache/cassandra/io/DataInputBufferTest.java +++ b/test/unit/org/apache/cassandra/io/DataInputBufferTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.io; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/io/SSTableTest.java b/test/unit/org/apache/cassandra/io/SSTableTest.java index 9402f929b1..0c13afcd34 100644 --- a/test/unit/org/apache/cassandra/io/SSTableTest.java +++ b/test/unit/org/apache/cassandra/io/SSTableTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.io; import java.io.File; diff --git a/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java b/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java index ebf157f890..520d65567a 100644 --- a/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java +++ b/test/unit/org/apache/cassandra/locator/RackUnawareStrategyTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.locator; import java.util.List; diff --git a/test/unit/org/apache/cassandra/service/CassandraServerTest.java b/test/unit/org/apache/cassandra/service/CassandraServerTest.java index c9072a6e6e..2846f9a25d 100644 --- a/test/unit/org/apache/cassandra/service/CassandraServerTest.java +++ b/test/unit/org/apache/cassandra/service/CassandraServerTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.service; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/utils/BloomFilterTest.java b/test/unit/org/apache/cassandra/utils/BloomFilterTest.java index 0bc585760a..51023b0629 100644 --- a/test/unit/org/apache/cassandra/utils/BloomFilterTest.java +++ b/test/unit/org/apache/cassandra/utils/BloomFilterTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.utils; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/utils/FilterTest.java b/test/unit/org/apache/cassandra/utils/FilterTest.java index 3c0a29b1eb..cc9214b92b 100644 --- a/test/unit/org/apache/cassandra/utils/FilterTest.java +++ b/test/unit/org/apache/cassandra/utils/FilterTest.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.utils; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/utils/KeyGenerator.java b/test/unit/org/apache/cassandra/utils/KeyGenerator.java index fafd0d301c..37ce9db204 100644 --- a/test/unit/org/apache/cassandra/utils/KeyGenerator.java +++ b/test/unit/org/apache/cassandra/utils/KeyGenerator.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.utils; import java.io.*; diff --git a/test/unit/org/apache/cassandra/utils/ResetableIterator.java b/test/unit/org/apache/cassandra/utils/ResetableIterator.java index a2f1caf52f..8d7c9d971c 100644 --- a/test/unit/org/apache/cassandra/utils/ResetableIterator.java +++ b/test/unit/org/apache/cassandra/utils/ResetableIterator.java @@ -1,3 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you 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 org.apache.cassandra.utils; import java.util.Iterator;