incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [30/50] [abbrv] More removing of old API.
Date Wed, 07 Nov 2012 02:26:55 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/interface/gen-perl/Blur/Types.pm
----------------------------------------------------------------------
diff --git a/interface/gen-perl/Blur/Types.pm b/interface/gen-perl/Blur/Types.pm
index 9c2c79f..9369224 100644
--- a/interface/gen-perl/Blur/Types.pm
+++ b/interface/gen-perl/Blur/Types.pm
@@ -1510,331 +1510,6 @@ sub write {
   return $xfer;
 }
 
-package Blur::BlurResult;
-use base qw(Class::Accessor);
-Blur::BlurResult->mk_accessors( qw( locationId score fetchResult ) );
-
-sub new {
-  my $classname = shift;
-  my $self      = {};
-  my $vals      = shift || {};
-  $self->{locationId} = undef;
-  $self->{score} = undef;
-  $self->{fetchResult} = undef;
-  if (UNIVERSAL::isa($vals,'HASH')) {
-    if (defined $vals->{locationId}) {
-      $self->{locationId} = $vals->{locationId};
-    }
-    if (defined $vals->{score}) {
-      $self->{score} = $vals->{score};
-    }
-    if (defined $vals->{fetchResult}) {
-      $self->{fetchResult} = $vals->{fetchResult};
-    }
-  }
-  return bless ($self, $classname);
-}
-
-sub getName {
-  return 'BlurResult';
-}
-
-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->{locationId});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^2$/ && do{      if ($ftype == TType::DOUBLE) {
-        $xfer += $input->readDouble(\$self->{score});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^3$/ && do{      if ($ftype == TType::STRUCT) {
-        $self->{fetchResult} = new Blur::FetchResult();
-        $xfer += $self->{fetchResult}->read($input);
-      } 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('BlurResult');
-  if (defined $self->{locationId}) {
-    $xfer += $output->writeFieldBegin('locationId', TType::STRING, 1);
-    $xfer += $output->writeString($self->{locationId});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{score}) {
-    $xfer += $output->writeFieldBegin('score', TType::DOUBLE, 2);
-    $xfer += $output->writeDouble($self->{score});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{fetchResult}) {
-    $xfer += $output->writeFieldBegin('fetchResult', TType::STRUCT, 3);
-    $xfer += $self->{fetchResult}->write($output);
-    $xfer += $output->writeFieldEnd();
-  }
-  $xfer += $output->writeFieldStop();
-  $xfer += $output->writeStructEnd();
-  return $xfer;
-}
-
-package Blur::BlurResults;
-use base qw(Class::Accessor);
-Blur::BlurResults->mk_accessors( qw( totalResults shardInfo results facetCounts exceptions query ) );
-
-sub new {
-  my $classname = shift;
-  my $self      = {};
-  my $vals      = shift || {};
-  $self->{totalResults} = 0;
-  $self->{shardInfo} = undef;
-  $self->{results} = undef;
-  $self->{facetCounts} = undef;
-  $self->{exceptions} = undef;
-  $self->{query} = undef;
-  if (UNIVERSAL::isa($vals,'HASH')) {
-    if (defined $vals->{totalResults}) {
-      $self->{totalResults} = $vals->{totalResults};
-    }
-    if (defined $vals->{shardInfo}) {
-      $self->{shardInfo} = $vals->{shardInfo};
-    }
-    if (defined $vals->{results}) {
-      $self->{results} = $vals->{results};
-    }
-    if (defined $vals->{facetCounts}) {
-      $self->{facetCounts} = $vals->{facetCounts};
-    }
-    if (defined $vals->{exceptions}) {
-      $self->{exceptions} = $vals->{exceptions};
-    }
-    if (defined $vals->{query}) {
-      $self->{query} = $vals->{query};
-    }
-  }
-  return bless ($self, $classname);
-}
-
-sub getName {
-  return 'BlurResults';
-}
-
-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::I64) {
-        $xfer += $input->readI64(\$self->{totalResults});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^2$/ && do{      if ($ftype == TType::MAP) {
-        {
-          my $_size44 = 0;
-          $self->{shardInfo} = {};
-          my $_ktype45 = 0;
-          my $_vtype46 = 0;
-          $xfer += $input->readMapBegin(\$_ktype45, \$_vtype46, \$_size44);
-          for (my $_i48 = 0; $_i48 < $_size44; ++$_i48)
-          {
-            my $key49 = '';
-            my $val50 = 0;
-            $xfer += $input->readString(\$key49);
-            $xfer += $input->readI64(\$val50);
-            $self->{shardInfo}->{$key49} = $val50;
-          }
-          $xfer += $input->readMapEnd();
-        }
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^3$/ && do{      if ($ftype == TType::LIST) {
-        {
-          my $_size51 = 0;
-          $self->{results} = [];
-          my $_etype54 = 0;
-          $xfer += $input->readListBegin(\$_etype54, \$_size51);
-          for (my $_i55 = 0; $_i55 < $_size51; ++$_i55)
-          {
-            my $elem56 = undef;
-            $elem56 = new Blur::BlurResult();
-            $xfer += $elem56->read($input);
-            push(@{$self->{results}},$elem56);
-          }
-          $xfer += $input->readListEnd();
-        }
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^4$/ && do{      if ($ftype == TType::LIST) {
-        {
-          my $_size57 = 0;
-          $self->{facetCounts} = [];
-          my $_etype60 = 0;
-          $xfer += $input->readListBegin(\$_etype60, \$_size57);
-          for (my $_i61 = 0; $_i61 < $_size57; ++$_i61)
-          {
-            my $elem62 = undef;
-            $xfer += $input->readI64(\$elem62);
-            push(@{$self->{facetCounts}},$elem62);
-          }
-          $xfer += $input->readListEnd();
-        }
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^5$/ && do{      if ($ftype == TType::LIST) {
-        {
-          my $_size63 = 0;
-          $self->{exceptions} = [];
-          my $_etype66 = 0;
-          $xfer += $input->readListBegin(\$_etype66, \$_size63);
-          for (my $_i67 = 0; $_i67 < $_size63; ++$_i67)
-          {
-            my $elem68 = undef;
-            $elem68 = new Blur::BlurException();
-            $xfer += $elem68->read($input);
-            push(@{$self->{exceptions}},$elem68);
-          }
-          $xfer += $input->readListEnd();
-        }
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^6$/ && do{      if ($ftype == TType::STRUCT) {
-        $self->{query} = new Blur::BlurQuery();
-        $xfer += $self->{query}->read($input);
-      } 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('BlurResults');
-  if (defined $self->{totalResults}) {
-    $xfer += $output->writeFieldBegin('totalResults', TType::I64, 1);
-    $xfer += $output->writeI64($self->{totalResults});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{shardInfo}) {
-    $xfer += $output->writeFieldBegin('shardInfo', TType::MAP, 2);
-    {
-      $xfer += $output->writeMapBegin(TType::STRING, TType::I64, scalar(keys %{$self->{shardInfo}}));
-      {
-        while( my ($kiter69,$viter70) = each %{$self->{shardInfo}}) 
-        {
-          $xfer += $output->writeString($kiter69);
-          $xfer += $output->writeI64($viter70);
-        }
-      }
-      $xfer += $output->writeMapEnd();
-    }
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{results}) {
-    $xfer += $output->writeFieldBegin('results', TType::LIST, 3);
-    {
-      $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{results}}));
-      {
-        foreach my $iter71 (@{$self->{results}}) 
-        {
-          $xfer += ${iter71}->write($output);
-        }
-      }
-      $xfer += $output->writeListEnd();
-    }
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{facetCounts}) {
-    $xfer += $output->writeFieldBegin('facetCounts', TType::LIST, 4);
-    {
-      $xfer += $output->writeListBegin(TType::I64, scalar(@{$self->{facetCounts}}));
-      {
-        foreach my $iter72 (@{$self->{facetCounts}}) 
-        {
-          $xfer += $output->writeI64($iter72);
-        }
-      }
-      $xfer += $output->writeListEnd();
-    }
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{exceptions}) {
-    $xfer += $output->writeFieldBegin('exceptions', TType::LIST, 5);
-    {
-      $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{exceptions}}));
-      {
-        foreach my $iter73 (@{$self->{exceptions}}) 
-        {
-          $xfer += ${iter73}->write($output);
-        }
-      }
-      $xfer += $output->writeListEnd();
-    }
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{query}) {
-    $xfer += $output->writeFieldBegin('query', TType::STRUCT, 6);
-    $xfer += $self->{query}->write($output);
-    $xfer += $output->writeFieldEnd();
-  }
-  $xfer += $output->writeFieldStop();
-  $xfer += $output->writeStructEnd();
-  return $xfer;
-}
-
 package Blur::CpuTime;
 use base qw(Class::Accessor);
 Blur::CpuTime->mk_accessors( qw( cpuTime realTime ) );
@@ -1979,19 +1654,19 @@ sub read {
       last; };
       /^2$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size74 = 0;
+          my $_size44 = 0;
           $self->{cpuTimes} = {};
-          my $_ktype75 = 0;
-          my $_vtype76 = 0;
-          $xfer += $input->readMapBegin(\$_ktype75, \$_vtype76, \$_size74);
-          for (my $_i78 = 0; $_i78 < $_size74; ++$_i78)
+          my $_ktype45 = 0;
+          my $_vtype46 = 0;
+          $xfer += $input->readMapBegin(\$_ktype45, \$_vtype46, \$_size44);
+          for (my $_i48 = 0; $_i48 < $_size44; ++$_i48)
           {
-            my $key79 = '';
-            my $val80 = new Blur::CpuTime();
-            $xfer += $input->readString(\$key79);
-            $val80 = new Blur::CpuTime();
-            $xfer += $val80->read($input);
-            $self->{cpuTimes}->{$key79} = $val80;
+            my $key49 = '';
+            my $val50 = new Blur::CpuTime();
+            $xfer += $input->readString(\$key49);
+            $val50 = new Blur::CpuTime();
+            $xfer += $val50->read($input);
+            $self->{cpuTimes}->{$key49} = $val50;
           }
           $xfer += $input->readMapEnd();
         }
@@ -2045,10 +1720,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRUCT, scalar(keys %{$self->{cpuTimes}}));
       {
-        while( my ($kiter81,$viter82) = each %{$self->{cpuTimes}}) 
+        while( my ($kiter51,$viter52) = each %{$self->{cpuTimes}}) 
         {
-          $xfer += $output->writeString($kiter81);
-          $xfer += ${viter82}->write($output);
+          $xfer += $output->writeString($kiter51);
+          $xfer += ${viter52}->write($output);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -2252,30 +1927,30 @@ sub read {
       last; };
       /^2$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size83 = 0;
+          my $_size53 = 0;
           $self->{columnFamilies} = {};
-          my $_ktype84 = 0;
-          my $_vtype85 = 0;
-          $xfer += $input->readMapBegin(\$_ktype84, \$_vtype85, \$_size83);
-          for (my $_i87 = 0; $_i87 < $_size83; ++$_i87)
+          my $_ktype54 = 0;
+          my $_vtype55 = 0;
+          $xfer += $input->readMapBegin(\$_ktype54, \$_vtype55, \$_size53);
+          for (my $_i57 = 0; $_i57 < $_size53; ++$_i57)
           {
-            my $key88 = '';
-            my $val89 = [];
-            $xfer += $input->readString(\$key88);
+            my $key58 = '';
+            my $val59 = [];
+            $xfer += $input->readString(\$key58);
             {
-              my $_size90 = 0;
-              $val89 = {};
-              my $_etype93 = 0;
-              $xfer += $input->readSetBegin(\$_etype93, \$_size90);
-              for (my $_i94 = 0; $_i94 < $_size90; ++$_i94)
+              my $_size60 = 0;
+              $val59 = {};
+              my $_etype63 = 0;
+              $xfer += $input->readSetBegin(\$_etype63, \$_size60);
+              for (my $_i64 = 0; $_i64 < $_size60; ++$_i64)
               {
-                my $elem95 = undef;
-                $xfer += $input->readString(\$elem95);
-                $val89->{$elem95} = 1;
+                my $elem65 = undef;
+                $xfer += $input->readString(\$elem65);
+                $val59->{$elem65} = 1;
               }
               $xfer += $input->readSetEnd();
             }
-            $self->{columnFamilies}->{$key88} = $val89;
+            $self->{columnFamilies}->{$key58} = $val59;
           }
           $xfer += $input->readMapEnd();
         }
@@ -2305,15 +1980,15 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::SET, scalar(keys %{$self->{columnFamilies}}));
       {
-        while( my ($kiter96,$viter97) = each %{$self->{columnFamilies}}) 
+        while( my ($kiter66,$viter67) = each %{$self->{columnFamilies}}) 
         {
-          $xfer += $output->writeString($kiter96);
+          $xfer += $output->writeString($kiter66);
           {
-            $xfer += $output->writeSetBegin(TType::STRING, scalar(@{${viter97}}));
+            $xfer += $output->writeSetBegin(TType::STRING, scalar(@{${viter67}}));
             {
-              foreach my $iter98 (@{${viter97}})
+              foreach my $iter68 (@{${viter67}})
               {
-                $xfer += $output->writeString($iter98);
+                $xfer += $output->writeString($iter68);
               }
             }
             $xfer += $output->writeSetEnd();
@@ -2451,19 +2126,19 @@ sub read {
       last; };
       /^3$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size99 = 0;
+          my $_size69 = 0;
           $self->{alternateColumnDefinitions} = {};
-          my $_ktype100 = 0;
-          my $_vtype101 = 0;
-          $xfer += $input->readMapBegin(\$_ktype100, \$_vtype101, \$_size99);
-          for (my $_i103 = 0; $_i103 < $_size99; ++$_i103)
+          my $_ktype70 = 0;
+          my $_vtype71 = 0;
+          $xfer += $input->readMapBegin(\$_ktype70, \$_vtype71, \$_size69);
+          for (my $_i73 = 0; $_i73 < $_size69; ++$_i73)
           {
-            my $key104 = '';
-            my $val105 = new Blur::AlternateColumnDefinition();
-            $xfer += $input->readString(\$key104);
-            $val105 = new Blur::AlternateColumnDefinition();
-            $xfer += $val105->read($input);
-            $self->{alternateColumnDefinitions}->{$key104} = $val105;
+            my $key74 = '';
+            my $val75 = new Blur::AlternateColumnDefinition();
+            $xfer += $input->readString(\$key74);
+            $val75 = new Blur::AlternateColumnDefinition();
+            $xfer += $val75->read($input);
+            $self->{alternateColumnDefinitions}->{$key74} = $val75;
           }
           $xfer += $input->readMapEnd();
         }
@@ -2498,10 +2173,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRUCT, scalar(keys %{$self->{alternateColumnDefinitions}}));
       {
-        while( my ($kiter106,$viter107) = each %{$self->{alternateColumnDefinitions}}) 
+        while( my ($kiter76,$viter77) = each %{$self->{alternateColumnDefinitions}}) 
         {
-          $xfer += $output->writeString($kiter106);
-          $xfer += ${viter107}->write($output);
+          $xfer += $output->writeString($kiter76);
+          $xfer += ${viter77}->write($output);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -2562,19 +2237,19 @@ sub read {
       last; };
       /^2$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size108 = 0;
+          my $_size78 = 0;
           $self->{columnDefinitions} = {};
-          my $_ktype109 = 0;
-          my $_vtype110 = 0;
-          $xfer += $input->readMapBegin(\$_ktype109, \$_vtype110, \$_size108);
-          for (my $_i112 = 0; $_i112 < $_size108; ++$_i112)
+          my $_ktype79 = 0;
+          my $_vtype80 = 0;
+          $xfer += $input->readMapBegin(\$_ktype79, \$_vtype80, \$_size78);
+          for (my $_i82 = 0; $_i82 < $_size78; ++$_i82)
           {
-            my $key113 = '';
-            my $val114 = new Blur::ColumnDefinition();
-            $xfer += $input->readString(\$key113);
-            $val114 = new Blur::ColumnDefinition();
-            $xfer += $val114->read($input);
-            $self->{columnDefinitions}->{$key113} = $val114;
+            my $key83 = '';
+            my $val84 = new Blur::ColumnDefinition();
+            $xfer += $input->readString(\$key83);
+            $val84 = new Blur::ColumnDefinition();
+            $xfer += $val84->read($input);
+            $self->{columnDefinitions}->{$key83} = $val84;
           }
           $xfer += $input->readMapEnd();
         }
@@ -2604,10 +2279,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRUCT, scalar(keys %{$self->{columnDefinitions}}));
       {
-        while( my ($kiter115,$viter116) = each %{$self->{columnDefinitions}}) 
+        while( my ($kiter85,$viter86) = each %{$self->{columnDefinitions}}) 
         {
-          $xfer += $output->writeString($kiter115);
-          $xfer += ${viter116}->write($output);
+          $xfer += $output->writeString($kiter85);
+          $xfer += ${viter86}->write($output);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -2678,19 +2353,19 @@ sub read {
       last; };
       /^3$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size117 = 0;
+          my $_size87 = 0;
           $self->{columnFamilyDefinitions} = {};
-          my $_ktype118 = 0;
-          my $_vtype119 = 0;
-          $xfer += $input->readMapBegin(\$_ktype118, \$_vtype119, \$_size117);
-          for (my $_i121 = 0; $_i121 < $_size117; ++$_i121)
+          my $_ktype88 = 0;
+          my $_vtype89 = 0;
+          $xfer += $input->readMapBegin(\$_ktype88, \$_vtype89, \$_size87);
+          for (my $_i91 = 0; $_i91 < $_size87; ++$_i91)
           {
-            my $key122 = '';
-            my $val123 = new Blur::ColumnFamilyDefinition();
-            $xfer += $input->readString(\$key122);
-            $val123 = new Blur::ColumnFamilyDefinition();
-            $xfer += $val123->read($input);
-            $self->{columnFamilyDefinitions}->{$key122} = $val123;
+            my $key92 = '';
+            my $val93 = new Blur::ColumnFamilyDefinition();
+            $xfer += $input->readString(\$key92);
+            $val93 = new Blur::ColumnFamilyDefinition();
+            $xfer += $val93->read($input);
+            $self->{columnFamilyDefinitions}->{$key92} = $val93;
           }
           $xfer += $input->readMapEnd();
         }
@@ -2725,10 +2400,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRUCT, scalar(keys %{$self->{columnFamilyDefinitions}}));
       {
-        while( my ($kiter124,$viter125) = each %{$self->{columnFamilyDefinitions}}) 
+        while( my ($kiter94,$viter95) = each %{$self->{columnFamilyDefinitions}}) 
         {
-          $xfer += $output->writeString($kiter124);
-          $xfer += ${viter125}->write($output);
+          $xfer += $output->writeString($kiter94);
+          $xfer += ${viter95}->write($output);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -2778,15 +2453,15 @@ sub read {
     {
       /^1$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size126 = 0;
+          my $_size96 = 0;
           $self->{preCacheCols} = [];
-          my $_etype129 = 0;
-          $xfer += $input->readListBegin(\$_etype129, \$_size126);
-          for (my $_i130 = 0; $_i130 < $_size126; ++$_i130)
+          my $_etype99 = 0;
+          $xfer += $input->readListBegin(\$_etype99, \$_size96);
+          for (my $_i100 = 0; $_i100 < $_size96; ++$_i100)
           {
-            my $elem131 = undef;
-            $xfer += $input->readString(\$elem131);
-            push(@{$self->{preCacheCols}},$elem131);
+            my $elem101 = undef;
+            $xfer += $input->readString(\$elem101);
+            push(@{$self->{preCacheCols}},$elem101);
           }
           $xfer += $input->readListEnd();
         }
@@ -2811,9 +2486,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRING, scalar(@{$self->{preCacheCols}}));
       {
-        foreach my $iter132 (@{$self->{preCacheCols}}) 
+        foreach my $iter102 (@{$self->{preCacheCols}}) 
         {
-          $xfer += $output->writeString($iter132);
+          $xfer += $output->writeString($iter102);
         }
       }
       $xfer += $output->writeListEnd();
@@ -2972,15 +2647,15 @@ sub read {
       last; };
       /^11$/ && do{      if ($ftype == TType::SET) {
         {
-          my $_size133 = 0;
+          my $_size103 = 0;
           $self->{blockCachingFileTypes} = {};
-          my $_etype136 = 0;
-          $xfer += $input->readSetBegin(\$_etype136, \$_size133);
-          for (my $_i137 = 0; $_i137 < $_size133; ++$_i137)
+          my $_etype106 = 0;
+          $xfer += $input->readSetBegin(\$_etype106, \$_size103);
+          for (my $_i107 = 0; $_i107 < $_size103; ++$_i107)
           {
-            my $elem138 = undef;
-            $xfer += $input->readString(\$elem138);
-            $self->{blockCachingFileTypes}->{$elem138} = 1;
+            my $elem108 = undef;
+            $xfer += $input->readString(\$elem108);
+            $self->{blockCachingFileTypes}->{$elem108} = 1;
           }
           $xfer += $input->readSetEnd();
         }
@@ -3068,9 +2743,9 @@ sub write {
     {
       $xfer += $output->writeSetBegin(TType::STRING, scalar(@{$self->{blockCachingFileTypes}}));
       {
-        foreach my $iter139 (@{$self->{blockCachingFileTypes}})
+        foreach my $iter109 (@{$self->{blockCachingFileTypes}})
         {
-          $xfer += $output->writeString($iter139);
+          $xfer += $output->writeString($iter109);
         }
       }
       $xfer += $output->writeSetEnd();
@@ -3234,18 +2909,18 @@ sub read {
       last; };
       /^2$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size140 = 0;
+          my $_size110 = 0;
           $self->{properties} = {};
-          my $_ktype141 = 0;
-          my $_vtype142 = 0;
-          $xfer += $input->readMapBegin(\$_ktype141, \$_vtype142, \$_size140);
-          for (my $_i144 = 0; $_i144 < $_size140; ++$_i144)
+          my $_ktype111 = 0;
+          my $_vtype112 = 0;
+          $xfer += $input->readMapBegin(\$_ktype111, \$_vtype112, \$_size110);
+          for (my $_i114 = 0; $_i114 < $_size110; ++$_i114)
           {
-            my $key145 = '';
-            my $val146 = '';
-            $xfer += $input->readString(\$key145);
-            $xfer += $input->readString(\$val146);
-            $self->{properties}->{$key145} = $val146;
+            my $key115 = '';
+            my $val116 = '';
+            $xfer += $input->readString(\$key115);
+            $xfer += $input->readString(\$val116);
+            $self->{properties}->{$key115} = $val116;
           }
           $xfer += $input->readMapEnd();
         }
@@ -3275,10 +2950,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRING, scalar(keys %{$self->{properties}}));
       {
-        while( my ($kiter147,$viter148) = each %{$self->{properties}}) 
+        while( my ($kiter117,$viter118) = each %{$self->{properties}}) 
         {
-          $xfer += $output->writeString($kiter147);
-          $xfer += $output->writeString($viter148);
+          $xfer += $output->writeString($kiter117);
+          $xfer += $output->writeString($viter118);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -3502,16 +3177,16 @@ sub read {
     {
       /^1$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size149 = 0;
+          my $_size119 = 0;
           $self->{fields} = [];
-          my $_etype152 = 0;
-          $xfer += $input->readListBegin(\$_etype152, \$_size149);
-          for (my $_i153 = 0; $_i153 < $_size149; ++$_i153)
+          my $_etype122 = 0;
+          $xfer += $input->readListBegin(\$_etype122, \$_size119);
+          for (my $_i123 = 0; $_i123 < $_size119; ++$_i123)
           {
-            my $elem154 = undef;
-            $elem154 = new Blur::SortField();
-            $xfer += $elem154->read($input);
-            push(@{$self->{fields}},$elem154);
+            my $elem124 = undef;
+            $elem124 = new Blur::SortField();
+            $xfer += $elem124->read($input);
+            push(@{$self->{fields}},$elem124);
           }
           $xfer += $input->readListEnd();
         }
@@ -3536,9 +3211,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{fields}}));
       {
-        foreach my $iter155 (@{$self->{fields}}) 
+        foreach my $iter125 (@{$self->{fields}}) 
         {
-          $xfer += ${iter155}->write($output);
+          $xfer += ${iter125}->write($output);
         }
       }
       $xfer += $output->writeListEnd();
@@ -3688,15 +3363,15 @@ sub read {
       last; };
       /^4$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size156 = 0;
+          my $_size126 = 0;
           $self->{fields} = [];
-          my $_etype159 = 0;
-          $xfer += $input->readListBegin(\$_etype159, \$_size156);
-          for (my $_i160 = 0; $_i160 < $_size156; ++$_i160)
+          my $_etype129 = 0;
+          $xfer += $input->readListBegin(\$_etype129, \$_size126);
+          for (my $_i130 = 0; $_i130 < $_size126; ++$_i130)
           {
-            my $elem161 = undef;
-            $xfer += $input->readString(\$elem161);
-            push(@{$self->{fields}},$elem161);
+            my $elem131 = undef;
+            $xfer += $input->readString(\$elem131);
+            push(@{$self->{fields}},$elem131);
           }
           $xfer += $input->readListEnd();
         }
@@ -3731,9 +3406,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRING, scalar(@{$self->{fields}}));
       {
-        foreach my $iter162 (@{$self->{fields}}) 
+        foreach my $iter132 (@{$self->{fields}}) 
         {
-          $xfer += $output->writeString($iter162);
+          $xfer += $output->writeString($iter132);
         }
       }
       $xfer += $output->writeListEnd();
@@ -3855,15 +3530,15 @@ sub read {
       last; };
       /^8$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size163 = 0;
+          my $_size133 = 0;
           $self->{shardIndexes} = [];
-          my $_etype166 = 0;
-          $xfer += $input->readListBegin(\$_etype166, \$_size163);
-          for (my $_i167 = 0; $_i167 < $_size163; ++$_i167)
+          my $_etype136 = 0;
+          $xfer += $input->readListBegin(\$_etype136, \$_size133);
+          for (my $_i137 = 0; $_i137 < $_size133; ++$_i137)
           {
-            my $elem168 = undef;
-            $xfer += $input->readI32(\$elem168);
-            push(@{$self->{shardIndexes}},$elem168);
+            my $elem138 = undef;
+            $xfer += $input->readI32(\$elem138);
+            push(@{$self->{shardIndexes}},$elem138);
           }
           $xfer += $input->readListEnd();
         }
@@ -3923,9 +3598,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::I32, scalar(@{$self->{shardIndexes}}));
       {
-        foreach my $iter169 (@{$self->{shardIndexes}}) 
+        foreach my $iter139 (@{$self->{shardIndexes}}) 
         {
-          $xfer += $output->writeI32($iter169);
+          $xfer += $output->writeI32($iter139);
         }
       }
       $xfer += $output->writeListEnd();
@@ -4003,16 +3678,16 @@ sub read {
       last; };
       /^3$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size170 = 0;
+          my $_size140 = 0;
           $self->{scoreDocs} = [];
-          my $_etype173 = 0;
-          $xfer += $input->readListBegin(\$_etype173, \$_size170);
-          for (my $_i174 = 0; $_i174 < $_size170; ++$_i174)
+          my $_etype143 = 0;
+          $xfer += $input->readListBegin(\$_etype143, \$_size140);
+          for (my $_i144 = 0; $_i144 < $_size140; ++$_i144)
           {
-            my $elem175 = undef;
-            $elem175 = new Blur::ScoreDoc();
-            $xfer += $elem175->read($input);
-            push(@{$self->{scoreDocs}},$elem175);
+            my $elem145 = undef;
+            $elem145 = new Blur::ScoreDoc();
+            $xfer += $elem145->read($input);
+            push(@{$self->{scoreDocs}},$elem145);
           }
           $xfer += $input->readListEnd();
         }
@@ -4028,16 +3703,16 @@ sub read {
       last; };
       /^5$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size176 = 0;
+          my $_size146 = 0;
           $self->{fields} = [];
-          my $_etype179 = 0;
-          $xfer += $input->readListBegin(\$_etype179, \$_size176);
-          for (my $_i180 = 0; $_i180 < $_size176; ++$_i180)
+          my $_etype149 = 0;
+          $xfer += $input->readListBegin(\$_etype149, \$_size146);
+          for (my $_i150 = 0; $_i150 < $_size146; ++$_i150)
           {
-            my $elem181 = undef;
-            $elem181 = new Blur::SortField();
-            $xfer += $elem181->read($input);
-            push(@{$self->{fields}},$elem181);
+            my $elem151 = undef;
+            $elem151 = new Blur::SortField();
+            $xfer += $elem151->read($input);
+            push(@{$self->{fields}},$elem151);
           }
           $xfer += $input->readListEnd();
         }
@@ -4072,9 +3747,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{scoreDocs}}));
       {
-        foreach my $iter182 (@{$self->{scoreDocs}}) 
+        foreach my $iter152 (@{$self->{scoreDocs}}) 
         {
-          $xfer += ${iter182}->write($output);
+          $xfer += ${iter152}->write($output);
         }
       }
       $xfer += $output->writeListEnd();
