incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [6/50] [abbrv] More old objects are gone.
Date Wed, 07 Nov 2012 02:26:54 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c715774a/interface/gen-perl/Blur/Types.pm
----------------------------------------------------------------------
diff --git a/interface/gen-perl/Blur/Types.pm b/interface/gen-perl/Blur/Types.pm
index ff697a6..40ab62f 100644
--- a/interface/gen-perl/Blur/Types.pm
+++ b/interface/gen-perl/Blur/Types.pm
@@ -17,15 +17,6 @@ package Blur::QueryState;
 use constant RUNNING => 0;
 use constant INTERRUPTED => 1;
 use constant COMPLETE => 2;
-package Blur::RowMutationType;
-use constant DELETE_ROW => 0;
-use constant REPLACE_ROW => 1;
-use constant UPDATE_ROW => 2;
-package Blur::RecordMutationType;
-use constant DELETE_ENTIRE_RECORD => 0;
-use constant REPLACE_ENTIRE_RECORD => 1;
-use constant REPLACE_COLUMNS => 2;
-use constant APPEND_COLUMN_VALUES => 3;
 package Blur::TYPE;
 use constant STRING => 0;
 use constant INT => 1;
@@ -126,317 +117,6 @@ sub write {
   return $xfer;
 }
 
-package Blur::Column;
-use base qw(Class::Accessor);
-Blur::Column->mk_accessors( qw( name value ) );
-
-sub new {
-  my $classname = shift;
-  my $self      = {};
-  my $vals      = shift || {};
-  $self->{name} = undef;
-  $self->{value} = undef;
-  if (UNIVERSAL::isa($vals,'HASH')) {
-    if (defined $vals->{name}) {
-      $self->{name} = $vals->{name};
-    }
-    if (defined $vals->{value}) {
-      $self->{value} = $vals->{value};
-    }
-  }
-  return bless ($self, $classname);
-}
-
-sub getName {
-  return 'Column';
-}
-
-sub read {
-  my ($self, $input) = @_;
-  my $xfer  = 0;
-  my $fname;
-  my $ftype = 0;
-  my $fid   = 0;
-  $xfer += $input->readStructBegin(\$fname);
-  while (1) 
-  {
-    $xfer += $input->readFieldBegin(\$fname, \$ftype, \$fid);
-    if ($ftype == TType::STOP) {
-      last;
-    }
-    SWITCH: for($fid)
-    {
-      /^1$/ && do{      if ($ftype == TType::STRING) {
-        $xfer += $input->readString(\$self->{name});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^2$/ && do{      if ($ftype == TType::STRING) {
-        $xfer += $input->readString(\$self->{value});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-        $xfer += $input->skip($ftype);
-    }
-    $xfer += $input->readFieldEnd();
-  }
-  $xfer += $input->readStructEnd();
-  return $xfer;
-}
-
-sub write {
-  my ($self, $output) = @_;
-  my $xfer   = 0;
-  $xfer += $output->writeStructBegin('Column');
-  if (defined $self->{name}) {
-    $xfer += $output->writeFieldBegin('name', TType::STRING, 1);
-    $xfer += $output->writeString($self->{name});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{value}) {
-    $xfer += $output->writeFieldBegin('value', TType::STRING, 2);
-    $xfer += $output->writeString($self->{value});
-    $xfer += $output->writeFieldEnd();
-  }
-  $xfer += $output->writeFieldStop();
-  $xfer += $output->writeStructEnd();
-  return $xfer;
-}
-
-package Blur::Record;
-use base qw(Class::Accessor);
-Blur::Record->mk_accessors( qw( recordId family columns ) );
-
-sub new {
-  my $classname = shift;
-  my $self      = {};
-  my $vals      = shift || {};
-  $self->{recordId} = undef;
-  $self->{family} = undef;
-  $self->{columns} = undef;
-  if (UNIVERSAL::isa($vals,'HASH')) {
-    if (defined $vals->{recordId}) {
-      $self->{recordId} = $vals->{recordId};
-    }
-    if (defined $vals->{family}) {
-      $self->{family} = $vals->{family};
-    }
-    if (defined $vals->{columns}) {
-      $self->{columns} = $vals->{columns};
-    }
-  }
-  return bless ($self, $classname);
-}
-
-sub getName {
-  return 'Record';
-}
-
-sub read {
-  my ($self, $input) = @_;
-  my $xfer  = 0;
-  my $fname;
-  my $ftype = 0;
-  my $fid   = 0;
-  $xfer += $input->readStructBegin(\$fname);
-  while (1) 
-  {
-    $xfer += $input->readFieldBegin(\$fname, \$ftype, \$fid);
-    if ($ftype == TType::STOP) {
-      last;
-    }
-    SWITCH: for($fid)
-    {
-      /^1$/ && do{      if ($ftype == TType::STRING) {
-        $xfer += $input->readString(\$self->{recordId});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^2$/ && do{      if ($ftype == TType::STRING) {
-        $xfer += $input->readString(\$self->{family});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^3$/ && do{      if ($ftype == TType::LIST) {
-        {
-          my $_size0 = 0;
-          $self->{columns} = [];
-          my $_etype3 = 0;
-          $xfer += $input->readListBegin(\$_etype3, \$_size0);
-          for (my $_i4 = 0; $_i4 < $_size0; ++$_i4)
-          {
-            my $elem5 = undef;
-            $elem5 = new Blur::Column();
-            $xfer += $elem5->read($input);
-            push(@{$self->{columns}},$elem5);
-          }
-          $xfer += $input->readListEnd();
-        }
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-        $xfer += $input->skip($ftype);
-    }
-    $xfer += $input->readFieldEnd();
-  }
-  $xfer += $input->readStructEnd();
-  return $xfer;
-}
-
-sub write {
-  my ($self, $output) = @_;
-  my $xfer   = 0;
-  $xfer += $output->writeStructBegin('Record');
-  if (defined $self->{recordId}) {
-    $xfer += $output->writeFieldBegin('recordId', TType::STRING, 1);
-    $xfer += $output->writeString($self->{recordId});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{family}) {
-    $xfer += $output->writeFieldBegin('family', TType::STRING, 2);
-    $xfer += $output->writeString($self->{family});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{columns}) {
-    $xfer += $output->writeFieldBegin('columns', TType::LIST, 3);
-    {
-      $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{columns}}));
-      {
-        foreach my $iter6 (@{$self->{columns}}) 
-        {
-          $xfer += ${iter6}->write($output);
-        }
-      }
-      $xfer += $output->writeListEnd();
-    }
-    $xfer += $output->writeFieldEnd();
-  }
-  $xfer += $output->writeFieldStop();
-  $xfer += $output->writeStructEnd();
-  return $xfer;
-}
-
-package Blur::Row;
-use base qw(Class::Accessor);
-Blur::Row->mk_accessors( qw( id records recordCount ) );
-
-sub new {
-  my $classname = shift;
-  my $self      = {};
-  my $vals      = shift || {};
-  $self->{id} = undef;
-  $self->{records} = undef;
-  $self->{recordCount} = undef;
-  if (UNIVERSAL::isa($vals,'HASH')) {
-    if (defined $vals->{id}) {
-      $self->{id} = $vals->{id};
-    }
-    if (defined $vals->{records}) {
-      $self->{records} = $vals->{records};
-    }
-    if (defined $vals->{recordCount}) {
-      $self->{recordCount} = $vals->{recordCount};
-    }
-  }
-  return bless ($self, $classname);
-}
-
-sub getName {
-  return 'Row';
-}
-
-sub read {
-  my ($self, $input) = @_;
-  my $xfer  = 0;
-  my $fname;
-  my $ftype = 0;
-  my $fid   = 0;
-  $xfer += $input->readStructBegin(\$fname);
-  while (1) 
-  {
-    $xfer += $input->readFieldBegin(\$fname, \$ftype, \$fid);
-    if ($ftype == TType::STOP) {
-      last;
-    }
-    SWITCH: for($fid)
-    {
-      /^1$/ && do{      if ($ftype == TType::STRING) {
-        $xfer += $input->readString(\$self->{id});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^2$/ && do{      if ($ftype == TType::LIST) {
-        {
-          my $_size7 = 0;
-          $self->{records} = [];
-          my $_etype10 = 0;
-          $xfer += $input->readListBegin(\$_etype10, \$_size7);
-          for (my $_i11 = 0; $_i11 < $_size7; ++$_i11)
-          {
-            my $elem12 = undef;
-            $elem12 = new Blur::Record();
-            $xfer += $elem12->read($input);
-            push(@{$self->{records}},$elem12);
-          }
-          $xfer += $input->readListEnd();
-        }
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^3$/ && do{      if ($ftype == TType::I32) {
-        $xfer += $input->readI32(\$self->{recordCount});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-        $xfer += $input->skip($ftype);
-    }
-    $xfer += $input->readFieldEnd();
-  }
-  $xfer += $input->readStructEnd();
-  return $xfer;
-}
-
-sub write {
-  my ($self, $output) = @_;
-  my $xfer   = 0;
-  $xfer += $output->writeStructBegin('Row');
-  if (defined $self->{id}) {
-    $xfer += $output->writeFieldBegin('id', TType::STRING, 1);
-    $xfer += $output->writeString($self->{id});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{records}) {
-    $xfer += $output->writeFieldBegin('records', TType::LIST, 2);
-    {
-      $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{records}}));
-      {
-        foreach my $iter13 (@{$self->{records}}) 
-        {
-          $xfer += ${iter13}->write($output);
-        }
-      }
-      $xfer += $output->writeListEnd();
-    }
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{recordCount}) {
-    $xfer += $output->writeFieldBegin('recordCount', TType::I32, 3);
-    $xfer += $output->writeI32($self->{recordCount});
-    $xfer += $output->writeFieldEnd();
-  }
-  $xfer += $output->writeFieldStop();
-  $xfer += $output->writeStructEnd();
-  return $xfer;
-}
-
 package Blur::Facet;
 use base qw(Class::Accessor);
 Blur::Facet->mk_accessors( qw( queryStr minimumNumberOfBlurResults ) );
@@ -649,19 +329,19 @@ sub read {
     {
       /^2$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size14 = 0;
+          my $_size0 = 0;
           $self->{cpuTimes} = {};
-          my $_ktype15 = 0;
-          my $_vtype16 = 0;
-          $xfer += $input->readMapBegin(\$_ktype15, \$_vtype16, \$_size14);
-          for (my $_i18 = 0; $_i18 < $_size14; ++$_i18)
+          my $_ktype1 = 0;
+          my $_vtype2 = 0;
+          $xfer += $input->readMapBegin(\$_ktype1, \$_vtype2, \$_size0);
+          for (my $_i4 = 0; $_i4 < $_size0; ++$_i4)
           {
-            my $key19 = '';
-            my $val20 = new Blur::CpuTime();
-            $xfer += $input->readString(\$key19);
-            $val20 = new Blur::CpuTime();
-            $xfer += $val20->read($input);
-            $self->{cpuTimes}->{$key19} = $val20;
+            my $key5 = '';
+            my $val6 = new Blur::CpuTime();
+            $xfer += $input->readString(\$key5);
+            $val6 = new Blur::CpuTime();
+            $xfer += $val6->read($input);
+            $self->{cpuTimes}->{$key5} = $val6;
           }
           $xfer += $input->readMapEnd();
         }
@@ -710,10 +390,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRUCT, scalar(keys %{$self->{cpuTimes}}));
       {
-        while( my ($kiter21,$viter22) = each %{$self->{cpuTimes}}) 
+        while( my ($kiter7,$viter8) = each %{$self->{cpuTimes}}) 
         {
-          $xfer += $output->writeString($kiter21);
-          $xfer += ${viter22}->write($output);
+          $xfer += $output->writeString($kiter7);
+          $xfer += ${viter8}->write($output);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -917,30 +597,30 @@ sub read {
       last; };
       /^2$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size23 = 0;
+          my $_size9 = 0;
           $self->{columnFamilies} = {};
-          my $_ktype24 = 0;
-          my $_vtype25 = 0;
-          $xfer += $input->readMapBegin(\$_ktype24, \$_vtype25, \$_size23);
-          for (my $_i27 = 0; $_i27 < $_size23; ++$_i27)
+          my $_ktype10 = 0;
+          my $_vtype11 = 0;
+          $xfer += $input->readMapBegin(\$_ktype10, \$_vtype11, \$_size9);
+          for (my $_i13 = 0; $_i13 < $_size9; ++$_i13)
           {
-            my $key28 = '';
-            my $val29 = [];
-            $xfer += $input->readString(\$key28);
+            my $key14 = '';
+            my $val15 = [];
+            $xfer += $input->readString(\$key14);
             {
-              my $_size30 = 0;
-              $val29 = {};
-              my $_etype33 = 0;
-              $xfer += $input->readSetBegin(\$_etype33, \$_size30);
-              for (my $_i34 = 0; $_i34 < $_size30; ++$_i34)
+              my $_size16 = 0;
+              $val15 = {};
+              my $_etype19 = 0;
+              $xfer += $input->readSetBegin(\$_etype19, \$_size16);
+              for (my $_i20 = 0; $_i20 < $_size16; ++$_i20)
               {
-                my $elem35 = undef;
-                $xfer += $input->readString(\$elem35);
-                $val29->{$elem35} = 1;
+                my $elem21 = undef;
+                $xfer += $input->readString(\$elem21);
+                $val15->{$elem21} = 1;
               }
               $xfer += $input->readSetEnd();
             }
-            $self->{columnFamilies}->{$key28} = $val29;
+            $self->{columnFamilies}->{$key14} = $val15;
           }
           $xfer += $input->readMapEnd();
         }
@@ -970,15 +650,15 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::SET, scalar(keys %{$self->{columnFamilies}}));
       {
-        while( my ($kiter36,$viter37) = each %{$self->{columnFamilies}}) 
+        while( my ($kiter22,$viter23) = each %{$self->{columnFamilies}}) 
         {
-          $xfer += $output->writeString($kiter36);
+          $xfer += $output->writeString($kiter22);
           {
-            $xfer += $output->writeSetBegin(TType::STRING, scalar(@{${viter37}}));
+            $xfer += $output->writeSetBegin(TType::STRING, scalar(@{${viter23}}));
             {
-              foreach my $iter38 (@{${viter37}})
+              foreach my $iter24 (@{${viter23}})
               {
-                $xfer += $output->writeString($iter38);
+                $xfer += $output->writeString($iter24);
               }
             }
             $xfer += $output->writeSetEnd();
@@ -1116,19 +796,19 @@ sub read {
       last; };
       /^3$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size39 = 0;
+          my $_size25 = 0;
           $self->{alternateColumnDefinitions} = {};
-          my $_ktype40 = 0;
-          my $_vtype41 = 0;
-          $xfer += $input->readMapBegin(\$_ktype40, \$_vtype41, \$_size39);
-          for (my $_i43 = 0; $_i43 < $_size39; ++$_i43)
+          my $_ktype26 = 0;
+          my $_vtype27 = 0;
+          $xfer += $input->readMapBegin(\$_ktype26, \$_vtype27, \$_size25);
+          for (my $_i29 = 0; $_i29 < $_size25; ++$_i29)
           {
-            my $key44 = '';
-            my $val45 = new Blur::AlternateColumnDefinition();
-            $xfer += $input->readString(\$key44);
-            $val45 = new Blur::AlternateColumnDefinition();
-            $xfer += $val45->read($input);
-            $self->{alternateColumnDefinitions}->{$key44} = $val45;
+            my $key30 = '';
+            my $val31 = new Blur::AlternateColumnDefinition();
+            $xfer += $input->readString(\$key30);
+            $val31 = new Blur::AlternateColumnDefinition();
+            $xfer += $val31->read($input);
+            $self->{alternateColumnDefinitions}->{$key30} = $val31;
           }
           $xfer += $input->readMapEnd();
         }
@@ -1163,10 +843,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRUCT, scalar(keys %{$self->{alternateColumnDefinitions}}));
       {
-        while( my ($kiter46,$viter47) = each %{$self->{alternateColumnDefinitions}}) 
+        while( my ($kiter32,$viter33) = each %{$self->{alternateColumnDefinitions}}) 
         {
-          $xfer += $output->writeString($kiter46);
-          $xfer += ${viter47}->write($output);
+          $xfer += $output->writeString($kiter32);
+          $xfer += ${viter33}->write($output);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -1227,19 +907,19 @@ sub read {
       last; };
       /^2$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size48 = 0;
+          my $_size34 = 0;
           $self->{columnDefinitions} = {};
-          my $_ktype49 = 0;
-          my $_vtype50 = 0;
-          $xfer += $input->readMapBegin(\$_ktype49, \$_vtype50, \$_size48);
-          for (my $_i52 = 0; $_i52 < $_size48; ++$_i52)
+          my $_ktype35 = 0;
+          my $_vtype36 = 0;
+          $xfer += $input->readMapBegin(\$_ktype35, \$_vtype36, \$_size34);
+          for (my $_i38 = 0; $_i38 < $_size34; ++$_i38)
           {
-            my $key53 = '';
-            my $val54 = new Blur::ColumnDefinition();
-            $xfer += $input->readString(\$key53);
-            $val54 = new Blur::ColumnDefinition();
-            $xfer += $val54->read($input);
-            $self->{columnDefinitions}->{$key53} = $val54;
+            my $key39 = '';
+            my $val40 = new Blur::ColumnDefinition();
+            $xfer += $input->readString(\$key39);
+            $val40 = new Blur::ColumnDefinition();
+            $xfer += $val40->read($input);
+            $self->{columnDefinitions}->{$key39} = $val40;
           }
           $xfer += $input->readMapEnd();
         }
@@ -1269,10 +949,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRUCT, scalar(keys %{$self->{columnDefinitions}}));
       {
-        while( my ($kiter55,$viter56) = each %{$self->{columnDefinitions}}) 
+        while( my ($kiter41,$viter42) = each %{$self->{columnDefinitions}}) 
         {
-          $xfer += $output->writeString($kiter55);
-          $xfer += ${viter56}->write($output);
+          $xfer += $output->writeString($kiter41);
+          $xfer += ${viter42}->write($output);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -1343,19 +1023,19 @@ sub read {
       last; };
       /^3$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size57 = 0;
+          my $_size43 = 0;
           $self->{columnFamilyDefinitions} = {};
-          my $_ktype58 = 0;
-          my $_vtype59 = 0;
-          $xfer += $input->readMapBegin(\$_ktype58, \$_vtype59, \$_size57);
-          for (my $_i61 = 0; $_i61 < $_size57; ++$_i61)
+          my $_ktype44 = 0;
+          my $_vtype45 = 0;
+          $xfer += $input->readMapBegin(\$_ktype44, \$_vtype45, \$_size43);
+          for (my $_i47 = 0; $_i47 < $_size43; ++$_i47)
           {
-            my $key62 = '';
-            my $val63 = new Blur::ColumnFamilyDefinition();
-            $xfer += $input->readString(\$key62);
-            $val63 = new Blur::ColumnFamilyDefinition();
-            $xfer += $val63->read($input);
-            $self->{columnFamilyDefinitions}->{$key62} = $val63;
+            my $key48 = '';
+            my $val49 = new Blur::ColumnFamilyDefinition();
+            $xfer += $input->readString(\$key48);
+            $val49 = new Blur::ColumnFamilyDefinition();
+            $xfer += $val49->read($input);
+            $self->{columnFamilyDefinitions}->{$key48} = $val49;
           }
           $xfer += $input->readMapEnd();
         }
@@ -1390,10 +1070,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRUCT, scalar(keys %{$self->{columnFamilyDefinitions}}));
       {
-        while( my ($kiter64,$viter65) = each %{$self->{columnFamilyDefinitions}}) 
+        while( my ($kiter50,$viter51) = each %{$self->{columnFamilyDefinitions}}) 
         {
-          $xfer += $output->writeString($kiter64);
-          $xfer += ${viter65}->write($output);
+          $xfer += $output->writeString($kiter50);
+          $xfer += ${viter51}->write($output);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -1443,15 +1123,15 @@ sub read {
     {
       /^1$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size66 = 0;
+          my $_size52 = 0;
           $self->{preCacheCols} = [];
-          my $_etype69 = 0;
-          $xfer += $input->readListBegin(\$_etype69, \$_size66);
-          for (my $_i70 = 0; $_i70 < $_size66; ++$_i70)
+          my $_etype55 = 0;
+          $xfer += $input->readListBegin(\$_etype55, \$_size52);
+          for (my $_i56 = 0; $_i56 < $_size52; ++$_i56)
           {
-            my $elem71 = undef;
-            $xfer += $input->readString(\$elem71);
-            push(@{$self->{preCacheCols}},$elem71);
+            my $elem57 = undef;
+            $xfer += $input->readString(\$elem57);
+            push(@{$self->{preCacheCols}},$elem57);
           }
           $xfer += $input->readListEnd();
         }
@@ -1476,9 +1156,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRING, scalar(@{$self->{preCacheCols}}));
       {
-        foreach my $iter72 (@{$self->{preCacheCols}}) 
+        foreach my $iter58 (@{$self->{preCacheCols}}) 
         {
-          $xfer += $output->writeString($iter72);
+          $xfer += $output->writeString($iter58);
         }
       }
       $xfer += $output->writeListEnd();
@@ -1637,15 +1317,15 @@ sub read {
       last; };
       /^11$/ && do{      if ($ftype == TType::SET) {
         {
-          my $_size73 = 0;
+          my $_size59 = 0;
           $self->{blockCachingFileTypes} = {};
-          my $_etype76 = 0;
-          $xfer += $input->readSetBegin(\$_etype76, \$_size73);
-          for (my $_i77 = 0; $_i77 < $_size73; ++$_i77)
+          my $_etype62 = 0;
+          $xfer += $input->readSetBegin(\$_etype62, \$_size59);
+          for (my $_i63 = 0; $_i63 < $_size59; ++$_i63)
           {
-            my $elem78 = undef;
-            $xfer += $input->readString(\$elem78);
-            $self->{blockCachingFileTypes}->{$elem78} = 1;
+            my $elem64 = undef;
+            $xfer += $input->readString(\$elem64);
+            $self->{blockCachingFileTypes}->{$elem64} = 1;
           }
           $xfer += $input->readSetEnd();
         }
@@ -1733,9 +1413,9 @@ sub write {
     {
       $xfer += $output->writeSetBegin(TType::STRING, scalar(@{$self->{blockCachingFileTypes}}));
       {
-        foreach my $iter79 (@{$self->{blockCachingFileTypes}})
+        foreach my $iter65 (@{$self->{blockCachingFileTypes}})
         {
-          $xfer += $output->writeString($iter79);
+          $xfer += $output->writeString($iter65);
         }
       }
       $xfer += $output->writeSetEnd();
@@ -1899,18 +1579,18 @@ sub read {
       last; };
       /^2$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size80 = 0;
+          my $_size66 = 0;
           $self->{properties} = {};
-          my $_ktype81 = 0;
-          my $_vtype82 = 0;
-          $xfer += $input->readMapBegin(\$_ktype81, \$_vtype82, \$_size80);
-          for (my $_i84 = 0; $_i84 < $_size80; ++$_i84)
+          my $_ktype67 = 0;
+          my $_vtype68 = 0;
+          $xfer += $input->readMapBegin(\$_ktype67, \$_vtype68, \$_size66);
+          for (my $_i70 = 0; $_i70 < $_size66; ++$_i70)
           {
-            my $key85 = '';
-            my $val86 = '';
-            $xfer += $input->readString(\$key85);
-            $xfer += $input->readString(\$val86);
-            $self->{properties}->{$key85} = $val86;
+            my $key71 = '';
+            my $val72 = '';
+            $xfer += $input->readString(\$key71);
+            $xfer += $input->readString(\$val72);
+            $self->{properties}->{$key71} = $val72;
           }
           $xfer += $input->readMapEnd();
         }
@@ -1940,10 +1620,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRING, scalar(keys %{$self->{properties}}));
       {
-        while( my ($kiter87,$viter88) = each %{$self->{properties}}) 
+        while( my ($kiter73,$viter74) = each %{$self->{properties}}) 
         {
-          $xfer += $output->writeString($kiter87);
-          $xfer += $output->writeString($viter88);
+          $xfer += $output->writeString($kiter73);
+          $xfer += $output->writeString($viter74);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -2167,16 +1847,16 @@ sub read {
     {
       /^1$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size89 = 0;
+          my $_size75 = 0;
           $self->{fields} = [];
-          my $_etype92 = 0;
-          $xfer += $input->readListBegin(\$_etype92, \$_size89);
-          for (my $_i93 = 0; $_i93 < $_size89; ++$_i93)
+          my $_etype78 = 0;
+          $xfer += $input->readListBegin(\$_etype78, \$_size75);
+          for (my $_i79 = 0; $_i79 < $_size75; ++$_i79)
           {
-            my $elem94 = undef;
-            $elem94 = new Blur::SortField();
-            $xfer += $elem94->read($input);
-            push(@{$self->{fields}},$elem94);
+            my $elem80 = undef;
+            $elem80 = new Blur::SortField();
+            $xfer += $elem80->read($input);
+            push(@{$self->{fields}},$elem80);
           }
           $xfer += $input->readListEnd();
         }
@@ -2201,9 +1881,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{fields}}));
       {
-        foreach my $iter95 (@{$self->{fields}}) 
+        foreach my $iter81 (@{$self->{fields}}) 
         {
-          $xfer += ${iter95}->write($output);
+          $xfer += ${iter81}->write($output);
         }
       }
       $xfer += $output->writeListEnd();
@@ -2353,15 +2033,15 @@ sub read {
       last; };
       /^4$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size96 = 0;
+          my $_size82 = 0;
           $self->{fields} = [];
-          my $_etype99 = 0;
-          $xfer += $input->readListBegin(\$_etype99, \$_size96);
-          for (my $_i100 = 0; $_i100 < $_size96; ++$_i100)
+          my $_etype85 = 0;
+          $xfer += $input->readListBegin(\$_etype85, \$_size82);
+          for (my $_i86 = 0; $_i86 < $_size82; ++$_i86)
           {
-            my $elem101 = undef;
-            $xfer += $input->readString(\$elem101);
-            push(@{$self->{fields}},$elem101);
+            my $elem87 = undef;
+            $xfer += $input->readString(\$elem87);
+            push(@{$self->{fields}},$elem87);
           }
           $xfer += $input->readListEnd();
         }
@@ -2396,9 +2076,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRING, scalar(@{$self->{fields}}));
       {
-        foreach my $iter102 (@{$self->{fields}}) 
+        foreach my $iter88 (@{$self->{fields}}) 
         {
-          $xfer += $output->writeString($iter102);
+          $xfer += $output->writeString($iter88);
         }
       }
       $xfer += $output->writeListEnd();
@@ -2520,15 +2200,15 @@ sub read {
       last; };
       /^8$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size103 = 0;
+          my $_size89 = 0;
           $self->{shardIndexes} = [];
-          my $_etype106 = 0;
-          $xfer += $input->readListBegin(\$_etype106, \$_size103);
-          for (my $_i107 = 0; $_i107 < $_size103; ++$_i107)
+          my $_etype92 = 0;
+          $xfer += $input->readListBegin(\$_etype92, \$_size89);
+          for (my $_i93 = 0; $_i93 < $_size89; ++$_i93)
           {
-            my $elem108 = undef;
-            $xfer += $input->readI32(\$elem108);
-            push(@{$self->{shardIndexes}},$elem108);
+            my $elem94 = undef;
+            $xfer += $input->readI32(\$elem94);
+            push(@{$self->{shardIndexes}},$elem94);
           }
           $xfer += $input->readListEnd();
         }
@@ -2588,9 +2268,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::I32, scalar(@{$self->{shardIndexes}}));
       {
-        foreach my $iter109 (@{$self->{shardIndexes}}) 
+        foreach my $iter95 (@{$self->{shardIndexes}}) 
         {
-          $xfer += $output->writeI32($iter109);
+          $xfer += $output->writeI32($iter95);
         }
       }
       $xfer += $output->writeListEnd();
@@ -2668,16 +2348,16 @@ sub read {
       last; };
       /^3$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size110 = 0;
+          my $_size96 = 0;
           $self->{scoreDocs} = [];
-          my $_etype113 = 0;
-          $xfer += $input->readListBegin(\$_etype113, \$_size110);
-          for (my $_i114 = 0; $_i114 < $_size110; ++$_i114)
+          my $_etype99 = 0;
+          $xfer += $input->readListBegin(\$_etype99, \$_size96);
+          for (my $_i100 = 0; $_i100 < $_size96; ++$_i100)
           {
-            my $elem115 = undef;
-            $elem115 = new Blur::ScoreDoc();
-            $xfer += $elem115->read($input);
-            push(@{$self->{scoreDocs}},$elem115);
+            my $elem101 = undef;
+            $elem101 = new Blur::ScoreDoc();
+            $xfer += $elem101->read($input);
+            push(@{$self->{scoreDocs}},$elem101);
           }
           $xfer += $input->readListEnd();
         }
@@ -2693,16 +2373,16 @@ sub read {
       last; };
       /^5$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size116 = 0;
+          my $_size102 = 0;
           $self->{fields} = [];
-          my $_etype119 = 0;
-          $xfer += $input->readListBegin(\$_etype119, \$_size116);
-          for (my $_i120 = 0; $_i120 < $_size116; ++$_i120)
+          my $_etype105 = 0;
+          $xfer += $input->readListBegin(\$_etype105, \$_size102);
+          for (my $_i106 = 0; $_i106 < $_size102; ++$_i106)
           {
-            my $elem121 = undef;
-            $elem121 = new Blur::SortField();
-            $xfer += $elem121->read($input);
-            push(@{$self->{fields}},$elem121);
+            my $elem107 = undef;
+            $elem107 = new Blur::SortField();
+            $xfer += $elem107->read($input);
+            push(@{$self->{fields}},$elem107);
           }
           $xfer += $input->readListEnd();
         }
@@ -2737,9 +2417,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{scoreDocs}}));
       {
-        foreach my $iter122 (@{$self->{scoreDocs}}) 
+        foreach my $iter108 (@{$self->{scoreDocs}}) 
         {
-          $xfer += ${iter122}->write($output);
+          $xfer += ${iter108}->write($output);
         }
       }
       $xfer += $output->writeListEnd();
@@ -2756,9 +2436,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{fields}}));
       {
-        foreach my $iter123 (@{$self->{fields}}) 
+        foreach my $iter109 (@{$self->{fields}}) 
         {
-          $xfer += ${iter123}->write($output);
+          $xfer += ${iter109}->write($output);
         }
       }
       $xfer += $output->writeListEnd();
@@ -2917,16 +2597,16 @@ sub read {
     {
       /^1$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size124 = 0;
+          my $_size110 = 0;
           $self->{fields} = [];
-          my $_etype127 = 0;
-          $xfer += $input->readListBegin(\$_etype127, \$_size124);
-          for (my $_i128 = 0; $_i128 < $_size124; ++$_i128)
+          my $_etype113 = 0;
+          $xfer += $input->readListBegin(\$_etype113, \$_size110);
+          for (my $_i114 = 0; $_i114 < $_size110; ++$_i114)
           {
-            my $elem129 = undef;
-            $elem129 = new Blur::Field();
-            $xfer += $elem129->read($input);
-            push(@{$self->{fields}},$elem129);
+            my $elem115 = undef;
+            $elem115 = new Blur::Field();
+            $xfer += $elem115->read($input);
+            push(@{$self->{fields}},$elem115);
           }
           $xfer += $input->readListEnd();
         }
@@ -2951,9 +2631,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{fields}}));
       {
-        foreach my $iter130 (@{$self->{fields}}) 
+        foreach my $iter116 (@{$self->{fields}}) 
         {
-          $xfer += ${iter130}->write($output);
+          $xfer += ${iter116}->write($output);
         }
       }
       $xfer += $output->writeListEnd();
@@ -3202,16 +2882,16 @@ sub read {
       last; };
       /^2$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size131 = 0;
+          my $_size117 = 0;
           $self->{documents} = [];
-          my $_etype134 = 0;
-          $xfer += $input->readListBegin(\$_etype134, \$_size131);
-          for (my $_i135 = 0; $_i135 < $_size131; ++$_i135)
+          my $_etype120 = 0;
+          $xfer += $input->readListBegin(\$_etype120, \$_size117);
+          for (my $_i121 = 0; $_i121 < $_size117; ++$_i121)
           {
-            my $elem136 = undef;
-            $elem136 = new Blur::Document();
-            $xfer += $elem136->read($input);
-            push(@{$self->{documents}},$elem136);
+            my $elem122 = undef;
+            $elem122 = new Blur::Document();
+            $xfer += $elem122->read($input);
+            push(@{$self->{documents}},$elem122);
           }
           $xfer += $input->readListEnd();
         }
