You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/02/27 11:31:17 UTC
[11/14] [3649] Strip end of line whitespaces
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java b/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java
index 7625b16..a127c52 100644
--- a/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java
+++ b/src/java/org/apache/cassandra/utils/BloomFilterSerializer.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.utils;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.utils;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/ByteBufferUtil.java b/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
index bdf39b5..34a58e0 100644
--- a/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
+++ b/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
@@ -6,9 +6,9 @@
* 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
@@ -36,37 +36,37 @@ import org.apache.commons.lang.ArrayUtils;
/**
* Utility methods to make ByteBuffers less painful
- * The following should illustrate the different ways byte buffers can be used
- *
+ * The following should illustrate the different ways byte buffers can be used
+ *
* public void testArrayOffet()
* {
- *
+ *
* byte[] b = "test_slice_array".getBytes();
* ByteBuffer bb = ByteBuffer.allocate(1024);
- *
+ *
* assert bb.position() == 0;
* assert bb.limit() == 1024;
* assert bb.capacity() == 1024;
- *
+ *
* bb.put(b);
- *
+ *
* assert bb.position() == b.length;
* assert bb.remaining() == bb.limit() - bb.position();
- *
+ *
* ByteBuffer bb2 = bb.slice();
- *
+ *
* assert bb2.position() == 0;
- *
+ *
* //slice should begin at other buffers current position
* assert bb2.arrayOffset() == bb.position();
- *
- * //to match the position in the underlying array one needs to
+ *
+ * //to match the position in the underlying array one needs to
* //track arrayOffset
* assert bb2.limit()+bb2.arrayOffset() == bb.limit();
- *
- *
+ *
+ *
* assert bb2.remaining() == bb.remaining();
- *
+ *
* }
*
* }
@@ -84,7 +84,7 @@ public class ByteBufferUtil
return 0;
if (o1.hasArray() && o2.hasArray())
- {
+ {
return FBUtilities.compareUnsigned(o1.array(), o2.array(), o1.position() + o1.arrayOffset(),
o2.position() + o2.arrayOffset(), o1.remaining(), o2.remaining());
}
@@ -100,7 +100,7 @@ public class ByteBufferUtil
}
return o1.remaining() - o2.remaining();
}
-
+
public static int compare(byte[] o1, ByteBuffer o2)
{
return compareUnsigned(ByteBuffer.wrap(o1), o2);
@@ -250,10 +250,10 @@ public class ByteBufferUtil
public static ByteBuffer clone(ByteBuffer buffer)
{
assert buffer != null;
-
+
if (buffer.remaining() == 0)
return EMPTY_BYTE_BUFFER;
-
+
ByteBuffer clone = ByteBuffer.allocate(buffer.remaining());
if (buffer.hasArray())
@@ -406,7 +406,7 @@ public class ByteBufferUtil
{
return bytes.getInt(bytes.position());
}
-
+
public static long toLong(ByteBuffer bytes)
{
return bytes.getLong(bytes.position());
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/BytesReadTracker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/BytesReadTracker.java b/src/java/org/apache/cassandra/utils/BytesReadTracker.java
index cc9c7b7..143f5ab 100644
--- a/src/java/org/apache/cassandra/utils/BytesReadTracker.java
+++ b/src/java/org/apache/cassandra/utils/BytesReadTracker.java
@@ -6,9 +6,9 @@
* 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/CLibrary.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/CLibrary.java b/src/java/org/apache/cassandra/utils/CLibrary.java
index 0f99403..c6fdab3 100644
--- a/src/java/org/apache/cassandra/utils/CLibrary.java
+++ b/src/java/org/apache/cassandra/utils/CLibrary.java
@@ -6,9 +6,9 @@
* 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
@@ -39,7 +39,7 @@ public final class CLibrary
private static final int MCL_CURRENT = 1;
private static final int MCL_FUTURE = 2;
-
+
private static final int ENOMEM = 12;
private static final int F_GETFL = 3; /* get file status flags */
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/CloseableIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/CloseableIterator.java b/src/java/org/apache/cassandra/utils/CloseableIterator.java
index edbd248..208801b 100644
--- a/src/java/org/apache/cassandra/utils/CloseableIterator.java
+++ b/src/java/org/apache/cassandra/utils/CloseableIterator.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.utils;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.utils;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/DefaultDouble.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/DefaultDouble.java b/src/java/org/apache/cassandra/utils/DefaultDouble.java
index d9ca813..f3278d6 100644
--- a/src/java/org/apache/cassandra/utils/DefaultDouble.java
+++ b/src/java/org/apache/cassandra/utils/DefaultDouble.java
@@ -8,9 +8,9 @@ package org.apache.cassandra.utils;
* 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.
@@ -23,23 +23,23 @@ public class DefaultDouble
{
private final double originalValue;
private double currentValue;
-
+
public DefaultDouble(double value)
{
originalValue = value;
currentValue = value;
}
-
- public double value()
+
+ public double value()
{
return currentValue;
}
-
+
public void set(double d)
{
currentValue = d;
}
-
+
public boolean isModified()
{
return originalValue != currentValue;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/DefaultInteger.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/DefaultInteger.java b/src/java/org/apache/cassandra/utils/DefaultInteger.java
index ac98e47..05fd5a3 100644
--- a/src/java/org/apache/cassandra/utils/DefaultInteger.java
+++ b/src/java/org/apache/cassandra/utils/DefaultInteger.java
@@ -8,9 +8,9 @@ package org.apache.cassandra.utils;
* 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.
@@ -19,27 +19,27 @@ package org.apache.cassandra.utils;
*/
-public class DefaultInteger
+public class DefaultInteger
{
private final int originalValue;
private int currentValue;
-
+
public DefaultInteger(int value)
{
originalValue = value;
currentValue = value;
}
-
- public int value()
+
+ public int value()
{
return currentValue;
}
-
+
public void set(int i)
{
currentValue = i;
}
-
+
public boolean isModified()
{
return originalValue != currentValue;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
index cdbdcbf..7a3f78a 100644
--- a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
+++ b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
@@ -188,7 +188,7 @@ public class EstimatedHistogram
public long count()
{
long sum = 0L;
- for (int i = 0; i < buckets.length(); i++)
+ for (int i = 0; i < buckets.length(); i++)
sum += buckets.get(i);
return sum;
}
@@ -206,10 +206,10 @@ public class EstimatedHistogram
{
if (this == o)
return true;
-
+
if (!(o instanceof EstimatedHistogram))
return false;
-
+
EstimatedHistogram that = (EstimatedHistogram) o;
return Arrays.equals(getBucketOffsets(), that.getBucketOffsets()) &&
Arrays.equals(getBuckets(false), that.getBuckets(false));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/FBUtilities.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java b/src/java/org/apache/cassandra/utils/FBUtilities.java
index 7736d4c..91d2c1b 100644
--- a/src/java/org/apache/cassandra/utils/FBUtilities.java
+++ b/src/java/org/apache/cassandra/utils/FBUtilities.java
@@ -181,7 +181,7 @@ public class FBUtilities
{
return FastByteComparisons.compareTo(bytes1, offset1, len1, bytes2, offset2, len2);
}
-
+
/**
* @return The bitwise XOR of the inputs. The output will be the same length as the
* longer input, but if either input is null, the output will be null.
@@ -210,7 +210,7 @@ public class FBUtilities
{
byte[] result = hash(data);
BigInteger hash = new BigInteger(result);
- return hash.abs();
+ return hash.abs();
}
public static byte[] hash(ByteBuffer... data)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/FastByteComparisons.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/FastByteComparisons.java b/src/java/org/apache/cassandra/utils/FastByteComparisons.java
index 09ca68f..6597c77 100644
--- a/src/java/org/apache/cassandra/utils/FastByteComparisons.java
+++ b/src/java/org/apache/cassandra/utils/FastByteComparisons.java
@@ -62,7 +62,7 @@ abstract class FastByteComparisons {
private static class LexicographicalComparerHolder {
static final String UNSAFE_COMPARER_NAME =
LexicographicalComparerHolder.class.getName() + "$UnsafeComparer";
-
+
static final Comparer<byte[]> BEST_COMPARER = getBestComparer();
/**
* Returns the Unsafe-using Comparer, or falls back to the pure-Java
@@ -81,7 +81,7 @@ abstract class FastByteComparisons {
return lexicographicalComparerJavaImpl();
}
}
-
+
private enum PureJavaComparer implements Comparer<byte[]> {
INSTANCE;
@@ -106,7 +106,7 @@ abstract class FastByteComparisons {
return length1 - length2;
}
}
-
+
@SuppressWarnings("unused") // used via reflection
private enum UnsafeComparer implements Comparer<byte[]> {
INSTANCE;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/GuidGenerator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/GuidGenerator.java b/src/java/org/apache/cassandra/utils/GuidGenerator.java
index 81cb620..02edb1b 100644
--- a/src/java/org/apache/cassandra/utils/GuidGenerator.java
+++ b/src/java/org/apache/cassandra/utils/GuidGenerator.java
@@ -46,7 +46,7 @@ public class GuidGenerator {
public static String guid() {
ByteBuffer array = guidAsBytes();
-
+
StringBuilder sb = new StringBuilder();
for (int j = array.position(); j < array.limit(); ++j)
{
@@ -57,7 +57,7 @@ public class GuidGenerator {
return convertToStandardFormat( sb.toString() );
}
-
+
public static String guidToString(byte[] bytes)
{
StringBuilder sb = new StringBuilder();
@@ -69,7 +69,7 @@ public class GuidGenerator {
return convertToStandardFormat( sb.toString() );
}
-
+
public static ByteBuffer guidAsBytes()
{
StringBuilder sbValueBeforeMD5 = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/Hex.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/Hex.java b/src/java/org/apache/cassandra/utils/Hex.java
index 7e61d9a..b7f3e45 100644
--- a/src/java/org/apache/cassandra/utils/Hex.java
+++ b/src/java/org/apache/cassandra/utils/Hex.java
@@ -23,7 +23,7 @@ public class Hex
{
private static final Constructor<String> stringConstructor = getProtectedConstructor(String.class, int.class, int.class, char[].class);
private final static byte[] charToByte = new byte[256];
-
+
// package protected for use by ByteBufferUtil. Do not modify this array !!
static final char[] byteToChar = new char[16];
static
@@ -45,7 +45,7 @@ public class Hex
byteToChar[i] = Integer.toHexString(i).charAt(0);
}
}
-
+
public static byte[] hexToBytes(String str)
{
if (str.length() % 2 == 1)
@@ -75,7 +75,7 @@ public class Hex
return wrapCharArray(c);
}
-
+
/**
* Create a String from a char array with zero-copy (if available), using reflection to access a package-protected constructor of String.
* */
@@ -99,7 +99,7 @@ public class Hex
}
return s == null ? new String(c) : s;
}
-
+
/**
* Used to get access to protected/private constructor of the specified class
* @param klass - name of the class
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/IMergeIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/IMergeIterator.java b/src/java/org/apache/cassandra/utils/IMergeIterator.java
index 805a7e5..a06ea67 100644
--- a/src/java/org/apache/cassandra/utils/IMergeIterator.java
+++ b/src/java/org/apache/cassandra/utils/IMergeIterator.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.utils;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.utils;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/IntervalTree/Interval.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/IntervalTree/Interval.java b/src/java/org/apache/cassandra/utils/IntervalTree/Interval.java
index 244adbe..1be9415 100644
--- a/src/java/org/apache/cassandra/utils/IntervalTree/Interval.java
+++ b/src/java/org/apache/cassandra/utils/IntervalTree/Interval.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.utils.IntervalTree;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.utils.IntervalTree;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/IntervalTree/IntervalNode.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/IntervalTree/IntervalNode.java b/src/java/org/apache/cassandra/utils/IntervalTree/IntervalNode.java
index 3fc90f4..38c4328 100644
--- a/src/java/org/apache/cassandra/utils/IntervalTree/IntervalNode.java
+++ b/src/java/org/apache/cassandra/utils/IntervalTree/IntervalNode.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.utils.IntervalTree;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.utils.IntervalTree;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/IntervalTree/IntervalTree.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/IntervalTree/IntervalTree.java b/src/java/org/apache/cassandra/utils/IntervalTree/IntervalTree.java
index 313796c..a01ed53 100644
--- a/src/java/org/apache/cassandra/utils/IntervalTree/IntervalTree.java
+++ b/src/java/org/apache/cassandra/utils/IntervalTree/IntervalTree.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.utils.IntervalTree;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.utils.IntervalTree;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/LatencyTracker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/LatencyTracker.java b/src/java/org/apache/cassandra/utils/LatencyTracker.java
index cbca681..ef7258d 100644
--- a/src/java/org/apache/cassandra/utils/LatencyTracker.java
+++ b/src/java/org/apache/cassandra/utils/LatencyTracker.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.utils;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.utils;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/LegacyBloomFilterSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/LegacyBloomFilterSerializer.java b/src/java/org/apache/cassandra/utils/LegacyBloomFilterSerializer.java
index 1105614..310e735 100644
--- a/src/java/org/apache/cassandra/utils/LegacyBloomFilterSerializer.java
+++ b/src/java/org/apache/cassandra/utils/LegacyBloomFilterSerializer.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.utils;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.utils;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/MerkleTree.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/MerkleTree.java b/src/java/org/apache/cassandra/utils/MerkleTree.java
index fc71be2..fc73ef0 100644
--- a/src/java/org/apache/cassandra/utils/MerkleTree.java
+++ b/src/java/org/apache/cassandra/utils/MerkleTree.java
@@ -40,12 +40,12 @@ import org.apache.cassandra.net.MessagingService;
* full depth of the perfect binary tree: the leaves of this tree are Leaf objects,
* which contain the computed values of the nodes that would be below them if
* the tree were perfect.
- *
+ *
* The hash values of the inner nodes of the MerkleTree are calculated lazily based
* on their children when the hash of a range is requested with hash(range).
*
* Inputs passed to TreeRange.validate should be calculated using a very secure hash,
- * because all hashing internal to the tree is accomplished using XOR.
+ * because all hashing internal to the tree is accomplished using XOR.
*
* If two MerkleTrees have the same hashdepth, they represent a perfect tree
* of the same depth, and can always be compared, regardless of size or splits.
@@ -78,7 +78,7 @@ public class MerkleTree implements Serializable
private long maxsize;
private long size;
private Hashable root;
-
+
public static class MerkleTreeSerializer
{
public void serialize(MerkleTree mt, DataOutputStream dos, int version) throws IOException
@@ -230,7 +230,7 @@ public class MerkleTree implements Serializable
List<TreeRange> diff = new ArrayList<TreeRange>();
TreeRange active = new TreeRange(null, ltree.fullRange.left, ltree.fullRange.right, (byte)0, null);
-
+
byte[] lhash = ltree.hash(active);
byte[] rhash = rtree.hash(active);
@@ -258,7 +258,7 @@ public class MerkleTree implements Serializable
TreeRange right = new TreeRange(null, midpoint, active.right, inc(active.depth), null);
byte[] lhash;
byte[] rhash;
-
+
// see if we should recurse left
lhash = ltree.hash(left);
rhash = rtree.hash(left);
@@ -315,7 +315,7 @@ public class MerkleTree implements Serializable
return new TreeRange(this, pleft, pright, depth, hashable);
}
// else: node.
-
+
Inner node = (Inner)hashable;
if (Range.contains(pleft, node.token, t))
// left child contains token
@@ -384,7 +384,7 @@ public class MerkleTree implements Serializable
return hashable.hash();
}
// else: node.
-
+
Inner node = (Inner)hashable;
Range<Token> leftactive = new Range<Token>(active.left, node.token);
Range<Token> rightactive = new Range<Token>(node.token, active.right);
@@ -402,7 +402,7 @@ public class MerkleTree implements Serializable
node.hash(lhash, rhash);
return node.hash();
} // else: one of our children contains the range
-
+
if (leftactive.contains(range))
// left child contains/matches the range
return hashHelper(node.lchild, leftactive, range);
@@ -435,7 +435,7 @@ public class MerkleTree implements Serializable
}
return true;
}
-
+
private Hashable splitHelper(Hashable hashable, Token pleft, Token pright, byte depth, Token t) throws StopRecursion.TooDeep
{
if (depth >= hashdepth)
@@ -568,7 +568,7 @@ public class MerkleTree implements Serializable
tovisit.add(new TreeRange(tree, tree.fullRange.left, tree.fullRange.right, (byte)0, tree.root));
this.tree = tree;
}
-
+
/**
* Find the next TreeRange.
*
@@ -608,7 +608,7 @@ public class MerkleTree implements Serializable
}
return endOfData();
}
-
+
public Iterator<TreeRange> iterator()
{
return this;
@@ -628,7 +628,7 @@ public class MerkleTree implements Serializable
private Hashable rchild;
private static InnerSerializer serializer = new InnerSerializer();
-
+
/**
* Constructs an Inner with the given token and children, and a null hash.
*/
@@ -695,7 +695,7 @@ public class MerkleTree implements Serializable
toString(buff, 1);
return buff.toString();
}
-
+
private static class InnerSerializer
{
public void serialize(Inner inner, DataOutput dos, int version) throws IOException
@@ -740,7 +740,7 @@ public class MerkleTree implements Serializable
public static final long serialVersionUID = 1L;
static final byte IDENT = 1;
private static LeafSerializer serializer = new LeafSerializer();
-
+
/**
* Constructs a null hash.
*/
@@ -763,7 +763,7 @@ public class MerkleTree implements Serializable
{
buff.append(toString());
}
-
+
@Override
public String toString()
{
@@ -805,17 +805,17 @@ public class MerkleTree implements Serializable
public final byte[] hash;
public RowHash(Token token, byte[] hash)
{
- this.token = token;
+ this.token = token;
this.hash = hash;
}
-
+
@Override
public String toString()
{
return "#<RowHash " + token + " " + Hashable.toString(hash) + ">";
}
}
-
+
/**
* Abstract class containing hashing logic, and containing a single hash field.
*/
@@ -873,19 +873,19 @@ public class MerkleTree implements Serializable
}
public abstract void toString(StringBuilder buff, int maxdepth);
-
+
public static String toString(byte[] hash)
{
if (hash == null)
return "null";
return "[" + Hex.bytesToHex(hash) + "]";
}
-
+
private static class HashableSerializer implements IVersionedSerializer<Hashable>
{
public void serialize(Hashable h, DataOutput dos, int version) throws IOException
{
- if (h instanceof Inner)
+ if (h instanceof Inner)
{
dos.writeByte(Inner.IDENT);
Inner.serializer.serialize((Inner)h, dos, version);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/MurmurHash.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/MurmurHash.java b/src/java/org/apache/cassandra/utils/MurmurHash.java
index 432cefc..e33e906 100644
--- a/src/java/org/apache/cassandra/utils/MurmurHash.java
+++ b/src/java/org/apache/cassandra/utils/MurmurHash.java
@@ -23,7 +23,7 @@ import java.nio.ByteBuffer;
/**
* This is a very fast, non-cryptographic hash suitable for general hash-based
* lookup. See http://murmurhash.googlepages.com/ for more details.
- *
+ *
* <p>
* The C version of MurmurHash 2.0 found at that site was ported to Java by
* Andrzej Bialecki (ab at getopt org).
@@ -103,7 +103,7 @@ public class MurmurHash
(((long) key.get(offset+i_8+2) & 0xff)<<16) + (((long) key.get(offset+i_8+3) & 0xff)<<24) +
(((long) key.get(offset+i_8+4) & 0xff)<<32) + (((long) key.get(offset+i_8+5) & 0xff)<<40) +
(((long) key.get(offset+i_8+6) & 0xff)<<48) + (((long) key.get(offset+i_8+7) & 0xff)<<56);
-
+
k64 *= m64;
k64 ^= k64 >>> r64;
k64 *= m64;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/Mx4jTool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/Mx4jTool.java b/src/java/org/apache/cassandra/utils/Mx4jTool.java
index 83a2b74..63cdff8 100644
--- a/src/java/org/apache/cassandra/utils/Mx4jTool.java
+++ b/src/java/org/apache/cassandra/utils/Mx4jTool.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.utils;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.utils;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/Pair.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/Pair.java b/src/java/org/apache/cassandra/utils/Pair.java
index 1d7f2d1..b3b8510 100644
--- a/src/java/org/apache/cassandra/utils/Pair.java
+++ b/src/java/org/apache/cassandra/utils/Pair.java
@@ -37,7 +37,7 @@ public class Pair<T1, T2>
int hashCode = 31 + (left == null ? 0 : left.hashCode());
return 31*hashCode + (right == null ? 0 : right.hashCode());
}
-
+
@Override
public final boolean equals(Object o)
{
@@ -47,7 +47,7 @@ public class Pair<T1, T2>
// handles nulls properly
return Objects.equal(left, that.left) && Objects.equal(right, that.right);
}
-
+
@Override
public String toString()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/ResourceWatcher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/ResourceWatcher.java b/src/java/org/apache/cassandra/utils/ResourceWatcher.java
index 41b298c..8a21028 100644
--- a/src/java/org/apache/cassandra/utils/ResourceWatcher.java
+++ b/src/java/org/apache/cassandra/utils/ResourceWatcher.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.utils;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.utils;
* 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.
- *
+ *
*/
@@ -35,7 +35,7 @@ public class ResourceWatcher
{
StorageService.scheduledTasks.scheduleWithFixedDelay(new WatchedResource(resource, callback), period, period, TimeUnit.MILLISECONDS);
}
-
+
public static class WatchedResource implements Runnable
{
private static Logger logger = LoggerFactory.getLogger(WatchedResource.class);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/SimpleCondition.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/SimpleCondition.java b/src/java/org/apache/cassandra/utils/SimpleCondition.java
index ad45b48..8bb2229 100644
--- a/src/java/org/apache/cassandra/utils/SimpleCondition.java
+++ b/src/java/org/apache/cassandra/utils/SimpleCondition.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.utils;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.utils;
* 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.
- *
+ *
*/
@@ -37,7 +37,7 @@ public class SimpleCondition implements Condition
while (!set)
wait();
}
-
+
public synchronized void reset()
{
set = false;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/SkipNullRepresenter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/SkipNullRepresenter.java b/src/java/org/apache/cassandra/utils/SkipNullRepresenter.java
index 184e68f..b327118 100644
--- a/src/java/org/apache/cassandra/utils/SkipNullRepresenter.java
+++ b/src/java/org/apache/cassandra/utils/SkipNullRepresenter.java
@@ -27,13 +27,13 @@ import org.yaml.snakeyaml.representer.Representer;
/* used to prevent null values from being included in generated YAML */
public class SkipNullRepresenter extends Representer
{
- protected NodeTuple representJavaBeanProperty(Object javaBean, Property property, Object propertyValue, Tag customTag)
+ protected NodeTuple representJavaBeanProperty(Object javaBean, Property property, Object propertyValue, Tag customTag)
{
- if (propertyValue == null)
+ if (propertyValue == null)
{
return null;
- }
- else
+ }
+ else
{
return super.representJavaBeanProperty(javaBean, property, propertyValue, customTag);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/SlabAllocator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/SlabAllocator.java b/src/java/org/apache/cassandra/utils/SlabAllocator.java
index 596c07e..b6ca040 100644
--- a/src/java/org/apache/cassandra/utils/SlabAllocator.java
+++ b/src/java/org/apache/cassandra/utils/SlabAllocator.java
@@ -80,7 +80,7 @@ public class SlabAllocator extends Allocator
currentRegion.compareAndSet(region, null);
}
}
-
+
/**
* Get the current region, or, if there is no current region, allocate a new one
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/StatusLogger.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/StatusLogger.java b/src/java/org/apache/cassandra/utils/StatusLogger.java
index 4001d13..9d1ff68 100644
--- a/src/java/org/apache/cassandra/utils/StatusLogger.java
+++ b/src/java/org/apache/cassandra/utils/StatusLogger.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.utils;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.utils;
* 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.
- *
+ *
*/
@@ -51,7 +51,7 @@ public class StatusLogger
public static void log()
{
MBeanServer server = ManagementFactory.getPlatformMBeanServer();
-
+
// everything from o.a.c.concurrent
logger.info(String.format("%-25s%10s%10s%10s", "Pool Name", "Active", "Pending", "Blocked"));
Set<ObjectName> request, internal;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/Throttle.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/Throttle.java b/src/java/org/apache/cassandra/utils/Throttle.java
index 598d56f..c5f7632 100644
--- a/src/java/org/apache/cassandra/utils/Throttle.java
+++ b/src/java/org/apache/cassandra/utils/Throttle.java
@@ -95,7 +95,7 @@ public class Throttle
{
return "Throttle(for=" + name + ")";
}
-
+
public interface ThroughputFunction
{
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/UUIDGen.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/UUIDGen.java b/src/java/org/apache/cassandra/utils/UUIDGen.java
index 75828f0..e08281e 100644
--- a/src/java/org/apache/cassandra/utils/UUIDGen.java
+++ b/src/java/org/apache/cassandra/utils/UUIDGen.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.utils;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.utils;
* 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.
- *
+ *
*/
import java.io.*;
@@ -38,10 +38,10 @@ public class UUIDGen
// A grand day! millis at 00:00:00.000 15 Oct 1582.
private static final long START_EPOCH = -12219292800000L;
private static final long clock = new Random(System.currentTimeMillis()).nextLong();
-
+
// placement of this singleton is important. It needs to be instantiated *AFTER* the other statics.
private static final UUIDGen instance = new UUIDGen();
-
+
private long lastNanos;
private final Map<InetAddress, Long> nodeCache = new HashMap<InetAddress, Long>();
@@ -74,11 +74,11 @@ public class UUIDGen
// make sure someone didn't whack the clock by changing the order of instantiation.
if (clock == 0) throw new RuntimeException("singleton instantiation is misplaced.");
}
-
+
/**
* Creates a type 1 UUID (time-based UUID) that substitutes a hash of
* an IP address in place of the MAC (unavailable to Java).
- *
+ *
* @param addr the host address to use
* @return a UUID instance
*/
@@ -86,7 +86,7 @@ public class UUIDGen
{
return new UUID(instance.createTimeSafe(), instance.getClockSeqAndNode(addr));
}
-
+
/** creates a type 1 uuid from raw bytes. */
public static UUID getUUID(ByteBuffer raw)
{
@@ -119,25 +119,25 @@ public class UUIDGen
}
return b;
}
-
+
/**
* Returns a 16 byte representation of a type 1 UUID (a time-based UUID),
* based on the current system time.
- *
+ *
* @return a type 1 UUID represented as a byte[]
*/
public static byte[] getTimeUUIDBytes()
{
return createTimeUUIDBytes(instance.createTimeSafe());
}
-
+
/**
* Converts a milliseconds-since-epoch timestamp into the 16 byte representation
* of a type 1 UUID (a time-based UUID).
- *
+ *
* <p><i><b>Warning:</b> This method is not guaranteed to return unique UUIDs; Multiple
* invocations using identical timestamps will result in identical UUIDs.</i></p>
- *
+ *
* @param timeMillis
* @return a type 1 UUID represented as a byte[]
*/
@@ -145,24 +145,24 @@ public class UUIDGen
{
return createTimeUUIDBytes(instance.createTimeUnsafe(timeMillis));
}
-
+
private static byte[] createTimeUUIDBytes(long msb)
{
long lsb = instance.getClockSeqAndNode(FBUtilities.getLocalAddress());
byte[] uuidBytes = new byte[16];
-
+
for (int i = 0; i < 8; i++)
uuidBytes[i] = (byte) (msb >>> 8 * (7 - i));
-
+
for (int i = 8; i < 16; i++)
uuidBytes[i] = (byte) (lsb >>> 8 * (7 - i));
-
+
return uuidBytes;
}
-
+
/**
* Returns a milliseconds-since-epoch value for a type-1 UUID.
- *
+ *
* @param uuid a type-1 (time-based) UUID
* @return the number of milliseconds since the unix epoch
* @throws IllegalArgumentException if the UUID is not version 1
@@ -180,11 +180,11 @@ public class UUIDGen
long lsb = 0;
lsb |= (clock & 0x3f00000000000000L) >>> 56; // was 58?
lsb |= 0x0000000000000080;
- lsb |= (clock & 0x00ff000000000000L) >>> 48;
+ lsb |= (clock & 0x00ff000000000000L) >>> 48;
lsb |= makeNode(addr);
return lsb;
}
-
+
// needs to return two different values for the same when.
// we can generate at most 10k UUIDs per ms.
private synchronized long createTimeSafe()
@@ -194,7 +194,7 @@ public class UUIDGen
lastNanos = nanosSince;
else
nanosSince = ++lastNanos;
-
+
return createTime(nanosSince);
}
@@ -203,12 +203,12 @@ public class UUIDGen
long nanosSince = (when - START_EPOCH) * 10000;
return createTime(nanosSince);
}
-
+
private long createTime(long nanosSince)
- {
- long msb = 0L;
+ {
+ long msb = 0L;
msb |= (0x00000000ffffffffL & nanosSince) << 32;
- msb |= (0x0000ffff00000000L & nanosSince) >>> 16;
+ msb |= (0x0000ffff00000000L & nanosSince) >>> 16;
msb |= (0xffff000000000000L & nanosSince) >>> 48;
msb |= 0x0000000000001000L; // sets the version to 1.
return msb;
@@ -219,16 +219,16 @@ public class UUIDGen
{
if (nodeCache.containsKey(addr))
return nodeCache.get(addr);
-
+
// ideally, we'd use the MAC address, but java doesn't expose that.
byte[] hash = hash(addr.toString());
long node = 0;
for (int i = 0; i < Math.min(6, hash.length); i++)
node |= (0x00000000000000ff & (long)hash[i]) << (5-i)*8;
assert (0xff00000000000000L & node) == 0;
-
+
nodeCache.put(addr, node);
-
+
return node;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/WrappedRunnable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/WrappedRunnable.java b/src/java/org/apache/cassandra/utils/WrappedRunnable.java
index 392749a..2ae0d6c 100644
--- a/src/java/org/apache/cassandra/utils/WrappedRunnable.java
+++ b/src/java/org/apache/cassandra/utils/WrappedRunnable.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.utils;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.utils;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/utils/obs/OpenBitSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/obs/OpenBitSet.java b/src/java/org/apache/cassandra/utils/obs/OpenBitSet.java
index da89804..4ecb3d9 100644
--- a/src/java/org/apache/cassandra/utils/obs/OpenBitSet.java
+++ b/src/java/org/apache/cassandra/utils/obs/OpenBitSet.java
@@ -59,7 +59,7 @@ public class OpenBitSet implements Serializable {
* Constructs an OpenBitSet large enough to hold numBits.
* @param numBits
*/
- public OpenBitSet(long numBits)
+ public OpenBitSet(long numBits)
{
wlen = bits2words(numBits);
int lastPageSize = wlen % PAGE_SIZE;
@@ -86,7 +86,7 @@ public class OpenBitSet implements Serializable {
{
return PAGE_SIZE;
}
-
+
public int getPageCount()
{
return pageCount;
@@ -96,7 +96,7 @@ public class OpenBitSet implements Serializable {
{
return bits[pageIdx];
}
-
+
/** Contructs an OpenBitset from a BitSet
*/
public OpenBitSet(BitSet bits) {
@@ -240,7 +240,7 @@ public class OpenBitSet implements Serializable {
bits[startWord / PAGE_SIZE][startWord % PAGE_SIZE] &= (startmask | endmask);
return;
}
-
+
bits[startWord / PAGE_SIZE][startWord % PAGE_SIZE] &= startmask;
@@ -372,12 +372,12 @@ public class OpenBitSet implements Serializable {
}
/** @return the number of set bits */
- public long cardinality()
+ public long cardinality()
{
long bitCount = 0L;
for (int i=getPageCount();i-->0;)
bitCount+=BitUtil.pop_array(bits[i],0,wlen);
-
+
return bitCount;
}
@@ -435,7 +435,7 @@ public class OpenBitSet implements Serializable {
while(--pos>=0) {
thisArr[pos / thisPageSize][ pos % thisPageSize] &= otherArr[pos / otherPageSize][pos % otherPageSize];
}
-
+
if (this.wlen > newLen) {
// fill zeros from the new shorter length to the old length
for (pos=wlen;pos-->newLen;)
@@ -478,7 +478,7 @@ public class OpenBitSet implements Serializable {
} else {
a=this;
}
-
+
int aPageSize = this.PAGE_SIZE;
int bPageSize = b.PAGE_SIZE;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/test/long/org/apache/cassandra/db/MeteredFlusherTest.java
----------------------------------------------------------------------
diff --git a/test/long/org/apache/cassandra/db/MeteredFlusherTest.java b/test/long/org/apache/cassandra/db/MeteredFlusherTest.java
index aa1fdd2..bb29bf1 100644
--- a/test/long/org/apache/cassandra/db/MeteredFlusherTest.java
+++ b/test/long/org/apache/cassandra/db/MeteredFlusherTest.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.db;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.db;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/test/unit/org/apache/cassandra/AbstractSerializationsTester.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/AbstractSerializationsTester.java b/test/unit/org/apache/cassandra/AbstractSerializationsTester.java
index dbc1450..e908ae7 100644
--- a/test/unit/org/apache/cassandra/AbstractSerializationsTester.java
+++ b/test/unit/org/apache/cassandra/AbstractSerializationsTester.java
@@ -1,6 +1,6 @@
package org.apache.cassandra;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra;
* 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.
- *
+ *
*/
@@ -33,25 +33,25 @@ import java.util.Map;
public class AbstractSerializationsTester extends CleanupHelper
{
protected static final String CUR_VER = System.getProperty("cassandra.version", "0.7");
- protected static final Map<String, Integer> VERSION_MAP = new HashMap<String, Integer> ()
+ protected static final Map<String, Integer> VERSION_MAP = new HashMap<String, Integer> ()
{{
put("0.7", 1);
}};
-
+
protected static final boolean EXECUTE_WRITES = new Boolean(System.getProperty("cassandra.test-serialization-writes", "False")).booleanValue();
-
+
protected final int getVersion()
{
return VERSION_MAP.get(CUR_VER);
}
-
+
protected static DataInputStream getInput(String name) throws IOException
{
File f = new File("test/data/serialization/" + CUR_VER + "/" + name);
assert f.exists() : f.getPath();
return new DataInputStream(new FileInputStream(f));
}
-
+
protected static DataOutputStream getOutput(String name) throws IOException
{
File f = new File("test/data/serialization/" + CUR_VER + "/" + name);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/test/unit/org/apache/cassandra/EmbeddedServer.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/EmbeddedServer.java b/test/unit/org/apache/cassandra/EmbeddedServer.java
index 7317afe..24b3afa 100644
--- a/test/unit/org/apache/cassandra/EmbeddedServer.java
+++ b/test/unit/org/apache/cassandra/EmbeddedServer.java
@@ -30,19 +30,19 @@ import org.junit.BeforeClass;
public class EmbeddedServer extends CleanupHelper
{
protected static CassandraDaemon daemon = null;
-
+
enum GatewayService
{
Thrift
}
-
+
public static GatewayService getDaemonGatewayService()
{
return GatewayService.Thrift;
}
-
+
static ExecutorService executor = Executors.newSingleThreadExecutor();
-
+
@BeforeClass
public static void startCassandra() throws IOException
@@ -69,7 +69,7 @@ public class EmbeddedServer extends CleanupHelper
throw new AssertionError(e);
}
}
-
+
@AfterClass
public static void stopCassandra() throws Exception
{
@@ -80,5 +80,5 @@ public class EmbeddedServer extends CleanupHelper
executor.shutdown();
executor.shutdownNow();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/test/unit/org/apache/cassandra/SchemaLoader.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java
index 697d466..124962f 100644
--- a/test/unit/org/apache/cassandra/SchemaLoader.java
+++ b/test/unit/org/apache/cassandra/SchemaLoader.java
@@ -80,7 +80,7 @@ public class SchemaLoader
String ks_kcs = "KeyCacheSpace";
String ks_rcs = "RowCacheSpace";
String ks_nocommit = "NoCommitlogSpace";
-
+
Class<? extends AbstractReplicationStrategy> simple = SimpleStrategy.class;
Map<String, String> opts_rf1 = KSMetaData.optsWithRF(1);
@@ -97,7 +97,7 @@ public class SchemaLoader
aliases.put((byte)'b', BytesType.instance);
aliases.put((byte)'t', TimeUUIDType.instance);
AbstractType<?> dynamicComposite = DynamicCompositeType.getInstance(aliases);
-
+
// these column definitions will will be applied to the jdbc utf and integer column familes respectively.
Map<ByteBuffer, ColumnDefinition> integerColumn = new HashMap<ByteBuffer, ColumnDefinition>();
integerColumn.put(IntegerType.instance.fromString("42"), new ColumnDefinition(
@@ -248,7 +248,7 @@ public class SchemaLoader
if (Boolean.parseBoolean(System.getProperty("cassandra.test.compression", "false")))
useCompression(schema);
-
+
return schema;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/test/unit/org/apache/cassandra/Util.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/Util.java b/test/unit/org/apache/cassandra/Util.java
index 68ae228..0a376b4 100644
--- a/test/unit/org/apache/cassandra/Util.java
+++ b/test/unit/org/apache/cassandra/Util.java
@@ -1,6 +1,6 @@
package org.apache.cassandra;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra;
* 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.
- *
+ *
*/
import java.io.EOFException;
@@ -112,7 +112,7 @@ public class Util
bb.rewind();
return bb;
}
-
+
public static ByteBuffer getBytes(int v)
{
byte[] bytes = new byte[4];
@@ -121,7 +121,7 @@ public class Util
bb.rewind();
return bb;
}
-
+
public static List<Row> getRangeSlice(ColumnFamilyStore cfs) throws IOException, ExecutionException, InterruptedException
{
return getRangeSlice(cfs, null);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/test/unit/org/apache/cassandra/cache/CacheProviderTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cache/CacheProviderTest.java b/test/unit/org/apache/cassandra/cache/CacheProviderTest.java
index f872778..fa8a4ea 100644
--- a/test/unit/org/apache/cassandra/cache/CacheProviderTest.java
+++ b/test/unit/org/apache/cassandra/cache/CacheProviderTest.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.cache;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.cache;
* 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.
- *
+ *
*/
@@ -55,7 +55,7 @@ public class CacheProviderTest extends SchemaLoader
cache.put(key3, cf);
cache.put(key4, cf);
cache.put(key5, cf);
-
+
assertEquals(CAPACITY, cache.size());
}
@@ -101,7 +101,7 @@ public class CacheProviderTest extends SchemaLoader
cf.addColumn(column("awesome", "vijay", 1));
return cf;
}
-
+
@Test
public void testHeapCache() throws InterruptedException
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/test/unit/org/apache/cassandra/cli/CliTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cli/CliTest.java b/test/unit/org/apache/cassandra/cli/CliTest.java
index db93aed..b87c56a 100644
--- a/test/unit/org/apache/cassandra/cli/CliTest.java
+++ b/test/unit/org/apache/cassandra/cli/CliTest.java
@@ -205,7 +205,7 @@ public class CliTest extends CleanupHelper
"show schema",
"show schema TestKeySpace"
};
-
+
@Test
public void testCli() throws IOException, TException, ConfigurationException, ClassNotFoundException, TimedOutException, NotFoundException, SchemaDisagreementException, NoSuchFieldException, InvalidRequestException, UnavailableException, InstantiationException, IllegalAccessException
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/test/unit/org/apache/cassandra/client/TestRingCache.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/client/TestRingCache.java b/test/unit/org/apache/cassandra/client/TestRingCache.java
index 4fae42b..c16e336 100644
--- a/test/unit/org/apache/cassandra/client/TestRingCache.java
+++ b/test/unit/org/apache/cassandra/client/TestRingCache.java
@@ -51,7 +51,7 @@ public class TestRingCache
ConfigHelper.setOutputColumnFamily(conf, keyspace, "Standard1");
ringCache = new RingCache(conf);
}
-
+
private void setup(String server, int port) throws Exception
{
/* Establish a thrift connection to the cassandra instance */
@@ -81,7 +81,7 @@ public class TestRingCache
int minRow;
int maxRow;
String rowPrefix, keyspace = "Keyspace1";
-
+
if (args.length > 0)
{
keyspace = args[0];
@@ -95,7 +95,7 @@ public class TestRingCache
maxRow = 10;
rowPrefix = "row";
}
-
+
TestRingCache tester = new TestRingCache(keyspace);
for (int nRows = minRow; nRows < maxRow; nRows++)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java b/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java
index 54f0c2e..4b0e9c4 100644
--- a/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java
+++ b/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.concurrent;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.concurrent;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java b/test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java
index 253f061..7e3d698 100644
--- a/test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java
+++ b/test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.config;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.config;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java b/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
index 1cb2b64..b79e8a3 100644
--- a/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
+++ b/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
@@ -57,7 +57,7 @@ public class DatabaseDescriptorTest
assert ksmDupe.equals(ksm);
}
}
-
+
// this came as a result of CASSANDRA-995
@Test
public void testTransKsMigration() throws IOException, ConfigurationException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java b/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java
index b27d730..76362bf 100644
--- a/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java
+++ b/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.cql.jdbc;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.cql.jdbc;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java b/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java
index 8cfbb21..01283c2 100644
--- a/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java
+++ b/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.db;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.db;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index 9c871bf..85269b7 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@ -197,13 +197,13 @@ public class ColumnFamilyStoreTest extends CleanupHelper
assert rows != null;
assert rows.size() == 2 : StringUtils.join(rows, ",");
-
- String key = new String(rows.get(0).key.key.array(),rows.get(0).key.key.position(),rows.get(0).key.key.remaining());
+
+ String key = new String(rows.get(0).key.key.array(),rows.get(0).key.key.position(),rows.get(0).key.key.remaining());
assert "k1".equals( key ) : key;
-
- key = new String(rows.get(1).key.key.array(),rows.get(1).key.key.position(),rows.get(1).key.key.remaining());
+
+ key = new String(rows.get(1).key.key.array(),rows.get(1).key.key.position(),rows.get(1).key.key.remaining());
assert "k3".equals(key) : key;
-
+
assert ByteBufferUtil.bytes(1L).equals( rows.get(0).cf.getColumn(ByteBufferUtil.bytes("birthdate")).value());
assert ByteBufferUtil.bytes(1L).equals( rows.get(1).cf.getColumn(ByteBufferUtil.bytes("birthdate")).value());
@@ -213,26 +213,26 @@ public class ColumnFamilyStoreTest extends CleanupHelper
rows = Table.open("Keyspace1").getColumnFamilyStore("Indexed1").search(clause, range, 100, filter);
assert rows.size() == 1 : StringUtils.join(rows, ",");
- key = new String(rows.get(0).key.key.array(),rows.get(0).key.key.position(),rows.get(0).key.key.remaining());
+ key = new String(rows.get(0).key.key.array(),rows.get(0).key.key.position(),rows.get(0).key.key.remaining());
assert "k3".equals( key );
-
+
// same query again, but with resultset not including the subordinate expression
rows = Table.open("Keyspace1").getColumnFamilyStore("Indexed1").search(clause, range, 100, new NamesQueryFilter(ByteBufferUtil.bytes("birthdate")));
assert rows.size() == 1 : StringUtils.join(rows, ",");
- key = new String(rows.get(0).key.key.array(),rows.get(0).key.key.position(),rows.get(0).key.key.remaining());
+ key = new String(rows.get(0).key.key.array(),rows.get(0).key.key.position(),rows.get(0).key.key.remaining());
assert "k3".equals( key );
-
+
assert rows.get(0).cf.getColumnCount() == 1 : rows.get(0).cf;
// once more, this time with a slice rowset that needs to be expanded
SliceQueryFilter emptyFilter = new SliceQueryFilter(ByteBufferUtil.EMPTY_BYTE_BUFFER, ByteBufferUtil.EMPTY_BYTE_BUFFER, false, 0);
rows = Table.open("Keyspace1").getColumnFamilyStore("Indexed1").search(clause, range, 100, emptyFilter);
-
+
assert rows.size() == 1 : StringUtils.join(rows, ",");
- key = new String(rows.get(0).key.key.array(),rows.get(0).key.key.position(),rows.get(0).key.key.remaining());
+ key = new String(rows.get(0).key.key.array(),rows.get(0).key.key.position(),rows.get(0).key.key.remaining());
assert "k3".equals( key );
-
+
assert rows.get(0).cf.getColumnCount() == 0;
// query with index hit but rejected by secondary clause, with a small enough count that just checking count
@@ -395,7 +395,7 @@ public class ColumnFamilyStoreTest extends CleanupHelper
rows = table.getColumnFamilyStore("Indexed1").search(clause, range, 100, filter);
String key = ByteBufferUtil.string(rows.get(0).key.key);
assert "k1".equals( key );
-
+
// update the birthdate value with an OLDER timestamp, and test that the index ignores this
rm = new RowMutation("Keyspace2", ByteBufferUtil.bytes("k1"));
rm.add(new QueryPath("Indexed1", null, ByteBufferUtil.bytes("birthdate")), ByteBufferUtil.bytes(3L), 0);
@@ -404,7 +404,7 @@ public class ColumnFamilyStoreTest extends CleanupHelper
rows = table.getColumnFamilyStore("Indexed1").search(clause, range, 100, filter);
key = ByteBufferUtil.string(rows.get(0).key.key);
assert "k1".equals( key );
-
+
}
// See CASSANDRA-2628
@@ -513,59 +513,59 @@ public class ColumnFamilyStoreTest extends CleanupHelper
Table table = Table.open(tableName);
ColumnFamilyStore cfs = table.getColumnFamilyStore(cfName);
DecoratedKey key = Util.dk("flush-resurrection");
-
+
// create an isolated sstable.
- putColsSuper(cfs, key, scfName,
+ putColsSuper(cfs, key, scfName,
new Column(getBytes(1L), ByteBufferUtil.bytes("val1"), 1),
new Column(getBytes(2L), ByteBufferUtil.bytes("val2"), 1),
new Column(getBytes(3L), ByteBufferUtil.bytes("val3"), 1));
cfs.forceBlockingFlush();
-
+
// insert, don't flush.
- putColsSuper(cfs, key, scfName,
+ putColsSuper(cfs, key, scfName,
new Column(getBytes(4L), ByteBufferUtil.bytes("val4"), 1),
new Column(getBytes(5L), ByteBufferUtil.bytes("val5"), 1),
new Column(getBytes(6L), ByteBufferUtil.bytes("val6"), 1));
-
+
// verify insert.
final SlicePredicate sp = new SlicePredicate();
sp.setSlice_range(new SliceRange());
sp.getSlice_range().setCount(100);
sp.getSlice_range().setStart(ArrayUtils.EMPTY_BYTE_ARRAY);
sp.getSlice_range().setFinish(ArrayUtils.EMPTY_BYTE_ARRAY);
-
+
assertRowAndColCount(1, 6, scfName, false, cfs.getRangeSlice(scfName, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null));
-
+
// deeleet.
RowMutation rm = new RowMutation(table.name, key.key);
rm.delete(new QueryPath(cfName, scfName), 2);
rm.apply();
-
+
// verify delete.
assertRowAndColCount(1, 0, scfName, false, cfs.getRangeSlice(scfName, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null));
-
+
// flush
cfs.forceBlockingFlush();
-
+
// re-verify delete.
assertRowAndColCount(1, 0, scfName, false, cfs.getRangeSlice(scfName, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null));
-
+
// late insert.
- putColsSuper(cfs, key, scfName,
+ putColsSuper(cfs, key, scfName,
new Column(getBytes(4L), ByteBufferUtil.bytes("val4"), 1L),
new Column(getBytes(7L), ByteBufferUtil.bytes("val7"), 1L));
-
+
// re-verify delete.
assertRowAndColCount(1, 0, scfName, false, cfs.getRangeSlice(scfName, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null));
-
+
// make sure new writes are recognized.
- putColsSuper(cfs, key, scfName,
+ putColsSuper(cfs, key, scfName,
new Column(getBytes(3L), ByteBufferUtil.bytes("val3"), 3),
new Column(getBytes(8L), ByteBufferUtil.bytes("val8"), 3),
new Column(getBytes(9L), ByteBufferUtil.bytes("val9"), 3));
assertRowAndColCount(1, 3, scfName, false, cfs.getRangeSlice(scfName, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null));
}
-
+
private static void assertRowAndColCount(int rowCount, int colCount, ByteBuffer sc, boolean isDeleted, Collection<Row> rows) throws CharacterCodingException
{
assert rows.size() == rowCount : "rowcount " + rows.size();
@@ -580,7 +580,7 @@ public class ColumnFamilyStoreTest extends CleanupHelper
assert row.cf.isMarkedForDelete() : "cf not marked for delete";
}
}
-
+
private static String str(ColumnFamily cf) throws CharacterCodingException
{
StringBuilder sb = new StringBuilder();
@@ -588,7 +588,7 @@ public class ColumnFamilyStoreTest extends CleanupHelper
sb.append(String.format("(%s,%s,%d),", ByteBufferUtil.string(col.name()), ByteBufferUtil.string(col.value()), col.timestamp()));
return sb.toString();
}
-
+
private static void putColsSuper(ColumnFamilyStore cfs, DecoratedKey key, ByteBuffer scfName, Column... cols) throws Throwable
{
RowMutation rm = new RowMutation(cfs.table.name, key.key);
@@ -610,7 +610,7 @@ public class ColumnFamilyStoreTest extends CleanupHelper
rm.add(cf);
rm.apply();
}
-
+
@Test
public void testDeleteStandardRowSticksAfterFlush() throws Throwable
{
@@ -620,53 +620,53 @@ public class ColumnFamilyStoreTest extends CleanupHelper
Table table = Table.open(tableName);
ColumnFamilyStore cfs = table.getColumnFamilyStore(cfName);
DecoratedKey key = Util.dk("f-flush-resurrection");
-
+
SlicePredicate sp = new SlicePredicate();
sp.setSlice_range(new SliceRange());
sp.getSlice_range().setCount(100);
sp.getSlice_range().setStart(ArrayUtils.EMPTY_BYTE_ARRAY);
sp.getSlice_range().setFinish(ArrayUtils.EMPTY_BYTE_ARRAY);
-
+
// insert
putColsStandard(cfs, key, column("col1", "val1", 1), column("col2", "val2", 1));
assertRowAndColCount(1, 2, null, false, cfs.getRangeSlice(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null));
-
+
// flush.
cfs.forceBlockingFlush();
-
+
// insert, don't flush
putColsStandard(cfs, key, column("col3", "val3", 1), column("col4", "val4", 1));
assertRowAndColCount(1, 4, null, false, cfs.getRangeSlice(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null));
-
+
// delete (from sstable and memtable)
RowMutation rm = new RowMutation(table.name, key.key);
rm.delete(new QueryPath(cfs.columnFamily, null, null), 2);
rm.apply();
-
+
// verify delete
assertRowAndColCount(1, 0, null, true, cfs.getRangeSlice(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null));
-
+
// flush
cfs.forceBlockingFlush();
-
+
// re-verify delete. // first breakage is right here because of CASSANDRA-1837.
assertRowAndColCount(1, 0, null, true, cfs.getRangeSlice(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null));
-
+
// simulate a 'late' insertion that gets put in after the deletion. should get inserted, but fail on read.
putColsStandard(cfs, key, column("col5", "val5", 1), column("col2", "val2", 1));
-
+
// should still be nothing there because we deleted this row. 2nd breakage, but was undetected because of 1837.
assertRowAndColCount(1, 0, null, true, cfs.getRangeSlice(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null));
-
+
// make sure that new writes are recognized.
putColsStandard(cfs, key, column("col6", "val6", 3), column("col7", "val7", 3));
assertRowAndColCount(1, 2, null, true, cfs.getRangeSlice(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null));
-
+
// and it remains so after flush. (this wasn't failing before, but it's good to check.)
cfs.forceBlockingFlush();
assertRowAndColCount(1, 2, null, true, cfs.getRangeSlice(null, Util.range("f", "g"), 100, QueryFilter.getFilter(sp, cfs.getComparator()), null));
}
-
+
private ColumnFamilyStore insertKey1Key2() throws IOException, ExecutionException, InterruptedException
{
@@ -682,7 +682,7 @@ public class ColumnFamilyStoreTest extends CleanupHelper
rms.add(rm);
return Util.writeColumnFamily(rms);
}
-
+
@Test
public void testBackupAfterFlush() throws Throwable
{
@@ -696,7 +696,7 @@ public class ColumnFamilyStoreTest extends CleanupHelper
assertTrue("can not find backedup file:" + desc.filenameFor(c), new File(desc.filenameFor(c)).exists());
}
}
-
+
@Test
public void testSuperSliceByNamesCommand() throws Throwable
{
@@ -720,7 +720,7 @@ public class ColumnFamilyStoreTest extends CleanupHelper
SuperColumn superColumn = (SuperColumn) cf.getColumn(superColName);
assertColumns(superColumn, "c1", "c2");
}
-
+
// CASSANDRA-3467. the key here is that supercolumn and subcolumn comparators are different
@Test
public void testSliceByNamesCommandOnUUIDTypeSCF() throws Throwable
@@ -736,19 +736,19 @@ public class ColumnFamilyStoreTest extends CleanupHelper
putColsSuper(cfs, key, superColName, new Column(ByteBufferUtil.bytes("a"), ByteBufferUtil.bytes("A"), 1),
new Column(ByteBufferUtil.bytes("b"), ByteBufferUtil.bytes("B"), 1));
- // Get the entire supercolumn like normal
+ // Get the entire supercolumn like normal
IColumn columnGet = cfs.getColumnFamily(QueryFilter.getIdentityFilter(key, new QueryPath(cfName, superColName))).getColumn(superColName);
assertEquals(ByteBufferUtil.bytes("A"), columnGet.getSubColumn(ByteBufferUtil.bytes("a")).value());
assertEquals(ByteBufferUtil.bytes("B"), columnGet.getSubColumn(ByteBufferUtil.bytes("b")).value());
- // Now do the SliceByNamesCommand on the supercolumn, passing both subcolumns in as columns to get
+ // Now do the SliceByNamesCommand on the supercolumn, passing both subcolumns in as columns to get
ArrayList<ByteBuffer> sliceColNames = new ArrayList<ByteBuffer>();
sliceColNames.add(ByteBufferUtil.bytes("a"));
sliceColNames.add(ByteBufferUtil.bytes("b"));
SliceByNamesReadCommand cmd = new SliceByNamesReadCommand(tableName, key.key, new QueryPath(cfName, superColName), sliceColNames);
IColumn columnSliced = cmd.getRow(table).cf.getColumn(superColName);
- // Make sure the slice returns the same as the straight get
+ // Make sure the slice returns the same as the straight get
assertEquals(ByteBufferUtil.bytes("A"), columnSliced.getSubColumn(ByteBufferUtil.bytes("a")).value());
assertEquals(ByteBufferUtil.bytes("B"), columnSliced.getSubColumn(ByteBufferUtil.bytes("b")).value());
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/test/unit/org/apache/cassandra/db/CommitLogTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/CommitLogTest.java b/test/unit/org/apache/cassandra/db/CommitLogTest.java
index 83f780c..7f8bd83 100644
--- a/test/unit/org/apache/cassandra/db/CommitLogTest.java
+++ b/test/unit/org/apache/cassandra/db/CommitLogTest.java
@@ -75,7 +75,7 @@ public class CommitLogTest extends CleanupHelper
checksum.update(100);
testRecoveryWithBadSizeArgument(100, 100, ~checksum.getValue());
}
-
+
@Test
public void testRecoveryWithZeroSegmentSizeArgument() throws Exception
{
@@ -164,7 +164,7 @@ public class CommitLogTest extends CleanupHelper
public void testExceedSegmentSizeWithOverhead() throws Exception
{
CommitLog.instance.resetUnsafe();
-
+
RowMutation rm = new RowMutation("Keyspace1", bytes("k"));
rm.add(new QueryPath("Standard1", null, bytes("c1")), ByteBuffer.allocate((128 * 1024 * 1024) - 83), 0);
CommitLog.instance.add(rm);