@@ -4091,9 +3766,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{fields}}));
       {
-        foreach my $iter183 (@{$self->{fields}}) 
+        foreach my $iter153 (@{$self->{fields}}) 
         {
-          $xfer += ${iter183}->write($output);
+          $xfer += ${iter153}->write($output);
         }
       }
       $xfer += $output->writeListEnd();
@@ -4252,16 +3927,16 @@ sub read {
     {
       /^1$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size184 = 0;
+          my $_size154 = 0;
           $self->{fields} = [];
-          my $_etype187 = 0;
-          $xfer += $input->readListBegin(\$_etype187, \$_size184);
-          for (my $_i188 = 0; $_i188 < $_size184; ++$_i188)
+          my $_etype157 = 0;
+          $xfer += $input->readListBegin(\$_etype157, \$_size154);
+          for (my $_i158 = 0; $_i158 < $_size154; ++$_i158)
           {
-            my $elem189 = undef;
-            $elem189 = new Blur::Field();
-            $xfer += $elem189->read($input);
-            push(@{$self->{fields}},$elem189);
+            my $elem159 = undef;
+            $elem159 = new Blur::Field();
+            $xfer += $elem159->read($input);
+            push(@{$self->{fields}},$elem159);
           }
           $xfer += $input->readListEnd();
         }
@@ -4286,9 +3961,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{fields}}));
       {
-        foreach my $iter190 (@{$self->{fields}}) 
+        foreach my $iter160 (@{$self->{fields}}) 
         {
-          $xfer += ${iter190}->write($output);
+          $xfer += ${iter160}->write($output);
         }
       }
       $xfer += $output->writeListEnd();