@@ -3241,9 +2921,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{documents}}));
       {
-        foreach my $iter137 (@{$self->{documents}}) 
+        foreach my $iter123 (@{$self->{documents}}) 
         {
-          $xfer += ${iter137}->write($output);
+          $xfer += ${iter123}->write($output);
         }
       }
       $xfer += $output->writeListEnd();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c715774a/interface/gen-rb/blur_types.rb
----------------------------------------------------------------------
diff --git a/interface/gen-rb/blur_types.rb b/interface/gen-rb/blur_types.rb
index 2c0d5b0..91d23c7 100644
--- a/interface/gen-rb/blur_types.rb
+++ b/interface/gen-rb/blur_types.rb
@@ -24,23 +24,6 @@ module Blur
     VALID_VALUES = Set.new([RUNNING, INTERRUPTED, COMPLETE]).freeze
   end
 
-  module RowMutationType
-    DELETE_ROW = 0
-    REPLACE_ROW = 1
-    UPDATE_ROW = 2
-    VALUE_MAP = {0 => "DELETE_ROW", 1 => "REPLACE_ROW", 2 => "UPDATE_ROW"}
-    VALID_VALUES = Set.new([DELETE_ROW, REPLACE_ROW, UPDATE_ROW]).freeze
-  end
-
-  module RecordMutationType
-    DELETE_ENTIRE_RECORD = 0
-    REPLACE_ENTIRE_RECORD = 1
-    REPLACE_COLUMNS = 2
-    APPEND_COLUMN_VALUES = 3
-    VALUE_MAP = {0 => "DELETE_ENTIRE_RECORD", 1 => "REPLACE_ENTIRE_RECORD", 2 => "REPLACE_COLUMNS", 3 => "APPEND_COLUMN_VALUES"}
-    VALID_VALUES = Set.new([DELETE_ENTIRE_RECORD, REPLACE_ENTIRE_RECORD, REPLACE_COLUMNS, APPEND_COLUMN_VALUES]).freeze
-  end
-
   module TYPE
     STRING = 0
     INT = 1
