Author: apurtell
Date: Sun Oct 18 16:30:00 2009
New Revision: 826467
URL: http://svn.apache.org/viewvc?rev=826467&view=rev
Log:
HBASE-1912 When adding a secondary index to an existing table, it will cause
NPE during re-indexing
Modified:
hadoop/hbase/branches/0.20/CHANGES.txt
hadoop/hbase/branches/0.20/src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexSpecification.java
Modified: hadoop/hbase/branches/0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=826467&r1=826466&r2=826467&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20/CHANGES.txt Sun Oct 18 16:30:00 2009
@@ -8,6 +8,9 @@
HBASE-1906 FilterList of prefix and columnvalue not working properly
with deletes and multiple values
HBASE-1896 WhileMatchFilter.reset should call encapsulated filter reset
+ HBASE-1912 When adding a secondary index to an existing table, it will
+ cause NPE during re-indexing (Mingjui Ray Liao via Andrew
+ Purtell)
IMPROVEMENTS
HBASE-1899 Use scanner caching in shell count
Modified:
hadoop/hbase/branches/0.20/src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexSpecification.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexSpecification.java?rev=826467&r1=826466&r2=826467&view=diff
==============================================================================
---
hadoop/hbase/branches/0.20/src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexSpecification.java
(original)
+++
hadoop/hbase/branches/0.20/src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexSpecification.java
Sun Oct 18 16:30:00 2009
@@ -68,9 +68,10 @@
byte[][] additionalColumns, IndexKeyGenerator keyGenerator) {
this.indexId = indexId;
this.indexedColumns = indexedColumns;
- this.additionalColumns = additionalColumns;
this.keyGenerator = keyGenerator;
this.makeAllColumns();
+ this.additionalColumns = (additionalColumns == null)? new byte[0][0] :
+ additionalColumns;
}
public IndexSpecification() {