@@ -4537,16 +4212,16 @@ sub read {
       last; };
       /^2$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size191 = 0;
+          my $_size161 = 0;
           $self->{documents} = [];
-          my $_etype194 = 0;
-          $xfer += $input->readListBegin(\$_etype194, \$_size191);
-          for (my $_i195 = 0; $_i195 < $_size191; ++$_i195)
+          my $_etype164 = 0;
+          $xfer += $input->readListBegin(\$_etype164, \$_size161);
+          for (my $_i165 = 0; $_i165 < $_size161; ++$_i165)
           {
-            my $elem196 = undef;
-            $elem196 = new Blur::Document();
-            $xfer += $elem196->read($input);
-            push(@{$self->{documents}},$elem196);
+            my $elem166 = undef;
+            $elem166 = new Blur::Document();
+            $xfer += $elem166->read($input);
+            push(@{$self->{documents}},$elem166);
           }
           $xfer += $input->readListEnd();
         }
@@ -4576,9 +4251,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{documents}}));
       {
-        foreach my $iter197 (@{$self->{documents}}) 
+        foreach my $iter167 (@{$self->{documents}}) 
         {
-          $xfer += ${iter197}->write($output);
+          $xfer += ${iter167}->write($output);
         }
       }
       $xfer += $output->writeListEnd();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/interface/gen-rb/blur_types.rb