@@ -114,77 +97,6 @@ module Blur
     ::Thrift::Struct.generate_accessors self
   end
 
-  # Column is the lowest storage element in Blur, it stores a single name and value pair.
-  class Column
-    include ::Thrift::Struct, ::Thrift::Struct_Union
-    NAME = 1
-    VALUE = 2
-
-    FIELDS = {
-      # The name of the column.
-      NAME => {:type => ::Thrift::Types::STRING, :name => 'name'},
-      # The value to be indexed and stored.
-      VALUE => {:type => ::Thrift::Types::STRING, :name => 'value'}
-    }
-
-    def struct_fields; FIELDS; end
-
-    def validate
-    end
-
-    ::Thrift::Struct.generate_accessors self
-  end
-
-  # Records contain a list of columns, multiple columns with the same name are allowed.
-  class Record
-    include ::Thrift::Struct, ::Thrift::Struct_Union
-    RECORDID = 1
-    FAMILY = 2
-    COLUMNS = 3
-
-    FIELDS = {
-      # Record id uniquely identifies a record within a single row.
-      RECORDID => {:type => ::Thrift::Types::STRING, :name => 'recordId'},
-      # The family in which this record resides.
-      FAMILY => {:type => ::Thrift::Types::STRING, :name => 'family'},
-      # A list of columns, multiple columns with the same name are allowed.
-      COLUMNS => {:type => ::Thrift::Types::LIST, :name => 'columns', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Blur::Column}}
-    }
-
-    def struct_fields; FIELDS; end
-
-    def validate
-    end
-
-    ::Thrift::Struct.generate_accessors self
-  end
-
-  # Rows contain a list of records.
-  class Row
-    include ::Thrift::Struct, ::Thrift::Struct_Union
-    ID = 1
-    RECORDS = 2
-    RECORDCOUNT = 3
-
-    FIELDS = {
-      # The row id.
-      ID => {:type => ::Thrift::Types::STRING, :name => 'id'},
-      # The list records within the row.  If paging is used this list will only
-# reflect the paged records from the selector.
-      RECORDS => {:type => ::Thrift::Types::LIST, :name => 'records', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Blur::Record}},
-      # The total record count for the row.  If paging is used in a selector to page
-# through records of a row, this count will reflect the entire row.
-      RECORDCOUNT => {:type => ::Thrift::Types::I32, :name => 'recordCount'}
-    }
-
-    def struct_fields; FIELDS; end
-
-    def validate
-    end
-
-    ::Thrift::Struct.generate_accessors self
-  end
-
   # Blur facet.
   class Facet
     include ::Thrift::Struct, ::Thrift::Struct_Union

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c715774a/src/blur-core/src/main/java/org/apache/blur/manager/writer/BlurIndex.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/writer/BlurIndex.java b/src/blur-core/src/main/java/org/apache/blur/manager/writer/BlurIndex.java
index 39faa4e..ed54de6 100644
--- a/src/blur-core/src/main/java/org/apache/blur/manager/writer/BlurIndex.java
+++ b/src/blur-core/src/main/java/org/apache/blur/manager/writer/BlurIndex.java
@@ -22,25 +22,16 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.blur.thrift.generated.Document;
-import org.apache.blur.thrift.generated.Row;
 import org.apache.blur.thrift.generated.Term;
 import org.apache.blur.thrift.generated.UpdatePackage;
 import org.apache.lucene.index.IndexReader;
 
 public abstract class BlurIndex {
 
-  public abstract void replaceRow(boolean waitToBeVisible, boolean wal, Row row) throws IOException;
-
-  public abstract void deleteRow(boolean waitToBeVisible, boolean wal, String rowId) throws IOException;
-
   public abstract IndexReader getIndexReader() throws IOException;
-
   public abstract void close() throws IOException;
-
   public abstract void refresh() throws IOException;
-
   public abstract AtomicBoolean isClosed();
-
   public abstract void optimize(int numberOfSegmentsPerShard) throws IOException;
 
   public abstract void addDocuments(boolean waitToBeVisible, boolean wal, List<Document> documents) throws IOException;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c715774a/src/blur-core/src/main/java/org/apache/blur/manager/writer/BlurIndexReader.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/writer/BlurIndexReader.java b/src/blur-core/src/main/java/org/apache/blur/manager/writer/BlurIndexReader.java
index ee40331..d10a3e5 100644
--- a/src/blur-core/src/main/java/org/apache/blur/manager/writer/BlurIndexReader.java
+++ b/src/blur-core/src/main/java/org/apache/blur/manager/writer/BlurIndexReader.java
@@ -26,7 +26,6 @@ import org.apache.blur.index.IndexWriter;
 import org.apache.blur.log.Log;
 import org.apache.blur.log.LogFactory;
 import org.apache.blur.thrift.generated.Document;
-import org.apache.blur.thrift.generated.Row;
 import org.apache.blur.thrift.generated.Term;
 import org.apache.blur.thrift.generated.UpdatePackage;
 import org.apache.lucene.analysis.core.KeywordAnalyzer;
@@ -61,16 +60,6 @@ public class BlurIndexReader extends AbstractBlurIndex {
   }
 
   @Override
-  public void replaceRow(boolean waitToBeVisible, boolean wal, Row row) throws IOException {
-    throw new RuntimeException("Read-only shard");
-  }
-
-  @Override
-  public void deleteRow(boolean waitToBeVisible, boolean wal, String rowId) throws IOException {
-    throw new RuntimeException("Read-only shard");
-  }
-
-  @Override
   public void optimize(int numberOfSegmentsPerShard) throws IOException {
     // Do nothing
   }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c715774a/src/blur-core/src/main/java/org/apache/blur/manager/writer/BlurNRTIndex.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/writer/BlurNRTIndex.java b/src/blur-core/src/main/java/org/apache/blur/manager/writer/BlurNRTIndex.java
index 4d6f6d5..bfa5314 100644
--- a/src/blur-core/src/main/java/org/apache/blur/manager/writer/BlurNRTIndex.java
+++ b/src/blur-core/src/main/java/org/apache/blur/manager/writer/BlurNRTIndex.java
@@ -32,8 +32,6 @@ import org.apache.blur.log.LogFactory;
 import org.apache.blur.lucene.store.refcounter.DirectoryReferenceCounter;
 import org.apache.blur.lucene.store.refcounter.DirectoryReferenceFileGC;
 import org.apache.blur.thrift.generated.Document;
-import org.apache.blur.thrift.generated.Record;
-import org.apache.blur.thrift.generated.Row;
 import org.apache.blur.thrift.generated.Term;
 import org.apache.blur.thrift.generated.UpdatePackage;
 import org.apache.hadoop.conf.Configuration;
@@ -154,16 +152,6 @@ public class BlurNRTIndex extends BlurIndex {
   }
 
   @Override
-  public void replaceRow(boolean waitToBeVisible, boolean wal, Row row) throws IOException {
-    throw new RuntimeException("No longer supported");
-  }
-
-  @Override
-  public void deleteRow(boolean waitToBeVisible, boolean wal, String rowId) throws IOException {
-    throw new RuntimeException("No longer supported");
-  }
-
-  @Override
   public IndexReader getIndexReader() throws IOException {
     IndexReader indexReader = _indexRef.get();
     while (!indexReader.tryIncRef()) {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c715774a/src/blur-core/src/main/java/org/apache/blur/utils/BlurThriftRecord.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/utils/BlurThriftRecord.java b/src/blur-core/src/main/java/org/apache/blur/utils/BlurThriftRecord.java
deleted file mode 100644
index d8dcefa..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/utils/BlurThriftRecord.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.apache.blur.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 regarding copyright ownership.
- * The ASF licenses this file 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 org.apache.blur.thrift.generated.Column;
-import org.apache.blur.thrift.generated.Record;
-
-public class BlurThriftRecord extends Record implements ReaderBlurRecord {
-
-  private static final long serialVersionUID = 1447192115360284850L;
-
-  @Override
-  public void addColumn(String name, String value) {
-    addToColumns(new Column(name, value));
-  }
-
-  @Override
-  public void setRecordIdStr(String value) {
-    setRecordId(value);
-  }
-
-  @Override
-  public void setFamilyStr(String family) {
-    setFamily(family);
-  }
-
-  @Override
-  public void setRowIdStr(String rowId) {
-    // setRowIdStr(rowId);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c715774a/src/blur-core/src/main/java/org/apache/blur/utils/BlurUtil.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/utils/BlurUtil.java b/src/blur-core/src/main/java/org/apache/blur/utils/BlurUtil.java
index d15f56a..1a728f9 100644
--- a/src/blur-core/src/main/java/org/apache/blur/utils/BlurUtil.java
+++ b/src/blur-core/src/main/java/org/apache/blur/utils/BlurUtil.java
@@ -30,7 +30,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
@@ -43,9 +42,6 @@ import org.apache.blur.manager.clusterstatus.ZookeeperPathConstants;
 import org.apache.blur.metrics.BlurMetrics;
 import org.apache.blur.metrics.BlurMetrics.MethodCall;
 import org.apache.blur.thrift.generated.Blur.Iface;
-import org.apache.blur.thrift.generated.Column;
-import org.apache.blur.thrift.generated.Record;
-import org.apache.blur.thrift.generated.Row;
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
@@ -176,30 +172,6 @@ public class BlurUtil {
     }
   }
 
-  public static boolean match(Record left, Record right) {
-    return left.recordId.equals(right.recordId) && left.family.equals(right.family);
-  }
-
-  public static Record newRecord(String family, String recordId, Column... columns) {
-    Record record = new Record();
-    record.setRecordId(recordId);
-    record.setFamily(family);
-    record.setColumns(Arrays.asList(columns));
-    return record;
-  }
-
-  public static Row newRow(String rowId, Record... records) {
-    Row row = new Row().setId(rowId);
-    for (Record record : records) {
-      row.addToRecords(record);
-    }
-    return row;
-  }
-
-  public static Column newColumn(String name, String value) {
-    return new Column().setName(name).setValue(value);
-  }
-
   public static byte[] toBytes(Serializable serializable) {
     try {
       ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c715774a/src/blur-core/src/main/java/org/apache/blur/utils/RowDocumentUtil.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/utils/RowDocumentUtil.java b/src/blur-core/src/main/java/org/apache/blur/utils/RowDocumentUtil.java
index 0b47e03..3863339 100644
--- a/src/blur-core/src/main/java/org/apache/blur/utils/RowDocumentUtil.java
+++ b/src/blur-core/src/main/java/org/apache/blur/utils/RowDocumentUtil.java
@@ -20,43 +20,12 @@ import static org.apache.blur.utils.BlurConstants.RECORD_ID;
 import static org.apache.blur.utils.BlurConstants.ROW_ID;
 import static org.apache.blur.utils.BlurConstants.SEP;
 
-import java.util.ArrayList;
-
-import org.apache.blur.thrift.generated.Record;
-import org.apache.blur.thrift.generated.Row;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.IndexableField;
 
 
 public class RowDocumentUtil {
 
-  public static Row getRow(Iterable<Document> docs) {
-    Row row = new Row();
-    boolean empty = true;
-    if (docs == null) {
-      return null;
-    }
-    for (Document document : docs) {
-      empty = false;
-      BlurThriftRecord record = new BlurThriftRecord();
-      String rowId = readRecord(document, record);
-      if (record.getColumns() != null) {
-        row.addToRecords(record);
-      }
-      if (row.id == null) {
-        row.setId(rowId);
-      }
-      row.recordCount++;
-    }
-    if (empty) {
-      return null;
-    }
-    if (row.records == null) {
-      row.records = new ArrayList<Record>();
-    }
-    return row;
-  }
-
   public static String readRecord(Document document, ReaderBlurRecord reader) {
     String rowId = null;
     String family = null;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c715774a/src/blur-core/src/main/java/org/apache/blur/utils/RowIndexWriter.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/utils/RowIndexWriter.java b/src/blur-core/src/main/java/org/apache/blur/utils/RowIndexWriter.java
deleted file mode 100644
index 9b98a46..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/utils/RowIndexWriter.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package org.apache.blur.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 regarding copyright ownership.
- * The ASF licenses this file 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 static org.apache.blur.utils.BlurConstants.RECORD_ID;
-import static org.apache.blur.utils.BlurConstants.ROW_ID;
-import static org.apache.blur.utils.BlurConstants.SEP;
-import static org.apache.blur.utils.BlurConstants.SUPER;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.blur.analysis.BlurAnalyzer;
-import org.apache.blur.thrift.generated.Column;
-import org.apache.blur.thrift.generated.Record;
-import org.apache.blur.thrift.generated.Row;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.Term;
-
-
-public class RowIndexWriter {
-
-  private BlurAnalyzer _analyzer;
-  private IndexWriter _indexWriter;
-  private boolean primeDocSet;
-  private StringBuilder builder = new StringBuilder();
-
-  public RowIndexWriter(IndexWriter indexWriter, BlurAnalyzer analyzer) {
-    _indexWriter = indexWriter;
-    _analyzer = analyzer;
-  }
-
-  public void add(boolean wal, Row row) throws IOException {
-    if (row == null || row.id == null) {
-      throw new NullPointerException();
-    }
-    append(wal, row, false);
-  }
-
-  public void replace(boolean wal, Row row) throws IOException {
-    if (row == null || row.id == null) {
-      throw new NullPointerException();
-    }
-    append(wal, row, true);
-  }
-
-  private void append(boolean wal, Row row, boolean replace) throws IOException {
-    primeDocSet = false;
-    List<Document> documents = new ArrayList<Document>();
-    for (Record record : row.records) {
-      convert(row.id, record, documents);
-    }
-    if (replace) {
-      _indexWriter.updateDocuments(new Term(ROW_ID, row.id), documents, _analyzer);
-    } else {
-      _indexWriter.addDocuments(documents, _analyzer);
-    }
-  }
-
-  private void convert(String rowId, Record record, List<Document> documents) throws IOException {
-    if (record == null) {
-      return;
-    }
-    String recordId = record.recordId;
-    if (recordId == null) {
-      throw new NullPointerException("Record id is null.");
-    }
-    String family = record.getFamily();
-    if (family == null) {
-      throw new NullPointerException("Family is null.");
-    }
-    Document document = new Document();
-    document.add(new Field(ROW_ID, rowId, Store.YES, Index.NOT_ANALYZED_NO_NORMS));
-    document.add(new Field(RECORD_ID, recordId, Store.YES, Index.NOT_ANALYZED_NO_NORMS));
-    if (addColumns(document, _analyzer, builder, family, record.columns)) {
-      if (!primeDocSet) {
-        document.add(new Field(BlurConstants.PRIME_DOC, BlurConstants.PRIME_DOC_VALUE, Store.NO, Index.NOT_ANALYZED_NO_NORMS));
-        primeDocSet = true;
-      }
-      documents.add(document);
-    }
-  }
-
-  public static boolean addColumns(Document document, BlurAnalyzer analyzer, StringBuilder builder, String columnFamily, Iterable<Column> set) {
-    if (set == null) {
-      return false;
-    }
-    builder.setLength(0);
-    OUTER: for (Column column : set) {
-      String name = column.getName();
-      String value = column.value;
-      if (value == null || name == null) {
-        continue OUTER;
-      }
-      String fieldName = getFieldName(columnFamily, name);
-      Store store = analyzer.getStore(fieldName);
-      Index index = analyzer.getIndex(fieldName);
-      boolean fullText = analyzer.isFullTextField(fieldName);
-      Set<String> subFieldNames = analyzer.getSubIndexNames(fieldName);
-      document.add(new Field(fieldName, value, store, index));
-      if (fullText) {
-        builder.append(value).append(' ');
-      }
-      if (subFieldNames != null) {
-        for (String subFieldName : subFieldNames) {
-          document.add(new Field(subFieldName, value, Store.NO, index));
-        }
-      }
-    }
-    if (builder.length() != 0) {
-      String superValue = builder.toString();
-      document.add(new Field(SUPER, superValue, Store.NO, Index.ANALYZED_NO_NORMS));
-    }
-    return true;
-  }
-
-  public static String getFieldName(String columnFamily, String name) {
-    return columnFamily + SEP + name;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c715774a/src/blur-core/src/test/java/org/apache/blur/manager/writer/BlurNRTIndexTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/org/apache/blur/manager/writer/BlurNRTIndexTest.java b/src/blur-core/src/test/java/org/apache/blur/manager/writer/BlurNRTIndexTest.java
index 132d0b2..a4e0b14 100644
--- a/src/blur-core/src/test/java/org/apache/blur/manager/writer/BlurNRTIndexTest.java
+++ b/src/blur-core/src/test/java/org/apache/blur/manager/writer/BlurNRTIndexTest.java
@@ -26,9 +26,6 @@ import java.util.concurrent.ExecutorService;
 
 import org.apache.blur.analysis.BlurAnalyzer;
 import org.apache.blur.concurrent.Executors;
-import org.apache.blur.thrift.generated.Column;
-import org.apache.blur.thrift.generated.Record;
-import org.apache.blur.thrift.generated.Row;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.lucene.analysis.core.KeywordAnalyzer;
@@ -112,7 +109,7 @@ public class BlurNRTIndexTest {
     long s = System.nanoTime();
     int total = 0;
     for (int i = 0; i < TEST_NUMBER_WAIT_VISIBLE; i++) {
-      writer.replaceRow(true, true, genRow());
+//      writer.replaceRow(true, true, genRow());
       IndexReader reader = writer.getIndexReader();
       assertEquals(i + 1, reader.numDocs());
       total++;
@@ -132,9 +129,9 @@ public class BlurNRTIndexTest {
     int total = 0;
     for (int i = 0; i < TEST_NUMBER; i++) {
       if (i == TEST_NUMBER - 1) {
-        writer.replaceRow(true, true, genRow());
+//        writer.replaceRow(true, true, genRow());
       } else {
-        writer.replaceRow(false, true, genRow());
+//        writer.replaceRow(false, true, genRow());
       }
       total++;
     }
@@ -151,17 +148,17 @@ public class BlurNRTIndexTest {
     reader.decRef();
   }
 
-  private Row genRow() {
-    Row row = new Row();
-    row.setId(Long.toString(random.nextLong()));
-    Record record = new Record();
-    record.setFamily("testing");
-    record.setRecordId(Long.toString(random.nextLong()));
-    for (int i = 0; i < 10; i++) {
-      record.addToColumns(new Column("col" + i, Long.toString(random.nextLong())));
-    }
-    row.addToRecords(record);
-    return row;
-  }
+//  private Row genRow() {
+//    Row row = new Row();
+//    row.setId(Long.toString(random.nextLong()));
+//    Record record = new Record();
+//    record.setFamily("testing");
+//    record.setRecordId(Long.toString(random.nextLong()));
+//    for (int i = 0; i < 10; i++) {
+//      record.addToColumns(new Column("col" + i, Long.toString(random.nextLong())));
+//    }
+//    row.addToRecords(record);
+//    return row;
+//  }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c715774a/src/blur-core/src/test/java/org/apache/blur/manager/writer/TransactionRecorderTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/org/apache/blur/manager/writer/TransactionRecorderTest.java b/src/blur-core/src/test/java/org/apache/blur/manager/writer/TransactionRecorderTest.java
index fbd21ed..a60d28c 100644
--- a/src/blur-core/src/test/java/org/apache/blur/manager/writer/TransactionRecorderTest.java
+++ b/src/blur-core/src/test/java/org/apache/blur/manager/writer/TransactionRecorderTest.java
@@ -17,26 +17,7 @@ package org.apache.blur.manager.writer;
  * limitations under the License.
  */
 
-import static org.apache.blur.lucene.LuceneVersionConstant.LUCENE_VERSION;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
 import java.io.File;
-import java.io.IOException;
-
-import org.apache.blur.analysis.BlurAnalyzer;
-import org.apache.blur.index.IndexWriter;
-import org.apache.blur.thrift.generated.Column;
-import org.apache.blur.thrift.generated.Record;
-import org.apache.blur.thrift.generated.Row;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.lucene.analysis.core.KeywordAnalyzer;
-import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.store.RAMDirectory;
-import org.junit.Test;
 
 public class TransactionRecorderTest {
   private static final File TMPDIR = new File(System.getProperty("blur.tmp.dir", "/tmp"));
@@ -92,15 +73,15 @@ public class TransactionRecorderTest {
     file.delete();
   }
 
-  private Row genRow() {
-    Row row = new Row();
-    row.id = "1";
-    Record record = new Record();
-    record.recordId = "1";
-    record.family = "test";
-    record.addToColumns(new Column("name", "value"));
-    row.addToRecords(record);
-    return row;
-  }
+//  private Row genRow() {
+//    Row row = new Row();
+//    row.id = "1";
+//    Record record = new Record();
+//    record.recordId = "1";
+//    record.family = "test";
+//    record.addToColumns(new Column("name", "value"));
+//    row.addToRecords(record);
+//    return row;
+//  }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c715774a/src/blur-core/src/test/java/org/apache/blur/search/RandomSuperQueryTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/org/apache/blur/search/RandomSuperQueryTest.java b/src/blur-core/src/test/java/org/apache/blur/search/RandomSuperQueryTest.java
index c85eeeb..f5f8ca0 100644
--- a/src/blur-core/src/test/java/org/apache/blur/search/RandomSuperQueryTest.java
+++ b/src/blur-core/src/test/java/org/apache/blur/search/RandomSuperQueryTest.java
@@ -22,24 +22,15 @@ import static org.apache.blur.lucene.LuceneVersionConstant.LUCENE_VERSION;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Random;
 
 import org.apache.blur.analysis.BlurAnalyzer;
-import org.apache.blur.index.IndexWriter;
 import org.apache.blur.lucene.search.SuperParser;
-import org.apache.blur.thrift.generated.Column;
-import org.apache.blur.thrift.generated.Record;
-import org.apache.blur.thrift.generated.Row;
 import org.apache.blur.thrift.generated.ScoreType;
-import org.apache.blur.utils.RowIndexWriter;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.index.CorruptIndexException;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.search.Filter;
 import org.apache.lucene.search.IndexSearcher;
@@ -95,18 +86,18 @@ public class RandomSuperQueryTest {
 
   private Directory createIndex(Random random, Collection<String> sampler) throws CorruptIndexException, LockObtainFailedException, IOException {
     Directory directory = new RAMDirectory();
-    String[] columnFamilies = genWords(random, MIN_NUM_COL_FAM, MAX_NUM_COL_FAM, "colfam");
-    Map<String, String[]> columns = new HashMap<String, String[]>();
-    for (int i = 0; i < columnFamilies.length; i++) {
-      columns.put(columnFamilies[i], genWords(random, MIN_NUM_COLS, MAX_NUM_COLS, "col"));
-    }
-    IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(LUCENE_VERSION, new StandardAnalyzer(LUCENE_VERSION)));
-    RowIndexWriter indexWriter = new RowIndexWriter(writer, new BlurAnalyzer(new StandardAnalyzer(LUCENE_VERSION)));
-    int numberOfDocs = random.nextInt(MAX_NUM_OF_DOCS) + 1;
-    for (int i = 0; i < numberOfDocs; i++) {
-      indexWriter.replace(false, generatSuperDoc(random, columns, sampler));
-    }
-    writer.close();
+//    String[] columnFamilies = genWords(random, MIN_NUM_COL_FAM, MAX_NUM_COL_FAM, "colfam");
+//    Map<String, String[]> columns = new HashMap<String, String[]>();
+//    for (int i = 0; i < columnFamilies.length; i++) {
+//      columns.put(columnFamilies[i], genWords(random, MIN_NUM_COLS, MAX_NUM_COLS, "col"));
+//    }
+//    IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(LUCENE_VERSION, new StandardAnalyzer(LUCENE_VERSION)));
+//    RowIndexWriter indexWriter = new RowIndexWriter(writer, new BlurAnalyzer(new StandardAnalyzer(LUCENE_VERSION)));
+//    int numberOfDocs = random.nextInt(MAX_NUM_OF_DOCS) + 1;
+//    for (int i = 0; i < numberOfDocs; i++) {
+//      indexWriter.replace(false, generatSuperDoc(random, columns, sampler));
+//    }
+//    writer.close();
     return directory;
   }
 
@@ -119,37 +110,37 @@ public class RandomSuperQueryTest {
     return str;
   }
 
-  private Row generatSuperDoc(Random random, Map<String, String[]> columns, Collection<String> sampler) {
-    Row row = new Row().setId(Long.toString(random.nextLong()));
-    StringBuilder builder = new StringBuilder();
-    for (String colFam : columns.keySet()) {
-      String[] cols = columns.get(colFam);
-      for (int i = 0; i < random.nextInt(MAX_NUM_DOCS_PER_COL_FAM); i++) {
-        Record record = new Record();
-        record.setFamily(colFam);
-        record.setRecordId(Long.toString(random.nextLong()));
-        int staringLength = builder.length();
-        for (String column : cols) {
-          if (random.nextInt() % MOD_COLS_USED_FOR_SKIPPING == 0) {
-            String word = genWord(random, "word");
-            record.addToColumns(new Column(column, word));
-            if (random.nextInt() % MOD_USED_FOR_SAMPLING == 0) {
-              builder.append(" +" + colFam + "." + column + ":" + word);
-            }
-          }
-        }
-        if (builder.length() != staringLength) {
-          builder.append(" nojoin.nojoin ");
-        }
-        row.addToRecords(record);
-      }
-    }
-    String string = builder.toString().trim();
-    if (!string.isEmpty()) {
-      sampler.add(string);
-    }
-    return row;
-  }
+//  private Row generatSuperDoc(Random random, Map<String, String[]> columns, Collection<String> sampler) {
+//    Row row = new Row().setId(Long.toString(random.nextLong()));
+//    StringBuilder builder = new StringBuilder();
+//    for (String colFam : columns.keySet()) {
+//      String[] cols = columns.get(colFam);
+//      for (int i = 0; i < random.nextInt(MAX_NUM_DOCS_PER_COL_FAM); i++) {
+//        Record record = new Record();
+//        record.setFamily(colFam);
+//        record.setRecordId(Long.toString(random.nextLong()));
+//        int staringLength = builder.length();
+//        for (String column : cols) {
+//          if (random.nextInt() % MOD_COLS_USED_FOR_SKIPPING == 0) {
+//            String word = genWord(random, "word");
+//            record.addToColumns(new Column(column, word));
+//            if (random.nextInt() % MOD_USED_FOR_SAMPLING == 0) {
+//              builder.append(" +" + colFam + "." + column + ":" + word);
+//            }
+//          }
+//        }
+//        if (builder.length() != staringLength) {
+//          builder.append(" nojoin.nojoin ");
+//        }
+//        row.addToRecords(record);
+//      }
+//    }
+//    String string = builder.toString().trim();
+//    if (!string.isEmpty()) {
+//      sampler.add(string);
+//    }
+//    return row;
+//  }
 
   private String genWord(Random random, String prefix) {
     return prefix + random.nextInt(MAX_NUM_OF_WORDS);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c715774a/src/blur-core/src/test/java/org/apache/blur/search/SuperQueryTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/org/apache/blur/search/SuperQueryTest.java b/src/blur-core/src/test/java/org/apache/blur/search/SuperQueryTest.java
index 7043179..a7e2f0d 100644
--- a/src/blur-core/src/test/java/org/apache/blur/search/SuperQueryTest.java
+++ b/src/blur-core/src/test/java/org/apache/blur/search/SuperQueryTest.java
@@ -18,27 +18,17 @@ package org.apache.blur.search;
  */
 
 import static junit.framework.Assert.assertEquals;
-import static org.apache.blur.lucene.LuceneVersionConstant.LUCENE_VERSION;
 import static org.apache.blur.utils.BlurConstants.ROW_ID;
-import static org.apache.blur.utils.BlurUtil.newColumn;
-import static org.apache.blur.utils.BlurUtil.newRecord;
-import static org.apache.blur.utils.BlurUtil.newRow;
 
 import java.io.IOException;
-import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLongArray;
 
-import org.apache.blur.analysis.BlurAnalyzer;
-import org.apache.blur.index.IndexWriter;
 import org.apache.blur.lucene.search.FacetQuery;
 import org.apache.blur.lucene.search.SuperQuery;
 import org.apache.blur.thrift.generated.ScoreType;
-import org.apache.blur.utils.RowIndexWriter;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.index.CorruptIndexException;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.BooleanClause.Occur;
 import org.apache.lucene.search.BooleanQuery;
@@ -177,19 +167,19 @@ public class SuperQueryTest {
 
   public static Directory createIndex() throws CorruptIndexException, LockObtainFailedException, IOException {
     Directory directory = new RAMDirectory();
-    IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(LUCENE_VERSION, new StandardAnalyzer(LUCENE_VERSION)));
-    BlurAnalyzer analyzer = new BlurAnalyzer(new StandardAnalyzer(LUCENE_VERSION));
-    RowIndexWriter indexWriter = new RowIndexWriter(writer, analyzer);
-    indexWriter.replace(
-        false,
-        newRow("1", newRecord(PERSON, UUID.randomUUID().toString(), newColumn(NAME, NAME1)), newRecord(PERSON, UUID.randomUUID().toString(), newColumn(NAME, NAME1)),
-            newRecord(ADDRESS, UUID.randomUUID().toString(), newColumn(STREET, STREET1))));
-    indexWriter.replace(false,
-        newRow("2", newRecord(PERSON, UUID.randomUUID().toString(), newColumn(NAME, NAME2)), newRecord(ADDRESS, UUID.randomUUID().toString(), newColumn(STREET, STREET1))));
-    indexWriter.replace(false,
-        newRow("3", newRecord(PERSON, UUID.randomUUID().toString(), newColumn(NAME, NAME1)), newRecord(ADDRESS, UUID.randomUUID().toString(), newColumn(STREET, STREET2))));
-    ;
-    writer.close();
+//    IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(LUCENE_VERSION, new StandardAnalyzer(LUCENE_VERSION)));
+//    BlurAnalyzer analyzer = new BlurAnalyzer(new StandardAnalyzer(LUCENE_VERSION));
+//    RowIndexWriter indexWriter = new RowIndexWriter(writer, analyzer);
+//    indexWriter.replace(
+//        false,
+//        newRow("1", newRecord(PERSON, UUID.randomUUID().toString(), newColumn(NAME, NAME1)), newRecord(PERSON, UUID.randomUUID().toString(), newColumn(NAME, NAME1)),
+//            newRecord(ADDRESS, UUID.randomUUID().toString(), newColumn(STREET, STREET1))));
+//    indexWriter.replace(false,
+//        newRow("2", newRecord(PERSON, UUID.randomUUID().toString(), newColumn(NAME, NAME2)), newRecord(ADDRESS, UUID.randomUUID().toString(), newColumn(STREET, STREET1))));
+//    indexWriter.replace(false,
+//        newRow("3", newRecord(PERSON, UUID.randomUUID().toString(), newColumn(NAME, NAME1)), newRecord(ADDRESS, UUID.randomUUID().toString(), newColumn(STREET, STREET2))));
+//    ;
+//    writer.close();
     return directory;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c715774a/src/blur-core/src/test/java/org/apache/blur/utils/BlurUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/org/apache/blur/utils/BlurUtilsTest.java b/src/blur-core/src/test/java/org/apache/blur/utils/BlurUtilsTest.java
index 67f9d7f..bd40b6e 100644
--- a/src/blur-core/src/test/java/org/apache/blur/utils/BlurUtilsTest.java
+++ b/src/blur-core/src/test/java/org/apache/blur/utils/BlurUtilsTest.java
@@ -19,7 +19,6 @@ package org.apache.blur.utils;
 
 import static org.apache.blur.lucene.LuceneVersionConstant.LUCENE_VERSION;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -27,7 +26,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.blur.thrift.generated.Record;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -97,18 +95,6 @@ public class BlurUtilsTest {
   }
 
   @Test
-  public void testRecordMatch() {
-    Record r1 = BlurUtil.newRecord("test-family", "record-1", BlurUtil.newColumn("a", "b"));
-    Record r2 = BlurUtil.newRecord("test-family", "record-1", BlurUtil.newColumn("c", "d"));
-    Record r3 = BlurUtil.newRecord("test-family", "record-2", BlurUtil.newColumn("e", "f"));
-    Record r4 = BlurUtil.newRecord("test-family-2", "record-1", BlurUtil.newColumn("g", "h"));
-
-    assertTrue("should match with same family and record-id", BlurUtil.match(r1, r2));
-    assertFalse("should not match with different record-id", BlurUtil.match(r1, r3));
-    assertFalse("should not match with different family", BlurUtil.match(r1, r4));
-  }
-
-  @Test
   public void testValidateShardCount() throws IOException {
     File file = new File(TMPDIR, "ValidateShardCount-test");
     rm(file);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c715774a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/AnalyzerDefinition.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/AnalyzerDefinition.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/AnalyzerDefinition.java
index b416b43..6b2daae 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/AnalyzerDefinition.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/AnalyzerDefinition.java
@@ -579,16 +579,16 @@ public class AnalyzerDefinition implements org.apache.thrift.TBase<AnalyzerDefin
           case 3: // COLUMN_FAMILY_DEFINITIONS
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map64 = iprot.readMapBegin();
-                struct.columnFamilyDefinitions = new HashMap<String,ColumnFamilyDefinition>(2*_map64.size);
-                for (int _i65 = 0; _i65 < _map64.size; ++_i65)
+                org.apache.thrift.protocol.TMap _map48 = iprot.readMapBegin();
+                struct.columnFamilyDefinitions = new HashMap<String,ColumnFamilyDefinition>(2*_map48.size);
+                for (int _i49 = 0; _i49 < _map48.size; ++_i49)
                 {
-                  String _key66; // required
-                  ColumnFamilyDefinition _val67; // optional
-                  _key66 = iprot.readString();
-                  _val67 = new ColumnFamilyDefinition();
-                  _val67.read(iprot);
-                  struct.columnFamilyDefinitions.put(_key66, _val67);
+                  String _key50; // required
+                  ColumnFamilyDefinition _val51; // optional
+                  _key50 = iprot.readString();
+                  _val51 = new ColumnFamilyDefinition();
+                  _val51.read(iprot);
+                  struct.columnFamilyDefinitions.put(_key50, _val51);
                 }
                 iprot.readMapEnd();
               }
@@ -626,10 +626,10 @@ public class AnalyzerDefinition implements org.apache.thrift.TBase<AnalyzerDefin
         oprot.writeFieldBegin(COLUMN_FAMILY_DEFINITIONS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.columnFamilyDefinitions.size()));
-          for (Map.Entry<String, ColumnFamilyDefinition> _iter68 : struct.columnFamilyDefinitions.entrySet())
+          for (Map.Entry<String, ColumnFamilyDefinition> _iter52 : struct.columnFamilyDefinitions.entrySet())
           {
-            oprot.writeString(_iter68.getKey());
-            _iter68.getValue().write(oprot);
+            oprot.writeString(_iter52.getKey());
+            _iter52.getValue().write(oprot);
           }
           oprot.writeMapEnd();
         }
@@ -672,10 +672,10 @@ public class AnalyzerDefinition implements org.apache.thrift.TBase<AnalyzerDefin
       if (struct.isSetColumnFamilyDefinitions()) {
         {
           oprot.writeI32(struct.columnFamilyDefinitions.size());
-          for (Map.Entry<String, ColumnFamilyDefinition> _iter69 : struct.columnFamilyDefinitions.entrySet())
+          for (Map.Entry<String, ColumnFamilyDefinition> _iter53 : struct.columnFamilyDefinitions.entrySet())
           {
-            oprot.writeString(_iter69.getKey());
-            _iter69.getValue().write(oprot);
+            oprot.writeString(_iter53.getKey());
+            _iter53.getValue().write(oprot);
           }
         }
       }
@@ -696,16 +696,16 @@ public class AnalyzerDefinition implements org.apache.thrift.TBase<AnalyzerDefin
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TMap _map70 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.columnFamilyDefinitions = new HashMap<String,ColumnFamilyDefinition>(2*_map70.size);
-          for (int _i71 = 0; _i71 < _map70.size; ++_i71)
+          org.apache.thrift.protocol.TMap _map54 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.columnFamilyDefinitions = new HashMap<String,ColumnFamilyDefinition>(2*_map54.size);
+          for (int _i55 = 0; _i55 < _map54.size; ++_i55)
           {
-            String _key72; // required
-            ColumnFamilyDefinition _val73; // optional
-            _key72 = iprot.readString();
-            _val73 = new ColumnFamilyDefinition();
-            _val73.read(iprot);
-            struct.columnFamilyDefinitions.put(_key72, _val73);
+            String _key56; // required
+            ColumnFamilyDefinition _val57; // optional
+            _key56 = iprot.readString();
+            _val57 = new ColumnFamilyDefinition();
+            _val57.read(iprot);
+            struct.columnFamilyDefinitions.put(_key56, _val57);
           }
         }
         struct.setColumnFamilyDefinitionsIsSet(true);


Mime
View raw message