Author: elecharny
Date: Mon Apr 1 09:11:44 2013
New Revision: 1463114
URL: http://svn.apache.org/r1463114
Log:
o Fixed the byte and char comparators so that they return only 0, -1 and 1
o Fixed the tests accordingly
Modified:
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/comparator/ByteComparator.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/comparator/CharComparator.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/comparator/ByteComparatorTest.java
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/comparator/CharComparatorTest.java
Modified:
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/comparator/ByteComparator.java
URL:
http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/comparator/ByteComparator.java?rev=1463114&r1=1463113&r2=1463114&view=diff
==============================================================================
---
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/comparator/ByteComparator.java
(original)
+++
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/comparator/ByteComparator.java
Mon Apr 1 09:11:44 2013
@@ -54,6 +54,17 @@ public class ByteComparator implements C
return 1;
}
- return byte1.compareTo( byte2 );
+ if ( byte1 < byte2 )
+ {
+ return -1;
+ }
+ else if ( byte1 > byte2 )
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
}
}
Modified:
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/comparator/CharComparator.java
URL:
http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/comparator/CharComparator.java?rev=1463114&r1=1463113&r2=1463114&view=diff
==============================================================================
---
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/comparator/CharComparator.java
(original)
+++
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/main/java/org/apache/mavibot/btree/comparator/CharComparator.java
Mon Apr 1 09:11:44 2013
@@ -63,7 +63,18 @@ public class CharComparator implements C
}
else
{
- return char1.compareTo( char2 );
+ if ( char1 < char2 )
+ {
+ return -1;
+ }
+ else if ( char1 > char2 )
+ {
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
}
}
}
Modified:
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/comparator/ByteComparatorTest.java
URL:
http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/comparator/ByteComparatorTest.java?rev=1463114&r1=1463113&r2=1463114&view=diff
==============================================================================
---
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/comparator/ByteComparatorTest.java
(original)
+++
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/comparator/ByteComparatorTest.java
Mon Apr 1 09:11:44 2013
@@ -43,11 +43,11 @@ public class ByteComparatorTest
assertEquals( 1, comparator.compare( ( byte ) 0x01, null ) );
assertEquals( 1, comparator.compare( ( byte ) 0x01, ( byte ) 0x00 ) );
assertEquals( 1, comparator.compare( ( byte ) 0x00, ( byte ) 0xFF ) );
- assertEquals( 126, comparator.compare( ( byte ) 0x7F, ( byte ) 0x01 )
);
+ assertEquals( 1, comparator.compare( ( byte ) 0x7F, ( byte ) 0x01 ) );
assertEquals( -1, comparator.compare( null, ( byte ) 0x00 ) );
assertEquals( -1, comparator.compare( null, ( byte ) 0xFF ) );
assertEquals( -1, comparator.compare( ( byte ) 0x00, ( byte ) 0x01 ) );
- assertEquals( -15, comparator.compare( ( byte ) 0xF0, ( byte ) 0xFF )
);
- assertEquals( -2, comparator.compare( ( byte ) 0xFF, ( byte ) 0x01 ) );
+ assertEquals( -1, comparator.compare( ( byte ) 0xF0, ( byte ) 0xFF ) );
+ assertEquals( -1, comparator.compare( ( byte ) 0xFF, ( byte ) 0x01 ) );
}
}
Modified:
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/comparator/CharComparatorTest.java
URL:
http://svn.apache.org/viewvc/labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/comparator/CharComparatorTest.java?rev=1463114&r1=1463113&r2=1463114&view=diff
==============================================================================
---
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/comparator/CharComparatorTest.java
(original)
+++
labs/mavibot/branches/mavibot-multivalue-support/mavibot/src/test/java/org/apache/mavibot/btree/comparator/CharComparatorTest.java
Mon Apr 1 09:11:44 2013
@@ -41,8 +41,8 @@ public class CharComparatorTest
assertEquals( 0, comparator.compare( 'a', 'a' ) );
assertEquals( 0, comparator.compare( 'é', 'é' ) );
assertEquals( 1, comparator.compare( 'a', null ) );
- assertEquals( -32, comparator.compare( 'A', 'a' ) );
- assertEquals( 32, comparator.compare( 'a', 'A' ) );
+ assertEquals( -1, comparator.compare( 'A', 'a' ) );
+ assertEquals( 1, comparator.compare( 'a', 'A' ) );
assertEquals( -1, comparator.compare( null, 'a' ) );
assertEquals( -1, comparator.compare( 'a', 'b' ) );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