----------------------------------------------------------------------
diff --git a/interface/gen-rb/blur_types.rb b/interface/gen-rb/blur_types.rb
index 6d2dfcd..3bc06d8 100644
--- a/interface/gen-rb/blur_types.rb
+++ b/interface/gen-rb/blur_types.rb
@@ -424,63 +424,6 @@ module Blur
   end
 
   # 
-  class BlurResult
-    include ::Thrift::Struct, ::Thrift::Struct_Union
-    LOCATIONID = 1
-    SCORE = 2
-    FETCHRESULT = 3
-
-    FIELDS = {
-      # 
-      LOCATIONID => {:type => ::Thrift::Types::STRING, :name => 'locationId'},
-      # 
-      SCORE => {:type => ::Thrift::Types::DOUBLE, :name => 'score'},
-      # 
-      FETCHRESULT => {:type => ::Thrift::Types::STRUCT, :name => 'fetchResult', :class => ::Blur::FetchResult}
-    }
-
-    def struct_fields; FIELDS; end
-
-    def validate
-    end
-
-    ::Thrift::Struct.generate_accessors self
-  end
-
-  # 
-  class BlurResults
-    include ::Thrift::Struct, ::Thrift::Struct_Union
-    TOTALRESULTS = 1
-    SHARDINFO = 2
-    RESULTS = 3
-    FACETCOUNTS = 4
-    EXCEPTIONS = 5
-    QUERY = 6
-
-    FIELDS = {
-      # 
-      TOTALRESULTS => {:type => ::Thrift::Types::I64, :name => 'totalResults', :default => 0},
-      # 
-      SHARDINFO => {:type => ::Thrift::Types::MAP, :name => 'shardInfo', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::I64}},
-      # 
-      RESULTS => {:type => ::Thrift::Types::LIST, :name => 'results', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Blur::BlurResult}},
-      # 
-      FACETCOUNTS => {:type => ::Thrift::Types::LIST, :name => 'facetCounts', :element => {:type => ::Thrift::Types::I64}},
-      # 
-      EXCEPTIONS => {:type => ::Thrift::Types::LIST, :name => 'exceptions', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Blur::BlurException}},
-      # 
-      QUERY => {:type => ::Thrift::Types::STRUCT, :name => 'query', :class => ::Blur::BlurQuery}
-    }
-
-    def struct_fields; FIELDS; end
-
-    def validate
-    end
-
-    ::Thrift::Struct.generate_accessors self
-  end
-
-  # 
   class CpuTime
     include ::Thrift::Struct, ::Thrift::Struct_Union
     CPUTIME = 1

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java b/src/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
index 95c7db1..e6e23ec 100644
--- a/src/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
+++ b/src/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
@@ -34,7 +34,6 @@ import java.util.TreeSet;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLongArray;
 
 import org.apache.blur.analysis.BlurAnalyzer;
