You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2009/10/18 18:31:27 UTC

svn commit: r826468 - in /hadoop/hbase/trunk: CHANGES.txt src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexSpecification.java

Author: apurtell
Date: Sun Oct 18 16:31:26 2009
New Revision: 826468

URL: http://svn.apache.org/viewvc?rev=826468&view=rev
Log:
HBASE-1912  When adding a secondary index to an existing table, it will cause NPE during re-indexing

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexSpecification.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=826468&r1=826467&r2=826468&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Sun Oct 18 16:31:26 2009
@@ -68,6 +68,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-1760  Cleanup TODOs in HTable

Modified: hadoop/hbase/trunk/src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexSpecification.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexSpecification.java?rev=826468&r1=826467&r2=826468&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexSpecification.java (original)
+++ hadoop/hbase/trunk/src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexSpecification.java Sun Oct 18 16:31:26 2009
@@ -78,9 +78,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() {