You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2007/01/18 12:05:56 UTC
svn commit: r497396 - in /db/derby/code/trunk/java:
engine/org/apache/derby/iapi/services/io/FormatableBitSet.java
testing/org/apache/derbyTesting/unitTests/junit/FormatableBitSetTest.java
Author: kahatlen
Date: Thu Jan 18 03:05:53 2007
New Revision: 497396
URL: http://svn.apache.org/viewvc?view=rev&rev=497396
Log:
DERBY-2191: Remove unused methods in FormatableBitSet
Patch contributed by Dyre Tjeldvoll.
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/FormatableBitSetTest.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java?view=diff&rev=497396&r1=497395&r2=497396
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java Thu Jan 18 03:05:53 2007
@@ -114,27 +114,6 @@
}
/**
- * Constructs a Bit from an array of bytes.
- *
- * @param newValue The array of bytes to make up the new Bit
- * @param numBits The number of bits
- */
- public FormatableBitSet(byte[] newValue, int numBits)
- {
- bitsInLastByte = numBitsInLastByte(numBits);
- lengthAsBits = numBits;
-
- int lenInBytes = numBytesFromBits(numBits);
-
- if (lenInBytes == newValue.length) {
- value = newValue;
- } else {
- value = new byte[lenInBytes];
- System.arraycopy(newValue, 0, value, 0, newValue.length);
- }
- }
-
- /**
* Copy constructor
*
* @param original the FormatableBitSet to make a copy from
@@ -436,96 +415,6 @@
}
}
- /**
- * Bit concatenation.
- *
- * @param other the other bit to append to this
- *
- * @return Bit -- the newly concatenated bit
- *
- */
- public FormatableBitSet concatenate(FormatableBitSet other)
- {
- int newLen;
- int otherLen;
- int prevLen;
- int prevLenBytes;
- int newLenBytes;
- int otherLenBytes;
- int i, j;
- byte[] newValue;
- byte[] otherValue;
- int shiftBits;
- int inByte;
-
-
- prevLen = this.getLength();
- prevLenBytes = this.getLengthInBytes();
- otherLen = other.getLength();
- otherValue = other.getByteArray();
- otherLenBytes = other.getLengthInBytes();
- newLen = prevLen + otherLen;
- newLenBytes = numBytesFromBits(newLen);
- newValue = new byte[newLenBytes];
-
-
- /*
- ** Copy over the entire array in this.value
- ** to newLenBytes.
- */
- for (i = 0; i < prevLenBytes; i++)
- {
- newValue[i] = this.value[i];
- }
-
- /*
- ** Now if we have any bits left over
- ** we need to shift them, and keep
- ** shifting everything down. Be careful
- ** to handle the case where the bit
- ** used to have length 0.
- */
- shiftBits = (prevLen == 0) ? 8 : this.bitsInLastByte;
- for (j = 0; j < otherLenBytes; j++, i++)
- {
- if (shiftBits == 8)
- {
- newValue[i] = otherValue[j];
- }
- else
- {
- /*
- ** Convert to an int because it will get converted
- ** on the shift anyway.
- */
- inByte = (int)otherValue[j];
-
- /*
- ** Mask off the high bits in case they are now
- ** turned on if we had the sign bit on.
- */
- inByte &= (0x100 - 1);
-
- /*
- ** Use the high order bits to finish off
- ** the last byte
- */
- newValue[i-1] |= (inByte >>> shiftBits);
-
- /*
- ** Start the next one with whatever is left, unless
- ** there is nothing left.
- */
- if (i < newLenBytes)
- {
- newValue[i] |= (inByte << (8 - shiftBits));
- }
- }
- }
-
- return new FormatableBitSet(newValue, newLen);
- }
-
/**
* Produce a hash code by putting the value bytes into an int, exclusive OR'ing
* if there are more than 4 bytes.
@@ -696,104 +585,6 @@
}
/**
- * Translate a hex character to a byte.
- *
- * @param hexChar A character with the value [0-9a-fA-F].
- *
- * @return A byte with the numeric value corresponding to the hex character
- */
- private static byte
- hexCharToByte(char hexChar)
- {
- byte byteValue;
-
- switch (hexChar)
- {
- case '0':
- byteValue = 0;
- break;
-
- case '1':
- byteValue = 1;
- break;
-
- case '2':
- byteValue = 2;
- break;
-
- case '3':
- byteValue = 3;
- break;
-
- case '4':
- byteValue = 4;
- break;
-
- case '5':
- byteValue = 5;
- break;
-
- case '6':
- byteValue = 6;
- break;
-
- case '7':
- byteValue = 7;
- break;
-
- case '8':
- byteValue = 8;
- break;
-
- case '9':
- byteValue = 9;
- break;
-
- case 'a':
- case 'A':
- byteValue = 0xA;
- break;
-
- case 'b':
- case 'B':
- byteValue = 0xB;
- break;
-
- case 'c':
- case 'C':
- byteValue = 0xC;
- break;
-
- case 'd':
- case 'D':
- byteValue = 0xD;
- break;
-
- case 'e':
- case 'E':
- byteValue = 0xE;
- break;
-
- case 'f':
- case 'F':
- byteValue = 0xF;
- break;
-
- default:
- if (SanityManager.DEBUG)
- {
- SanityManager.THROWASSERT("illegal char = " + hexChar);
- }
- throw new IllegalArgumentException();
- }
-
- return byteValue;
- }
-
-private static char[] decodeArray = {'0', '1', '2', '3', '4', '5', '6', '7',
- '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-
- /**
* Format the string into BitSet format: {0, 2, 4, 8} if bits 0, 2, 4, 8
* are set.
*
@@ -1159,21 +950,6 @@
bitsInLastByte = numBitsInLastByte(lenInBits);
lengthAsBits = lenInBits;
- }
-
- public void readExternalFromArray(ArrayInputStream in) throws IOException
- {
- int lenInBits = in.readInt();
-
- int lenInBytes = FormatableBitSet.numBytesFromBits(lenInBits);
-
- value = new byte[lenInBytes];
-
- in.readFully(value);
-
- bitsInLastByte = numBitsInLastByte(lenInBits);
-
- lengthAsBits = lenInBits;
}
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/FormatableBitSetTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/FormatableBitSetTest.java?view=diff&rev=497396&r1=497395&r2=497396
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/FormatableBitSetTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/FormatableBitSetTest.java Thu Jan 18 03:05:53 2007
@@ -153,46 +153,6 @@
assertEquals(0,negBits.getNumBitsSet());
}
- // Test cases for two-arg constructor
- public void testArrayIntCtor0() {
- byte[] zeroByteArray = new byte[0];
- FormatableBitSet zeroBits = new FormatableBitSet(zeroByteArray,0);
- assertEquals(0,zeroBits.getLength());
- assertEquals(0,zeroBits.getLengthInBytes());
- assertEquals(0,zeroBits.getByteArray().length);
- assertEquals(zeroByteArray,zeroBits.getByteArray());
- assertEquals(0,zeroBits.getNumBitsSet());
- }
- public void testArrayIntCtor9() {
- byte[] twoByteArray = new byte[2];
- FormatableBitSet nineBits = new FormatableBitSet(twoByteArray,9);
- assertEquals(9,nineBits.getLength());
- assertEquals(2,nineBits.getLengthInBytes());
- assertEquals(twoByteArray,nineBits.getByteArray());
- assertEquals(2,nineBits.getByteArray().length);
- assertEquals(0,nineBits.getNumBitsSet());
- }
- public void testArrayIntCtor0_1() {
- byte[] zeroByteArray = new byte[0];
- FormatableBitSet oneBit = new FormatableBitSet(zeroByteArray,1);
- assertEquals(1,oneBit.getLength());
- assertEquals(1,oneBit.getLengthInBytes());
- assertEquals(1,oneBit.getByteArray().length);
- assertEquals(0,oneBit.getNumBitsSet());
- }
- // Not covered by other tests
- public void testArrayIntCtor1_0() {
- byte[] oneByteArray = new byte[1];
- try {
- FormatableBitSet zeroBits = new FormatableBitSet(oneByteArray,0);
- fail();
- } catch (ArrayIndexOutOfBoundsException e) {}
- // assertEquals(0,zeroBits.getLength());
- // assertEquals(0,zeroBits.getLengthInBytes());
- // assertEquals(oneByteArray,zeroBits.getByteArray());
- // assertEquals(0,zeroBits.getNumBitsSet());
- }
-
// Test cases for the copy constructor
public void testEmptyCpyCtor() {
FormatableBitSet emptyCpy = new FormatableBitSet(empty);
@@ -303,45 +263,6 @@
large.grow(100);
large.shrink(9);
assertEquals(0,small.compare(large));
- }
-
- // Test cases for concatenate(FormatableBitSet)
- // Not covered by other tests
- public void testCatSameEmpty() {
- empty.concatenate(empty);
- assertEquals(0,empty.getLength());
- assertEquals(0,empty.getLengthInBytes());
- assertEquals(0,empty.getByteArray().length);
- assertEquals(0,empty.getNumBitsSet());
- }
- public void testCatAnotherEmpty() {
- empty.concatenate(new FormatableBitSet());
- assertEquals(0,empty.getLength());
- assertEquals(0,empty.getLengthInBytes());
- assertEquals(0,empty.getByteArray().length);
- assertEquals(0,empty.getNumBitsSet());
- }
- public void testCatSame() {
- bitset18.concatenate(bitset18);
- // Failure - is 18
- //assertEquals(36,bitset18.getLength());
- // Failure - is 3
- //assertEquals(5,bitset18.getLengthInBytes());
- // Failure - is 3
- //assertEquals(5,bitset18.getByteArray().length);
- // Failure - is 9
- //assertEquals(18,bitset18.getNumBitsSet());
- }
- public void testCatAnother() {
- bitset18.concatenate(new FormatableBitSet(bitset18));
- // Failure - is 18
- //assertEquals(36,bitset18.getLength());
- // Failure - is 3
- //assertEquals(5,bitset18.getLengthInBytes());
- // Failure - is 3
- //assertEquals(5,bitset18.getByteArray().length);
- // Failure - is 9
- //assertEquals(18,bitset18.getNumBitsSet());
}
// Test cases for isSet(int)