@@ -42,10 +41,6 @@ import org.apache.blur.concurrent.Executors;
 import org.apache.blur.log.Log;
 import org.apache.blur.log.LogFactory;
 import org.apache.blur.lucene.search.FacetQuery;
-import org.apache.blur.manager.results.BlurResultIterable;
-import org.apache.blur.manager.results.BlurResultIterableSearcher;
-import org.apache.blur.manager.results.MergerBlurResultIterable;
-import org.apache.blur.manager.status.QueryStatus;
 import org.apache.blur.manager.status.QueryStatusManager;
 import org.apache.blur.manager.writer.BlurIndex;
 import org.apache.blur.metrics.BlurMetrics;
@@ -60,10 +55,8 @@ import org.apache.blur.thrift.generated.FetchRowResult;
 import org.apache.blur.thrift.generated.Schema;
 import org.apache.blur.thrift.generated.ScoreType;
 import org.apache.blur.thrift.generated.Selector;
-import org.apache.blur.thrift.generated.SimpleQuery;
 import org.apache.blur.utils.BlurConstants;
 import org.apache.blur.utils.BlurExecutorCompletionService;
-import org.apache.blur.utils.BlurExecutorCompletionService.Cancel;
 import org.apache.blur.utils.BlurUtil;
 import org.apache.blur.utils.ForkJoin;
 import org.apache.blur.utils.ForkJoin.Merger;
@@ -85,7 +78,6 @@ import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.search.BooleanClause.Occur;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.Filter;
-import org.apache.lucene.search.FilteredQuery;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
@@ -287,53 +279,6 @@ public class IndexManager {
     return split[0];
   }
 
-  public BlurResultIterable query(final String table, final BlurQuery blurQuery, AtomicLongArray facetedCounts) throws Exception {
-    long s = System.nanoTime();
-    final AtomicBoolean running = new AtomicBoolean(true);
-    final QueryStatus status = _statusManager.newQueryStatus(table, blurQuery, _threadCount, running);
-    _blurMetrics.queriesExternal.incrementAndGet();
-    try {
-      Map<String, BlurIndex> blurIndexes;
-      try {
-        blurIndexes = _indexServer.getIndexes(table);
-      } catch (IOException e) {
-        LOG.error("Unknown error while trying to fetch index readers.", e);
-        throw new BException(e.getMessage(), e);
-      }
-      BlurAnalyzer analyzer = _indexServer.getAnalyzer(table);
-      ParallelCall<Entry<String, BlurIndex>, BlurResultIterable> call;
-      if (isSimpleQuery(blurQuery)) {
-        SimpleQuery simpleQuery = blurQuery.simpleQuery;
-        Filter preFilter = QueryParserUtil.parseFilter(table, simpleQuery.preSuperFilter, false, analyzer, _filterCache);
-        Filter postFilter = QueryParserUtil.parseFilter(table, simpleQuery.postSuperFilter, true, analyzer, _filterCache);
-        Query userQuery = QueryParserUtil.parseQuery(simpleQuery.queryStr, simpleQuery.superQueryOn, analyzer, postFilter, preFilter, getScoreType(simpleQuery.type));
-        Query facetedQuery = getFacetedQuery(blurQuery, userQuery, facetedCounts, analyzer);
-        call = new SimpleQueryParallelCall(running, table, status, _indexServer, facetedQuery, blurQuery.selector, _blurMetrics);
-      } else {
-        Query query = getQuery(blurQuery.expertQuery);
-        Filter filter = getFilter(blurQuery.expertQuery);
-        Query userQuery;
-        if (filter != null) {
-          userQuery = new FilteredQuery(query, filter);
-        } else {
-          userQuery = query;
-        }
-        Query facetedQuery = getFacetedQuery(blurQuery, userQuery, facetedCounts, analyzer);
-        call = new SimpleQueryParallelCall(running, table, status, _indexServer, facetedQuery, blurQuery.selector, _blurMetrics);
-      }
-      MergerBlurResultIterable merger = new MergerBlurResultIterable(blurQuery);
-      return ForkJoin.execute(_executor, blurIndexes.entrySet(), call, new Cancel() {
-        @Override
-        public void cancel() {
-          running.set(false);
-        }
-      }).merge(merger);
-    } finally {
-      _statusManager.removeStatus(status);
-      _queryMetrics.recordQuery(System.nanoTime() - s);
-    }
-  }
-
   private Filter getFilter(ExpertQuery expertQuery) throws BException {
     throw new BException("Expert query not supported", new Throwable());
   }
@@ -628,47 +573,6 @@ public class IndexManager {
     return _indexServer.getShardCount(table);
   }
 
-  public static class SimpleQueryParallelCall implements ParallelCall<Entry<String, BlurIndex>, BlurResultIterable> {
-
-    private String _table;
-    private QueryStatus _status;
-    private IndexServer _indexServer;
-    private Query _query;
-    private Selector _selector;
-    private BlurMetrics _blurMetrics;
-    private AtomicBoolean _running;
-
-    public SimpleQueryParallelCall(AtomicBoolean running, String table, QueryStatus status, IndexServer indexServer, Query query, Selector selector, BlurMetrics blurMetrics) {
-      _running = running;
-      _table = table;
-      _status = status;
-      _indexServer = indexServer;
-      _query = query;
-      _selector = selector;
-      _blurMetrics = blurMetrics;
-    }
-
-    @Override
-    public BlurResultIterable call(Entry<String, BlurIndex> entry) throws Exception {
-      _status.attachThread();
-      try {
-        BlurIndex index = entry.getValue();
-        IndexReader reader = index.getIndexReader();
-        String shard = entry.getKey();
-        // @TODO need to add escapable rewriter
-        // IndexReader escapeReader = EscapeRewrite.wrap(reader, _running);
-        // IndexSearcher searcher = new IndexSearcher(escapeReader);
-        IndexSearcher searcher = new IndexSearcher(reader);
-        searcher.setSimilarity(_indexServer.getSimilarity(_table));
-        Query rewrite = searcher.rewrite((Query) _query.clone());
-        return new BlurResultIterableSearcher(_running, rewrite, _table, shard, searcher, _selector, reader);
-      } finally {
-        _blurMetrics.queriesInternal.incrementAndGet();
-        _status.deattachThread();
-      }
-    }
-  }
-
   public void setThreadCount(int threadCount) {
     this._threadCount = threadCount;
   }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultComparator.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultComparator.java b/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultComparator.java
deleted file mode 100644
index 39f2f92..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultComparator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.apache.blur.manager.results;
-
-/**
- * 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 java.util.Comparator;
-
-import org.apache.blur.thrift.generated.BlurResult;
-
-
-public class BlurResultComparator implements Comparator<BlurResult> {
-
-  @Override
-  public int compare(BlurResult o1, BlurResult o2) {
-    int compare = Double.compare(o2.score, o1.score);
-    if (compare == 0) {
-      return o2.locationId.compareTo(o1.locationId);
-    }
-    return compare;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterable.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterable.java b/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterable.java
deleted file mode 100644
index 8514ae2..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterable.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.apache.blur.manager.results;
-
-/**
- * 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 java.io.IOException;
-import java.util.Map;
-
-import org.apache.blur.thrift.generated.BlurResult;
-
-
-public interface BlurResultIterable extends Iterable<BlurResult> {
-
-  void skipTo(long skipTo);
-
-  long getTotalResults();
-
-  Map<String, Long> getShardInfo();
-
-  void close() throws IOException;
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableMultiple.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableMultiple.java b/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableMultiple.java
deleted file mode 100644
index c3d3cc6..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableMultiple.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.apache.blur.manager.results;
-
-/**
- * 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 java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.apache.blur.thrift.generated.BlurResult;
-import org.apache.blur.utils.BlurConstants;
-import org.apache.blur.utils.PeekableIterator;
-
-
-public class BlurResultIterableMultiple implements BlurResultIterable {
-
-  private long totalResults;
-  private Map<String, Long> shardInfo = new TreeMap<String, Long>();
-  private long skipTo;
-  private List<BlurResultIterable> results = new ArrayList<BlurResultIterable>();
-
-  public void addBlurResultIterable(BlurResultIterable iterable) {
-    totalResults += iterable.getTotalResults();
-    shardInfo.putAll(iterable.getShardInfo());
-    results.add(iterable);
-  }
-
-  @Override
-  public Map<String, Long> getShardInfo() {
-    return shardInfo;
-  }
-
-  @Override
-  public long getTotalResults() {
-    return totalResults;
-  }
-
-  @Override
-  public void skipTo(long skipTo) {
-    this.skipTo = skipTo;
-  }
-
-  @Override
-  public Iterator<BlurResult> iterator() {
-    MultipleHitsIterator iterator = new MultipleHitsIterator(results);
-    long start = 0;
-    while (iterator.hasNext() && start < skipTo) {
-      iterator.next();
-      start++;
-    }
-    return iterator;
-  }
-
-  public static class MultipleHitsIterator implements Iterator<BlurResult> {
-
-    private List<PeekableIterator<BlurResult>> iterators = new ArrayList<PeekableIterator<BlurResult>>();
-    private int length;
-
-    public MultipleHitsIterator(List<BlurResultIterable> hits) {
-      for (BlurResultIterable hitsIterable : hits) {
-        iterators.add(new PeekableIterator<BlurResult>(hitsIterable.iterator()));
-      }
-      length = iterators.size();
-    }
-
-    @Override
-    public boolean hasNext() {
-      for (int i = 0; i < length; i++) {
-        if (iterators.get(i).hasNext()) {
-          return true;
-        }
-      }
-      return false;
-    }
-
-    @Override
-    public BlurResult next() {
-      Collections.sort(iterators, BlurConstants.HITS_PEEKABLE_ITERATOR_COMPARATOR);
-      return fetchResult(iterators.get(0).next());
-    }
-
-    public BlurResult fetchResult(BlurResult next) {
-      return next;
-    }
-
-    @Override
-    public void remove() {
-
-    }
-  }
-
-  @Override
-  public void close() throws IOException {
-    for (BlurResultIterable it : results) {
-      it.close();
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableSearcher.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableSearcher.java b/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableSearcher.java
deleted file mode 100644
index 0a0786d..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableSearcher.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.apache.blur.manager.results;
-
-/**
- * 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 java.io.IOException;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.blur.log.Log;
-import org.apache.blur.log.LogFactory;
-import org.apache.blur.lucene.search.IterablePaging;
-import org.apache.blur.lucene.search.IterablePaging.ProgressRef;
-import org.apache.blur.lucene.search.IterablePaging.TotalHitsRef;
-import org.apache.blur.manager.IndexManager;
-import org.apache.blur.thrift.generated.BlurException;
-import org.apache.blur.thrift.generated.BlurResult;
-import org.apache.blur.thrift.generated.FetchResult;
-import org.apache.blur.thrift.generated.Selector;
-import org.apache.blur.utils.Converter;
-import org.apache.blur.utils.IteratorConverter;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.ScoreDoc;
-
-
-public class BlurResultIterableSearcher implements BlurResultIterable {
-
-  private static final Log LOG = LogFactory.getLog(BlurResultIterableSearcher.class);
-
-  private Map<String, Long> _shardInfo = new TreeMap<String, Long>();
-  private String _shard;
-  private long _skipTo;
-  private String _table;
-  private int _fetchCount = 1000;
-
-  private IteratorConverter<ScoreDoc, BlurResult> _iterator;
-  private Selector _selector;
-  private Query _query;
-  private IndexSearcher _searcher;
-  private TotalHitsRef _totalHitsRef = new TotalHitsRef();
-  private ProgressRef _progressRef = new ProgressRef();
-  private AtomicBoolean _running;
-  private IndexReader _reader;
-
-  public BlurResultIterableSearcher(AtomicBoolean running, Query query, String table, String shard, IndexSearcher searcher, Selector selector, IndexReader reader)
-      throws IOException {
-    _running = running;
-    _table = table;
-    _query = query;
-    _shard = shard;
-    _searcher = searcher;
-    _selector = selector;
-    _reader = reader;
-    performSearch();
-  }
-
-  private void performSearch() throws IOException {
-    IterablePaging iterablePaging = new IterablePaging(_running, _searcher, _query, _fetchCount, _totalHitsRef, _progressRef);
-    _iterator = new IteratorConverter<ScoreDoc, BlurResult>(iterablePaging.iterator(), new Converter<ScoreDoc, BlurResult>() {
-      @Override
-      public BlurResult convert(ScoreDoc scoreDoc) throws Exception {
-        String resolveId = resolveId(scoreDoc.doc);
-        return new BlurResult(resolveId, scoreDoc.score, getFetchResult(resolveId));
-      }
-    });
-    _shardInfo.put(_shard, (long) _totalHitsRef.totalHits());
-  }
-
-  private FetchResult getFetchResult(String resolveId) throws IOException, BlurException {
-    if (_selector == null) {
-      return null;
-    }
-    FetchResult fetchResult = new FetchResult();
-    _selector.setLocationId(resolveId);
-    IndexManager.validSelector(_selector);
-    IndexManager.fetchRow(_searcher.getIndexReader(), _table, _selector, fetchResult);
-    return fetchResult;
-  }
-
-  @Override
-  public Map<String, Long> getShardInfo() {
-    return _shardInfo;
-  }
-
-  @Override
-  public long getTotalResults() {
-    return _totalHitsRef.totalHits();
-  }
-
-  @Override
-  public void skipTo(long skipTo) {
-    _skipTo = skipTo;
-  }
-
-  @Override
-  public Iterator<BlurResult> iterator() {
-    long start = 0;
-    while (_iterator.hasNext() && start < _skipTo) {
-      _iterator.next();
-      start++;
-    }
-    return _iterator;
-  }
-
-  private String resolveId(int docId) {
-    return _shard + "/" + docId;
-  }
-
-  @Override
-  public void close() throws IOException {
-    if (_reader != null) {
-      int refCount = _reader.getRefCount();
-      _reader.decRef();
-      LOG.debug("Decrementing reader old ref [{0}] new ref count [{1}]", refCount, _reader.getRefCount());
-      _reader = null;
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableSimple.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableSimple.java b/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableSimple.java
deleted file mode 100644
index 3158576..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableSimple.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.apache.blur.manager.results;
-
-/**
- * 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 java.io.IOException;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.apache.blur.thrift.generated.BlurResult;
-import org.apache.blur.utils.BlurConstants;
-
-
-public class BlurResultIterableSimple implements BlurResultIterable {
-
-  private List<BlurResult> results;
-  private Map<String, Long> shardInfo;
-  private long skipTo;
-
-  public BlurResultIterableSimple(String shard, List<BlurResult> hits) {
-    Collections.sort(hits, BlurConstants.HITS_COMPARATOR);
-    this.results = hits;
-    this.shardInfo = new TreeMap<String, Long>();
-    this.shardInfo.put(shard, (long) hits.size());
-  }
-
-  @Override
-  public Map<String, Long> getShardInfo() {
-    return shardInfo;
-  }
-
-  @Override
-  public long getTotalResults() {
-    return results.size();
-  }
-
-  @Override
-  public void skipTo(long skipTo) {
-    this.skipTo = skipTo;
-  }
-
-  @Override
-  public Iterator<BlurResult> iterator() {
-    long start = 0;
-    Iterator<BlurResult> iterator = results.iterator();
-    while (iterator.hasNext() && start < skipTo) {
-      iterator.next();
-      start++;
-    }
-    return iterator;
-  }
-
-  @Override
-  public void close() throws IOException {
-    // do nothing
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultPeekableIteratorComparator.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultPeekableIteratorComparator.java b/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultPeekableIteratorComparator.java
deleted file mode 100644
index c41fac4..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultPeekableIteratorComparator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.apache.blur.manager.results;
-
-/**
- * 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 java.util.Comparator;
-
-import org.apache.blur.thrift.generated.BlurResult;
-import org.apache.blur.utils.PeekableIterator;
-
-
-public class BlurResultPeekableIteratorComparator implements Comparator<PeekableIterator<BlurResult>> {
-
-  @Override
-  public int compare(PeekableIterator<BlurResult> o1, PeekableIterator<BlurResult> o2) {
-    BlurResult result1 = o1.peek();
-    BlurResult result2 = o2.peek();
-    if (result1 == null && result2 == null) {
-      return 0;
-    } else if (result1 == null) {
-      return 1;
-    } else if (result2 == null) {
-      return -1;
-    }
-    int compare = Double.compare(result2.score, result1.score);
-    if (compare == 0) {
-      return result2.locationId.compareTo(result1.locationId);
-    }
-    return compare;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-core/src/main/java/org/apache/blur/manager/results/MergerBlurResultIterable.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/results/MergerBlurResultIterable.java b/src/blur-core/src/main/java/org/apache/blur/manager/results/MergerBlurResultIterable.java
deleted file mode 100644
index f0d4479..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/manager/results/MergerBlurResultIterable.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.apache.blur.manager.results;
-
-/**
- * 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 java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.blur.log.Log;
-import org.apache.blur.log.LogFactory;
-import org.apache.blur.thrift.generated.BlurException;
-import org.apache.blur.thrift.generated.BlurQuery;
-import org.apache.blur.utils.BlurExecutorCompletionService;
-import org.apache.blur.utils.ForkJoin.Merger;
-
-
-public class MergerBlurResultIterable implements Merger<BlurResultIterable> {
-
-  private static Log LOG = LogFactory.getLog(MergerBlurResultIterable.class);
-
-  private long _minimumNumberOfResults;
-  private long _maxQueryTime;
-  private BlurQuery _blurQuery;
-
-  public MergerBlurResultIterable(BlurQuery blurQuery) {
-    _blurQuery = blurQuery;
-    _minimumNumberOfResults = blurQuery.minimumNumberOfResults;
-    _maxQueryTime = blurQuery.maxQueryTime;
-  }
-
-  @Override
-  public BlurResultIterable merge(BlurExecutorCompletionService<BlurResultIterable> service) throws BlurException {
-    BlurResultIterableMultiple iterable = new BlurResultIterableMultiple();
-    while (service.getRemainingCount() > 0) {
-      Future<BlurResultIterable> future = service.poll(_maxQueryTime, TimeUnit.MILLISECONDS, true, _blurQuery);
-      if (future != null) {
-        BlurResultIterable blurResultIterable = service.getResultThrowException(future, _blurQuery);
-        iterable.addBlurResultIterable(blurResultIterable);
-        if (iterable.getTotalResults() >= _minimumNumberOfResults) {
-          service.cancelAll();// Called to stop execution of any other running
-                              // queries.
-          return iterable;
-        }
-      } else {
-        LOG.info("Query timeout with max query time of [{2}] for query [{1}].", _maxQueryTime, _blurQuery);
-        throw new BlurException("Query timeout with max query time of [" + _maxQueryTime + "] for query [" + _blurQuery + "].", null);
-      }
-    }
-    return iterable;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java b/src/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java
index 856a8d7..4c321e1 100644
--- a/src/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java
+++ b/src/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java
@@ -57,7 +57,6 @@ import org.apache.blur.utils.BlurUtil;
 import org.apache.blur.utils.ForkJoin;
 import org.apache.blur.utils.ForkJoin.Merger;
 import org.apache.blur.utils.ForkJoin.ParallelCall;
-import org.apache.blur.utils.QueryCache;
 import org.apache.blur.zookeeper.WatchChildren;
 import org.apache.blur.zookeeper.WatchChildren.OnChange;
 import org.apache.blur.zookeeper.WatchNodeExistance;
@@ -96,7 +95,6 @@ public class BlurControllerServer extends TableAdmin implements Iface {
   private int _remoteFetchCount = 100;
   private long _maxTimeToLive = TimeUnit.MINUTES.toMillis(1);
   private int _maxQueryCacheElements = 128;
-  private QueryCache _queryCache;
   private BlurQueryChecker _queryChecker;
   private AtomicBoolean _running = new AtomicBoolean();
 
@@ -120,7 +118,6 @@ public class BlurControllerServer extends TableAdmin implements Iface {
   public void init() throws KeeperException, InterruptedException {
     setupZookeeper();
     registerMyself();
-    _queryCache = new QueryCache("controller-cache", _maxQueryCacheElements, _maxTimeToLive);
     _executor = Executors.newThreadPool(CONTROLLER_THREAD_POOL, _threadCount);
     _running.set(true);
     watchForClusterChanges();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java b/src/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java
index 0e56c87..c8be02d 100644
--- a/src/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java
+++ b/src/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java
@@ -62,7 +62,6 @@ import org.apache.blur.thrift.generated.UpdatePackage;
 import org.apache.blur.thrift.lucene.Convert;
 import org.apache.blur.utils.BlurConstants;
 import org.apache.blur.utils.BlurUtil;
-import org.apache.blur.utils.QueryCache;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.Filter;
 import org.apache.lucene.search.IndexSearcher;
@@ -79,7 +78,6 @@ public class BlurShardServer extends TableAdmin implements Iface {
   private boolean _closed;
   private long _maxTimeToLive = TimeUnit.MINUTES.toMillis(1);
   private int _maxQueryCacheElements = 128;
-  private QueryCache _queryCache;
   private BlurQueryChecker _queryChecker;
   private ExecutorService _dataFetch;
   private ExecutorService _indexSearcherExecutor;
@@ -88,7 +86,6 @@ public class BlurShardServer extends TableAdmin implements Iface {
   private int _dataFetchThreadCount = 32;
 
   public void init() throws BlurException {
-    _queryCache = new QueryCache("shard-cache", _maxQueryCacheElements, _maxTimeToLive);
     _dataFetch = Executors.newThreadPool("data-fetch-", _dataFetchThreadCount);
     _indexSearcherExecutor = Executors.newThreadPool("index-searcher-", 16);
     _searchExecutor = Executors.newThreadPool("search-", 16);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-core/src/main/java/org/apache/blur/utils/BlurConstants.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/utils/BlurConstants.java b/src/blur-core/src/main/java/org/apache/blur/utils/BlurConstants.java
index 6158b8e..650f3c3 100644
--- a/src/blur-core/src/main/java/org/apache/blur/utils/BlurConstants.java
+++ b/src/blur-core/src/main/java/org/apache/blur/utils/BlurConstants.java
@@ -17,13 +17,9 @@ package org.apache.blur.utils;
  * limitations under the License.
  */
 import java.io.IOException;
-import java.util.Comparator;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.blur.BlurConfiguration;
-import org.apache.blur.manager.results.BlurResultComparator;
-import org.apache.blur.manager.results.BlurResultPeekableIteratorComparator;
-import org.apache.blur.thrift.generated.BlurResult;
 import org.apache.lucene.index.Term;
 
 
@@ -32,8 +28,6 @@ public class BlurConstants {
   public static final String CONTROLLER = "controller";
   public static final String SHARD = "shard";
   public static final String SHARD_PREFIX = "shard-";
-  public static final Comparator<? super PeekableIterator<BlurResult>> HITS_PEEKABLE_ITERATOR_COMPARATOR = new BlurResultPeekableIteratorComparator();
-  public static final Comparator<? super BlurResult> HITS_COMPARATOR = new BlurResultComparator();
 
   public static final String PRIME_DOC = "_prime_";
   public static final String PRIME_DOC_VALUE = "true";

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-core/src/main/java/org/apache/blur/utils/QueryCache.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/utils/QueryCache.java b/src/blur-core/src/main/java/org/apache/blur/utils/QueryCache.java
deleted file mode 100644
index 7d5eff2..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/utils/QueryCache.java
+++ /dev/null
@@ -1,107 +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 java.util.SortedSet;
-
-import org.apache.blur.log.Log;
-import org.apache.blur.log.LogFactory;
-import org.apache.blur.thrift.generated.BlurQuery;
-import org.apache.blur.thrift.generated.BlurResults;
-
-import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
-import com.googlecode.concurrentlinkedhashmap.EvictionListener;
-
-public class QueryCache implements EvictionListener<QueryCacheKey, QueryCacheEntry> {
-
-  private static final Log LOG = LogFactory.getLog(QueryCache.class);
-
-  private long _ttl;
-  private String _name;
-  private int _cachedElements;
-  private ConcurrentLinkedHashMap<QueryCacheKey, QueryCacheEntry> _cache;
-
-  public QueryCache(String name, int cachedElements, long ttl) {
-    _name = name;
-    _cachedElements = cachedElements;
-    _ttl = ttl;
-    _cache = new ConcurrentLinkedHashMap.Builder<QueryCacheKey, QueryCacheEntry>().maximumWeightedCapacity(_cachedElements).listener(this).build();
-  }
-
-  @Override
-  public void onEviction(QueryCacheKey key, QueryCacheEntry value) {
-    LOG.debug("Cache [" + _name + "] key [" + key + "] value [" + value + "] evicted.");
-  }
-
-  @SuppressWarnings("deprecation")
-  public static QueryCacheKey getNormalizedBlurQueryKey(String table, BlurQuery blurQuery) {
-    BlurQuery newBlurQuery = new BlurQuery(blurQuery);
-    newBlurQuery.allowStaleData = false;
-    newBlurQuery.useCacheIfPresent = false;
-    newBlurQuery.userContext = null;
-    newBlurQuery.maxQueryTime = 0;
-    newBlurQuery.uuid = 0;
-    newBlurQuery.startTime = 0;
-    newBlurQuery.modifyFileCaches = false;
-    return new QueryCacheKey(table, newBlurQuery);
-  }
-
-  public boolean isValid(QueryCacheEntry entry, SortedSet<String> currentShards) {
-    if (!isValid(entry)) {
-      return false;
-    }
-    if (!entry.shards.equals(currentShards)) {
-      return false;
-    }
-    return true;
-  }
-
-  public boolean isValid(QueryCacheEntry entry) {
-    if (entry == null) {
-      return false;
-    }
-    if (entry.timestamp + _ttl < System.currentTimeMillis()) {
-      return false;
-    }
-    return true;
-  }
-
-  public BlurResults cache(String table, BlurQuery original, BlurResults results) {
-    if (results == null) {
-      return null;
-    }
-    if (original != null && original.cacheResult) {
-      LOG.debug("Caching results for query [{0}]", original);
-      BlurResults cacheResults = new BlurResults(results);
-      cacheResults.query = null;
-      put(getNormalizedBlurQueryKey(table, original), new QueryCacheEntry(cacheResults));
-    }
-    return results;
-  }
-
-  public void put(QueryCacheKey key, QueryCacheEntry value) {
-    _cache.put(key, value);
-  }
-
-  public QueryCacheEntry get(QueryCacheKey key) {
-    return _cache.get(key);
-  }
-
-  public void remove(QueryCacheKey key) {
-    _cache.remove(key);
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-core/src/main/java/org/apache/blur/utils/QueryCacheEntry.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/utils/QueryCacheEntry.java b/src/blur-core/src/main/java/org/apache/blur/utils/QueryCacheEntry.java
deleted file mode 100644
index 8b66f46..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/utils/QueryCacheEntry.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 java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.apache.blur.thrift.generated.BlurQuery;
-import org.apache.blur.thrift.generated.BlurResults;
-
-
-public class QueryCacheEntry {
-  public BlurResults results;
-  public long timestamp;
-  public SortedSet<String> shards;
-
-  public QueryCacheEntry(BlurResults cacheResults) {
-    results = cacheResults;
-    timestamp = System.currentTimeMillis();
-    if (cacheResults != null && cacheResults.shardInfo != null) {
-      shards = new TreeSet<String>(cacheResults.shardInfo.keySet());
-    } else {
-      shards = new TreeSet<String>();
-    }
-  }
-
-  public BlurResults getBlurResults(BlurQuery blurQuery) {
-    BlurResults blurResults = new BlurResults(results);
-    blurResults.query = blurQuery;
-    return blurResults;
-  }
-}


Mime
View raw message