incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [23/50] [abbrv] Removed old BlurQuery.
Date Wed, 07 Nov 2012 02:26:55 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/06bb66eb/interface/gen-perl/Blur/ShardServer.pm
----------------------------------------------------------------------
diff --git a/interface/gen-perl/Blur/ShardServer.pm b/interface/gen-perl/Blur/ShardServer.pm
index 8236468..e83f9b4 100644
--- a/interface/gen-perl/Blur/ShardServer.pm
+++ b/interface/gen-perl/Blur/ShardServer.pm
@@ -281,16 +281,16 @@ sub read {
       {
         /^0$/ && do{        if ($ftype == TType::LIST) {
           {
-            my $_size235 = 0;
+            my $_size228 = 0;
             $self->{success} = [];
-            my $_etype238 = 0;
-            $xfer += $input->readListBegin(\$_etype238, \$_size235);
-            for (my $_i239 = 0; $_i239 < $_size235; ++$_i239)
+            my $_etype231 = 0;
+            $xfer += $input->readListBegin(\$_etype231, \$_size228);
+            for (my $_i232 = 0; $_i232 < $_size228; ++$_i232)
             {
-              my $elem240 = undef;
-              $elem240 = new Blur::TopFieldDocs();
-              $xfer += $elem240->read($input);
-              push(@{$self->{success}},$elem240);
+              my $elem233 = undef;
+              $elem233 = new Blur::TopFieldDocs();
+              $xfer += $elem233->read($input);
+              push(@{$self->{success}},$elem233);
             }
             $xfer += $input->readListEnd();
           }
@@ -322,9 +322,9 @@ sub write {
       {
         $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{success}}));
         {
-          foreach my $iter241 (@{$self->{success}}) 
+          foreach my $iter234 (@{$self->{success}}) 
           {
-            $xfer += ${iter241}->write($output);
+            $xfer += ${iter234}->write($output);
           }
         }
         $xfer += $output->writeListEnd();
@@ -394,16 +394,16 @@ sub read {
         last; };
         /^2$/ && do{        if ($ftype == TType::LIST) {
           {
-            my $_size242 = 0;
+            my $_size235 = 0;
             $self->{docLocations} = [];
-            my $_etype245 = 0;
-            $xfer += $input->readListBegin(\$_etype245, \$_size242);
-            for (my $_i246 = 0; $_i246 < $_size242; ++$_i246)
+            my $_etype238 = 0;
+            $xfer += $input->readListBegin(\$_etype238, \$_size235);
+            for (my $_i239 = 0; $_i239 < $_size235; ++$_i239)
             {
-              my $elem247 = undef;
-              $elem247 = new Blur::DocLocation();
-              $xfer += $elem247->read($input);
-              push(@{$self->{docLocations}},$elem247);
+              my $elem240 = undef;
+              $elem240 = new Blur::DocLocation();
+              $xfer += $elem240->read($input);
+              push(@{$self->{docLocations}},$elem240);
             }
             $xfer += $input->readListEnd();
           }
@@ -413,15 +413,15 @@ sub read {
         last; };
         /^4$/ && do{        if ($ftype == TType::SET) {
           {
-            my $_size248 = 0;
+            my $_size241 = 0;
             $self->{fields} = {};
-            my $_etype251 = 0;
-            $xfer += $input->readSetBegin(\$_etype251, \$_size248);
-            for (my $_i252 = 0; $_i252 < $_size248; ++$_i252)
+            my $_etype244 = 0;
+            $xfer += $input->readSetBegin(\$_etype244, \$_size241);
+            for (my $_i245 = 0; $_i245 < $_size241; ++$_i245)
             {
-              my $elem253 = undef;
-              $xfer += $input->readString(\$elem253);
-              $self->{fields}->{$elem253} = 1;
+              my $elem246 = undef;
+              $xfer += $input->readString(\$elem246);
+              $self->{fields}->{$elem246} = 1;
             }
             $xfer += $input->readSetEnd();
           }
@@ -451,9 +451,9 @@ sub write {
       {
         $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{docLocations}}));
         {
-          foreach my $iter254 (@{$self->{docLocations}}) 
+          foreach my $iter247 (@{$self->{docLocations}}) 
           {
-            $xfer += ${iter254}->write($output);
+            $xfer += ${iter247}->write($output);
           }
         }
         $xfer += $output->writeListEnd();
@@ -465,9 +465,9 @@ sub write {
       {
         $xfer += $output->writeSetBegin(TType::STRING, scalar(@{$self->{fields}}));
         {
-          foreach my $iter255 (@{$self->{fields}})
+          foreach my $iter248 (@{$self->{fields}})
           {
-            $xfer += $output->writeString($iter255);
+            $xfer += $output->writeString($iter248);
           }
         }
         $xfer += $output->writeSetEnd();
@@ -521,16 +521,16 @@ sub read {
       {
         /^0$/ && do{        if ($ftype == TType::LIST) {
           {
-            my $_size256 = 0;
+            my $_size249 = 0;
             $self->{success} = [];
-            my $_etype259 = 0;
-            $xfer += $input->readListBegin(\$_etype259, \$_size256);
-            for (my $_i260 = 0; $_i260 < $_size256; ++$_i260)
+            my $_etype252 = 0;
+            $xfer += $input->readListBegin(\$_etype252, \$_size249);
+            for (my $_i253 = 0; $_i253 < $_size249; ++$_i253)
             {
-              my $elem261 = undef;
-              $elem261 = new Blur::Document();
-              $xfer += $elem261->read($input);
-              push(@{$self->{success}},$elem261);
+              my $elem254 = undef;
+              $elem254 = new Blur::Document();
+              $xfer += $elem254->read($input);
+              push(@{$self->{success}},$elem254);
             }
             $xfer += $input->readListEnd();
           }
@@ -562,9 +562,9 @@ sub write {
       {
         $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{success}}));
         {
-          foreach my $iter262 (@{$self->{success}}) 
+          foreach my $iter255 (@{$self->{success}}) 
           {
-            $xfer += ${iter262}->write($output);
+            $xfer += ${iter255}->write($output);
           }
         }
         $xfer += $output->writeListEnd();
@@ -760,16 +760,16 @@ sub read {
         last; };
         /^2$/ && do{        if ($ftype == TType::LIST) {
           {
-            my $_size263 = 0;
+            my $_size256 = 0;
             $self->{documents} = [];
-            my $_etype266 = 0;
-            $xfer += $input->readListBegin(\$_etype266, \$_size263);
-            for (my $_i267 = 0; $_i267 < $_size263; ++$_i267)
+            my $_etype259 = 0;
+            $xfer += $input->readListBegin(\$_etype259, \$_size256);
+            for (my $_i260 = 0; $_i260 < $_size256; ++$_i260)
             {
-              my $elem268 = undef;
-              $elem268 = new Blur::Document();
-              $xfer += $elem268->read($input);
-              push(@{$self->{documents}},$elem268);
+              my $elem261 = undef;
+              $elem261 = new Blur::Document();
+              $xfer += $elem261->read($input);
+              push(@{$self->{documents}},$elem261);
             }
             $xfer += $input->readListEnd();
           }
@@ -799,9 +799,9 @@ sub write {
       {
         $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{documents}}));
         {
-          foreach my $iter269 (@{$self->{documents}}) 
+          foreach my $iter262 (@{$self->{documents}}) 
           {
-            $xfer += ${iter269}->write($output);
+            $xfer += ${iter262}->write($output);
           }
         }
         $xfer += $output->writeListEnd();
@@ -927,15 +927,15 @@ sub read {
         last; };
         /^2$/ && do{        if ($ftype == TType::LIST) {
           {
-            my $_size270 = 0;
+            my $_size263 = 0;
             $self->{queries} = [];
-            my $_etype273 = 0;
-            $xfer += $input->readListBegin(\$_etype273, \$_size270);
-            for (my $_i274 = 0; $_i274 < $_size270; ++$_i274)
+            my $_etype266 = 0;
+            $xfer += $input->readListBegin(\$_etype266, \$_size263);
+            for (my $_i267 = 0; $_i267 < $_size263; ++$_i267)
             {
-              my $elem275 = undef;
-              $xfer += $input->readString(\$elem275);
-              push(@{$self->{queries}},$elem275);
+              my $elem268 = undef;
+              $xfer += $input->readString(\$elem268);
+              push(@{$self->{queries}},$elem268);
             }
             $xfer += $input->readListEnd();
           }
@@ -965,9 +965,9 @@ sub write {
       {
         $xfer += $output->writeListBegin(TType::STRING, scalar(@{$self->{queries}}));
         {
-          foreach my $iter276 (@{$self->{queries}}) 
+          foreach my $iter269 (@{$self->{queries}}) 
           {
-            $xfer += $output->writeString($iter276);
+            $xfer += $output->writeString($iter269);
           }
         }
         $xfer += $output->writeListEnd();
@@ -1093,16 +1093,16 @@ sub read {
         last; };
         /^2$/ && do{        if ($ftype == TType::LIST) {
           {
-            my $_size277 = 0;
+            my $_size270 = 0;
             $self->{terms} = [];
-            my $_etype280 = 0;
-            $xfer += $input->readListBegin(\$_etype280, \$_size277);
-            for (my $_i281 = 0; $_i281 < $_size277; ++$_i281)
+            my $_etype273 = 0;
+            $xfer += $input->readListBegin(\$_etype273, \$_size270);
+            for (my $_i274 = 0; $_i274 < $_size270; ++$_i274)
             {
-              my $elem282 = undef;
-              $elem282 = new Blur::Term();
-              $xfer += $elem282->read($input);
-              push(@{$self->{terms}},$elem282);
+              my $elem275 = undef;
+              $elem275 = new Blur::Term();
+              $xfer += $elem275->read($input);
+              push(@{$self->{terms}},$elem275);
             }
             $xfer += $input->readListEnd();
           }
@@ -1132,9 +1132,9 @@ sub write {
       {
         $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{terms}}));
         {
-          foreach my $iter283 (@{$self->{terms}}) 
+          foreach my $iter276 (@{$self->{terms}}) 
           {
-            $xfer += ${iter283}->write($output);
+            $xfer += ${iter276}->write($output);
           }
         }
         $xfer += $output->writeListEnd();
@@ -1260,16 +1260,16 @@ sub read {
         last; };
         /^2$/ && do{        if ($ftype == TType::LIST) {
           {
-            my $_size284 = 0;
+            my $_size277 = 0;
             $self->{updatePackages} = [];
-            my $_etype287 = 0;
-            $xfer += $input->readListBegin(\$_etype287, \$_size284);
-            for (my $_i288 = 0; $_i288 < $_size284; ++$_i288)
+            my $_etype280 = 0;
+            $xfer += $input->readListBegin(\$_etype280, \$_size277);
+            for (my $_i281 = 0; $_i281 < $_size277; ++$_i281)
             {
-              my $elem289 = undef;
-              $elem289 = new Blur::UpdatePackage();
-              $xfer += $elem289->read($input);
-              push(@{$self->{updatePackages}},$elem289);
+              my $elem282 = undef;
+              $elem282 = new Blur::UpdatePackage();
+              $xfer += $elem282->read($input);
+              push(@{$self->{updatePackages}},$elem282);
             }
             $xfer += $input->readListEnd();
           }
@@ -1299,9 +1299,9 @@ sub write {
       {
         $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{updatePackages}}));
         {
-          foreach my $iter290 (@{$self->{updatePackages}}) 
+          foreach my $iter283 (@{$self->{updatePackages}}) 
           {
-            $xfer += ${iter290}->write($output);
+            $xfer += ${iter283}->write($output);
           }
         }
         $xfer += $output->writeListEnd();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/06bb66eb/interface/gen-perl/Blur/Types.pm
----------------------------------------------------------------------
diff --git a/interface/gen-perl/Blur/Types.pm b/interface/gen-perl/Blur/Types.pm
index 9369224..46476b3 100644
--- a/interface/gen-perl/Blur/Types.pm
+++ b/interface/gen-perl/Blur/Types.pm
@@ -1211,305 +1211,6 @@ sub write {
   return $xfer;
 }
 
-package Blur::BlurQuery;
-use base qw(Class::Accessor);
-Blur::BlurQuery->mk_accessors( qw( simpleQuery expertQuery facets selector allowStaleData useCacheIfPresent start fetch minimumNumberOfResults maxQueryTime uuid userContext cacheResult startTime modifyFileCaches ) );
-
-sub new {
-  my $classname = shift;
-  my $self      = {};
-  my $vals      = shift || {};
-  $self->{simpleQuery} = undef;
-  $self->{expertQuery} = undef;
-  $self->{facets} = undef;
-  $self->{selector} = undef;
-  $self->{allowStaleData} = 0;
-  $self->{useCacheIfPresent} = 1;
-  $self->{start} = 0;
-  $self->{fetch} = 10;
-  $self->{minimumNumberOfResults} = 9223372036854775807;
-  $self->{maxQueryTime} = 9223372036854775807;
-  $self->{uuid} = undef;
-  $self->{userContext} = undef;
-  $self->{cacheResult} = 1;
-  $self->{startTime} = 0;
-  $self->{modifyFileCaches} = 1;
-  if (UNIVERSAL::isa($vals,'HASH')) {
-    if (defined $vals->{simpleQuery}) {
-      $self->{simpleQuery} = $vals->{simpleQuery};
-    }
-    if (defined $vals->{expertQuery}) {
-      $self->{expertQuery} = $vals->{expertQuery};
-    }
-    if (defined $vals->{facets}) {
-      $self->{facets} = $vals->{facets};
-    }
-    if (defined $vals->{selector}) {
-      $self->{selector} = $vals->{selector};
-    }
-    if (defined $vals->{allowStaleData}) {
-      $self->{allowStaleData} = $vals->{allowStaleData};
-    }
-    if (defined $vals->{useCacheIfPresent}) {
-      $self->{useCacheIfPresent} = $vals->{useCacheIfPresent};
-    }
-    if (defined $vals->{start}) {
-      $self->{start} = $vals->{start};
-    }
-    if (defined $vals->{fetch}) {
-      $self->{fetch} = $vals->{fetch};
-    }
-    if (defined $vals->{minimumNumberOfResults}) {
-      $self->{minimumNumberOfResults} = $vals->{minimumNumberOfResults};
-    }
-    if (defined $vals->{maxQueryTime}) {
-      $self->{maxQueryTime} = $vals->{maxQueryTime};
-    }
-    if (defined $vals->{uuid}) {
-      $self->{uuid} = $vals->{uuid};
-    }
-    if (defined $vals->{userContext}) {
-      $self->{userContext} = $vals->{userContext};
-    }
-    if (defined $vals->{cacheResult}) {
-      $self->{cacheResult} = $vals->{cacheResult};
-    }
-    if (defined $vals->{startTime}) {
-      $self->{startTime} = $vals->{startTime};
-    }
-    if (defined $vals->{modifyFileCaches}) {
-      $self->{modifyFileCaches} = $vals->{modifyFileCaches};
-    }
-  }
-  return bless ($self, $classname);
-}
-
-sub getName {
-  return 'BlurQuery';
-}
-
-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::STRUCT) {
-        $self->{simpleQuery} = new Blur::SimpleQuery();
-        $xfer += $self->{simpleQuery}->read($input);
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^2$/ && do{      if ($ftype == TType::STRUCT) {
-        $self->{expertQuery} = new Blur::ExpertQuery();
-        $xfer += $self->{expertQuery}->read($input);
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^3$/ && do{      if ($ftype == TType::LIST) {
-        {
-          my $_size37 = 0;
-          $self->{facets} = [];
-          my $_etype40 = 0;
-          $xfer += $input->readListBegin(\$_etype40, \$_size37);
-          for (my $_i41 = 0; $_i41 < $_size37; ++$_i41)
-          {
-            my $elem42 = undef;
-            $elem42 = new Blur::Facet();
-            $xfer += $elem42->read($input);
-            push(@{$self->{facets}},$elem42);
-          }
-          $xfer += $input->readListEnd();
-        }
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^4$/ && do{      if ($ftype == TType::STRUCT) {
-        $self->{selector} = new Blur::Selector();
-        $xfer += $self->{selector}->read($input);
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^5$/ && do{      if ($ftype == TType::BOOL) {
-        $xfer += $input->readBool(\$self->{allowStaleData});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^6$/ && do{      if ($ftype == TType::BOOL) {
-        $xfer += $input->readBool(\$self->{useCacheIfPresent});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^7$/ && do{      if ($ftype == TType::I64) {
-        $xfer += $input->readI64(\$self->{start});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^8$/ && do{      if ($ftype == TType::I32) {
-        $xfer += $input->readI32(\$self->{fetch});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^9$/ && do{      if ($ftype == TType::I64) {
-        $xfer += $input->readI64(\$self->{minimumNumberOfResults});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^10$/ && do{      if ($ftype == TType::I64) {
-        $xfer += $input->readI64(\$self->{maxQueryTime});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^11$/ && do{      if ($ftype == TType::I64) {
-        $xfer += $input->readI64(\$self->{uuid});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^12$/ && do{      if ($ftype == TType::STRING) {
-        $xfer += $input->readString(\$self->{userContext});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^13$/ && do{      if ($ftype == TType::BOOL) {
-        $xfer += $input->readBool(\$self->{cacheResult});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^14$/ && do{      if ($ftype == TType::I64) {
-        $xfer += $input->readI64(\$self->{startTime});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^15$/ && do{      if ($ftype == TType::BOOL) {
-        $xfer += $input->readBool(\$self->{modifyFileCaches});
-      } 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('BlurQuery');
-  if (defined $self->{simpleQuery}) {
-    $xfer += $output->writeFieldBegin('simpleQuery', TType::STRUCT, 1);
-    $xfer += $self->{simpleQuery}->write($output);
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{expertQuery}) {
-    $xfer += $output->writeFieldBegin('expertQuery', TType::STRUCT, 2);
-    $xfer += $self->{expertQuery}->write($output);
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{facets}) {
-    $xfer += $output->writeFieldBegin('facets', TType::LIST, 3);
-    {
-      $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{facets}}));
-      {
-        foreach my $iter43 (@{$self->{facets}}) 
-        {
-          $xfer += ${iter43}->write($output);
-        }
-      }
-      $xfer += $output->writeListEnd();
-    }
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{selector}) {
-    $xfer += $output->writeFieldBegin('selector', TType::STRUCT, 4);
-    $xfer += $self->{selector}->write($output);
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{allowStaleData}) {
-    $xfer += $output->writeFieldBegin('allowStaleData', TType::BOOL, 5);
-    $xfer += $output->writeBool($self->{allowStaleData});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{useCacheIfPresent}) {
-    $xfer += $output->writeFieldBegin('useCacheIfPresent', TType::BOOL, 6);
-    $xfer += $output->writeBool($self->{useCacheIfPresent});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{start}) {
-    $xfer += $output->writeFieldBegin('start', TType::I64, 7);
-    $xfer += $output->writeI64($self->{start});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{fetch}) {
-    $xfer += $output->writeFieldBegin('fetch', TType::I32, 8);
-    $xfer += $output->writeI32($self->{fetch});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{minimumNumberOfResults}) {
-    $xfer += $output->writeFieldBegin('minimumNumberOfResults', TType::I64, 9);
-    $xfer += $output->writeI64($self->{minimumNumberOfResults});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{maxQueryTime}) {
-    $xfer += $output->writeFieldBegin('maxQueryTime', TType::I64, 10);
-    $xfer += $output->writeI64($self->{maxQueryTime});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{uuid}) {
-    $xfer += $output->writeFieldBegin('uuid', TType::I64, 11);
-    $xfer += $output->writeI64($self->{uuid});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{userContext}) {
-    $xfer += $output->writeFieldBegin('userContext', TType::STRING, 12);
-    $xfer += $output->writeString($self->{userContext});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{cacheResult}) {
-    $xfer += $output->writeFieldBegin('cacheResult', TType::BOOL, 13);
-    $xfer += $output->writeBool($self->{cacheResult});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{startTime}) {
-    $xfer += $output->writeFieldBegin('startTime', TType::I64, 14);
-    $xfer += $output->writeI64($self->{startTime});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{modifyFileCaches}) {
-    $xfer += $output->writeFieldBegin('modifyFileCaches', TType::BOOL, 15);
-    $xfer += $output->writeBool($self->{modifyFileCaches});
-    $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 ) );
@@ -1591,22 +1292,18 @@ sub write {
 
 package Blur::BlurQueryStatus;
 use base qw(Class::Accessor);
-Blur::BlurQueryStatus->mk_accessors( qw( query cpuTimes completeShards totalShards state uuid ) );
+Blur::BlurQueryStatus->mk_accessors( qw( cpuTimes completeShards totalShards state uuid ) );
 
 sub new {
   my $classname = shift;
   my $self      = {};
   my $vals      = shift || {};
-  $self->{query} = undef;
   $self->{cpuTimes} = undef;
   $self->{completeShards} = undef;
   $self->{totalShards} = undef;
   $self->{state} = undef;
   $self->{uuid} = undef;
   if (UNIVERSAL::isa($vals,'HASH')) {
-    if (defined $vals->{query}) {
-      $self->{query} = $vals->{query};
-    }
     if (defined $vals->{cpuTimes}) {
       $self->{cpuTimes} = $vals->{cpuTimes};
     }
@@ -1645,28 +1342,21 @@ sub read {
     }
     SWITCH: for($fid)
     {
-      /^1$/ && do{      if ($ftype == TType::STRUCT) {
-        $self->{query} = new Blur::BlurQuery();
-        $xfer += $self->{query}->read($input);
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
       /^2$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size44 = 0;
+          my $_size37 = 0;
           $self->{cpuTimes} = {};
-          my $_ktype45 = 0;
-          my $_vtype46 = 0;
-          $xfer += $input->readMapBegin(\$_ktype45, \$_vtype46, \$_size44);
-          for (my $_i48 = 0; $_i48 < $_size44; ++$_i48)
+          my $_ktype38 = 0;
+          my $_vtype39 = 0;
+          $xfer += $input->readMapBegin(\$_ktype38, \$_vtype39, \$_size37);
+          for (my $_i41 = 0; $_i41 < $_size37; ++$_i41)
           {
-            my $key49 = '';
-            my $val50 = new Blur::CpuTime();
-            $xfer += $input->readString(\$key49);
-            $val50 = new Blur::CpuTime();
-            $xfer += $val50->read($input);
-            $self->{cpuTimes}->{$key49} = $val50;
+            my $key42 = '';
+            my $val43 = new Blur::CpuTime();
+            $xfer += $input->readString(\$key42);
+            $val43 = new Blur::CpuTime();
+            $xfer += $val43->read($input);
+            $self->{cpuTimes}->{$key42} = $val43;
           }
           $xfer += $input->readMapEnd();
         }
@@ -1710,20 +1400,15 @@ sub write {
   my ($self, $output) = @_;
   my $xfer   = 0;
   $xfer += $output->writeStructBegin('BlurQueryStatus');
-  if (defined $self->{query}) {
-    $xfer += $output->writeFieldBegin('query', TType::STRUCT, 1);
-    $xfer += $self->{query}->write($output);
-    $xfer += $output->writeFieldEnd();
-  }
   if (defined $self->{cpuTimes}) {
     $xfer += $output->writeFieldBegin('cpuTimes', TType::MAP, 2);
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRUCT, scalar(keys %{$self->{cpuTimes}}));
       {
-        while( my ($kiter51,$viter52) = each %{$self->{cpuTimes}}) 
+        while( my ($kiter44,$viter45) = each %{$self->{cpuTimes}}) 
         {
-          $xfer += $output->writeString($kiter51);
-          $xfer += ${viter52}->write($output);
+          $xfer += $output->writeString($kiter44);
+          $xfer += ${viter45}->write($output);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -1927,30 +1612,30 @@ sub read {
       last; };
       /^2$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size53 = 0;
+          my $_size46 = 0;
           $self->{columnFamilies} = {};
-          my $_ktype54 = 0;
-          my $_vtype55 = 0;
-          $xfer += $input->readMapBegin(\$_ktype54, \$_vtype55, \$_size53);
-          for (my $_i57 = 0; $_i57 < $_size53; ++$_i57)
+          my $_ktype47 = 0;
+          my $_vtype48 = 0;
+          $xfer += $input->readMapBegin(\$_ktype47, \$_vtype48, \$_size46);
+          for (my $_i50 = 0; $_i50 < $_size46; ++$_i50)
           {
-            my $key58 = '';
-            my $val59 = [];
-            $xfer += $input->readString(\$key58);
+            my $key51 = '';
+            my $val52 = [];
+            $xfer += $input->readString(\$key51);
             {
-              my $_size60 = 0;
-              $val59 = {};
-              my $_etype63 = 0;
-              $xfer += $input->readSetBegin(\$_etype63, \$_size60);
-              for (my $_i64 = 0; $_i64 < $_size60; ++$_i64)
+              my $_size53 = 0;
+              $val52 = {};
+              my $_etype56 = 0;
+              $xfer += $input->readSetBegin(\$_etype56, \$_size53);
+              for (my $_i57 = 0; $_i57 < $_size53; ++$_i57)
               {
-                my $elem65 = undef;
-                $xfer += $input->readString(\$elem65);
-                $val59->{$elem65} = 1;
+                my $elem58 = undef;
+                $xfer += $input->readString(\$elem58);
+                $val52->{$elem58} = 1;
               }
               $xfer += $input->readSetEnd();
             }
-            $self->{columnFamilies}->{$key58} = $val59;
+            $self->{columnFamilies}->{$key51} = $val52;
           }
           $xfer += $input->readMapEnd();
         }
@@ -1980,15 +1665,15 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::SET, scalar(keys %{$self->{columnFamilies}}));
       {
-        while( my ($kiter66,$viter67) = each %{$self->{columnFamilies}}) 
+        while( my ($kiter59,$viter60) = each %{$self->{columnFamilies}}) 
         {
-          $xfer += $output->writeString($kiter66);
+          $xfer += $output->writeString($kiter59);
           {
-            $xfer += $output->writeSetBegin(TType::STRING, scalar(@{${viter67}}));
+            $xfer += $output->writeSetBegin(TType::STRING, scalar(@{${viter60}}));
             {
-              foreach my $iter68 (@{${viter67}})
+              foreach my $iter61 (@{${viter60}})
               {
-                $xfer += $output->writeString($iter68);
+                $xfer += $output->writeString($iter61);
               }
             }
             $xfer += $output->writeSetEnd();
@@ -2126,19 +1811,19 @@ sub read {
       last; };
       /^3$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size69 = 0;
+          my $_size62 = 0;
           $self->{alternateColumnDefinitions} = {};
-          my $_ktype70 = 0;
-          my $_vtype71 = 0;
-          $xfer += $input->readMapBegin(\$_ktype70, \$_vtype71, \$_size69);
-          for (my $_i73 = 0; $_i73 < $_size69; ++$_i73)
+          my $_ktype63 = 0;
+          my $_vtype64 = 0;
+          $xfer += $input->readMapBegin(\$_ktype63, \$_vtype64, \$_size62);
+          for (my $_i66 = 0; $_i66 < $_size62; ++$_i66)
           {
-            my $key74 = '';
-            my $val75 = new Blur::AlternateColumnDefinition();
-            $xfer += $input->readString(\$key74);
-            $val75 = new Blur::AlternateColumnDefinition();
-            $xfer += $val75->read($input);
-            $self->{alternateColumnDefinitions}->{$key74} = $val75;
+            my $key67 = '';
+            my $val68 = new Blur::AlternateColumnDefinition();
+            $xfer += $input->readString(\$key67);
+            $val68 = new Blur::AlternateColumnDefinition();
+            $xfer += $val68->read($input);
+            $self->{alternateColumnDefinitions}->{$key67} = $val68;
           }
           $xfer += $input->readMapEnd();
         }
@@ -2173,10 +1858,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRUCT, scalar(keys %{$self->{alternateColumnDefinitions}}));
       {
-        while( my ($kiter76,$viter77) = each %{$self->{alternateColumnDefinitions}}) 
+        while( my ($kiter69,$viter70) = each %{$self->{alternateColumnDefinitions}}) 
         {
-          $xfer += $output->writeString($kiter76);
-          $xfer += ${viter77}->write($output);
+          $xfer += $output->writeString($kiter69);
+          $xfer += ${viter70}->write($output);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -2237,19 +1922,19 @@ sub read {
       last; };
       /^2$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size78 = 0;
+          my $_size71 = 0;
           $self->{columnDefinitions} = {};
-          my $_ktype79 = 0;
-          my $_vtype80 = 0;
-          $xfer += $input->readMapBegin(\$_ktype79, \$_vtype80, \$_size78);
-          for (my $_i82 = 0; $_i82 < $_size78; ++$_i82)
+          my $_ktype72 = 0;
+          my $_vtype73 = 0;
+          $xfer += $input->readMapBegin(\$_ktype72, \$_vtype73, \$_size71);
+          for (my $_i75 = 0; $_i75 < $_size71; ++$_i75)
           {
-            my $key83 = '';
-            my $val84 = new Blur::ColumnDefinition();
-            $xfer += $input->readString(\$key83);
-            $val84 = new Blur::ColumnDefinition();
-            $xfer += $val84->read($input);
-            $self->{columnDefinitions}->{$key83} = $val84;
+            my $key76 = '';
+            my $val77 = new Blur::ColumnDefinition();
+            $xfer += $input->readString(\$key76);
+            $val77 = new Blur::ColumnDefinition();
+            $xfer += $val77->read($input);
+            $self->{columnDefinitions}->{$key76} = $val77;
           }
           $xfer += $input->readMapEnd();
         }
@@ -2279,10 +1964,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRUCT, scalar(keys %{$self->{columnDefinitions}}));
       {
-        while( my ($kiter85,$viter86) = each %{$self->{columnDefinitions}}) 
+        while( my ($kiter78,$viter79) = each %{$self->{columnDefinitions}}) 
         {
-          $xfer += $output->writeString($kiter85);
-          $xfer += ${viter86}->write($output);
+          $xfer += $output->writeString($kiter78);
+          $xfer += ${viter79}->write($output);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -2353,19 +2038,19 @@ sub read {
       last; };
       /^3$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size87 = 0;
+          my $_size80 = 0;
           $self->{columnFamilyDefinitions} = {};
-          my $_ktype88 = 0;
-          my $_vtype89 = 0;
-          $xfer += $input->readMapBegin(\$_ktype88, \$_vtype89, \$_size87);
-          for (my $_i91 = 0; $_i91 < $_size87; ++$_i91)
+          my $_ktype81 = 0;
+          my $_vtype82 = 0;
+          $xfer += $input->readMapBegin(\$_ktype81, \$_vtype82, \$_size80);
+          for (my $_i84 = 0; $_i84 < $_size80; ++$_i84)
           {
-            my $key92 = '';
-            my $val93 = new Blur::ColumnFamilyDefinition();
-            $xfer += $input->readString(\$key92);
-            $val93 = new Blur::ColumnFamilyDefinition();
-            $xfer += $val93->read($input);
-            $self->{columnFamilyDefinitions}->{$key92} = $val93;
+            my $key85 = '';
+            my $val86 = new Blur::ColumnFamilyDefinition();
+            $xfer += $input->readString(\$key85);
+            $val86 = new Blur::ColumnFamilyDefinition();
+            $xfer += $val86->read($input);
+            $self->{columnFamilyDefinitions}->{$key85} = $val86;
           }
           $xfer += $input->readMapEnd();
         }
@@ -2400,10 +2085,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRUCT, scalar(keys %{$self->{columnFamilyDefinitions}}));
       {
-        while( my ($kiter94,$viter95) = each %{$self->{columnFamilyDefinitions}}) 
+        while( my ($kiter87,$viter88) = each %{$self->{columnFamilyDefinitions}}) 
         {
-          $xfer += $output->writeString($kiter94);
-          $xfer += ${viter95}->write($output);
+          $xfer += $output->writeString($kiter87);
+          $xfer += ${viter88}->write($output);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -2453,15 +2138,15 @@ sub read {
     {
       /^1$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size96 = 0;
+          my $_size89 = 0;
           $self->{preCacheCols} = [];
-          my $_etype99 = 0;
-          $xfer += $input->readListBegin(\$_etype99, \$_size96);
-          for (my $_i100 = 0; $_i100 < $_size96; ++$_i100)
+          my $_etype92 = 0;
+          $xfer += $input->readListBegin(\$_etype92, \$_size89);
+          for (my $_i93 = 0; $_i93 < $_size89; ++$_i93)
           {
-            my $elem101 = undef;
-            $xfer += $input->readString(\$elem101);
-            push(@{$self->{preCacheCols}},$elem101);
+            my $elem94 = undef;
+            $xfer += $input->readString(\$elem94);
+            push(@{$self->{preCacheCols}},$elem94);
           }
           $xfer += $input->readListEnd();
         }
@@ -2486,9 +2171,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRING, scalar(@{$self->{preCacheCols}}));
       {
-        foreach my $iter102 (@{$self->{preCacheCols}}) 
+        foreach my $iter95 (@{$self->{preCacheCols}}) 
         {
-          $xfer += $output->writeString($iter102);
+          $xfer += $output->writeString($iter95);
         }
       }
       $xfer += $output->writeListEnd();
@@ -2647,15 +2332,15 @@ sub read {
       last; };
       /^11$/ && do{      if ($ftype == TType::SET) {
         {
-          my $_size103 = 0;
+          my $_size96 = 0;
           $self->{blockCachingFileTypes} = {};
-          my $_etype106 = 0;
-          $xfer += $input->readSetBegin(\$_etype106, \$_size103);
-          for (my $_i107 = 0; $_i107 < $_size103; ++$_i107)
+          my $_etype99 = 0;
+          $xfer += $input->readSetBegin(\$_etype99, \$_size96);
+          for (my $_i100 = 0; $_i100 < $_size96; ++$_i100)
           {
-            my $elem108 = undef;
-            $xfer += $input->readString(\$elem108);
-            $self->{blockCachingFileTypes}->{$elem108} = 1;
+            my $elem101 = undef;
+            $xfer += $input->readString(\$elem101);
+            $self->{blockCachingFileTypes}->{$elem101} = 1;
           }
           $xfer += $input->readSetEnd();
         }
@@ -2743,9 +2428,9 @@ sub write {
     {
       $xfer += $output->writeSetBegin(TType::STRING, scalar(@{$self->{blockCachingFileTypes}}));
       {
-        foreach my $iter109 (@{$self->{blockCachingFileTypes}})
+        foreach my $iter102 (@{$self->{blockCachingFileTypes}})
         {
-          $xfer += $output->writeString($iter109);
+          $xfer += $output->writeString($iter102);
         }
       }
       $xfer += $output->writeSetEnd();
@@ -2909,18 +2594,18 @@ sub read {
       last; };
       /^2$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size110 = 0;
+          my $_size103 = 0;
           $self->{properties} = {};
-          my $_ktype111 = 0;
-          my $_vtype112 = 0;
-          $xfer += $input->readMapBegin(\$_ktype111, \$_vtype112, \$_size110);
-          for (my $_i114 = 0; $_i114 < $_size110; ++$_i114)
+          my $_ktype104 = 0;
+          my $_vtype105 = 0;
+          $xfer += $input->readMapBegin(\$_ktype104, \$_vtype105, \$_size103);
+          for (my $_i107 = 0; $_i107 < $_size103; ++$_i107)
           {
-            my $key115 = '';
-            my $val116 = '';
-            $xfer += $input->readString(\$key115);
-            $xfer += $input->readString(\$val116);
-            $self->{properties}->{$key115} = $val116;
+            my $key108 = '';
+            my $val109 = '';
+            $xfer += $input->readString(\$key108);
+            $xfer += $input->readString(\$val109);
+            $self->{properties}->{$key108} = $val109;
           }
           $xfer += $input->readMapEnd();
         }
@@ -2950,10 +2635,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRING, scalar(keys %{$self->{properties}}));
       {
-        while( my ($kiter117,$viter118) = each %{$self->{properties}}) 
+        while( my ($kiter110,$viter111) = each %{$self->{properties}}) 
         {
-          $xfer += $output->writeString($kiter117);
-          $xfer += $output->writeString($viter118);
+          $xfer += $output->writeString($kiter110);
+          $xfer += $output->writeString($viter111);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -3177,16 +2862,16 @@ sub read {
     {
       /^1$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size119 = 0;
+          my $_size112 = 0;
           $self->{fields} = [];
-          my $_etype122 = 0;
-          $xfer += $input->readListBegin(\$_etype122, \$_size119);
-          for (my $_i123 = 0; $_i123 < $_size119; ++$_i123)
+          my $_etype115 = 0;
+          $xfer += $input->readListBegin(\$_etype115, \$_size112);
+          for (my $_i116 = 0; $_i116 < $_size112; ++$_i116)
           {
-            my $elem124 = undef;
-            $elem124 = new Blur::SortField();
-            $xfer += $elem124->read($input);
-            push(@{$self->{fields}},$elem124);
+            my $elem117 = undef;
+            $elem117 = new Blur::SortField();
+            $xfer += $elem117->read($input);
+            push(@{$self->{fields}},$elem117);
           }
           $xfer += $input->readListEnd();
         }
@@ -3211,9 +2896,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{fields}}));
       {
-        foreach my $iter125 (@{$self->{fields}}) 
+        foreach my $iter118 (@{$self->{fields}}) 
         {
-          $xfer += ${iter125}->write($output);
+          $xfer += ${iter118}->write($output);
         }
       }
       $xfer += $output->writeListEnd();
@@ -3363,15 +3048,15 @@ sub read {
       last; };
       /^4$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size126 = 0;
+          my $_size119 = 0;
           $self->{fields} = [];
-          my $_etype129 = 0;
-          $xfer += $input->readListBegin(\$_etype129, \$_size126);
-          for (my $_i130 = 0; $_i130 < $_size126; ++$_i130)
+          my $_etype122 = 0;
+          $xfer += $input->readListBegin(\$_etype122, \$_size119);
+          for (my $_i123 = 0; $_i123 < $_size119; ++$_i123)
           {
-            my $elem131 = undef;
-            $xfer += $input->readString(\$elem131);
-            push(@{$self->{fields}},$elem131);
+            my $elem124 = undef;
+            $xfer += $input->readString(\$elem124);
+            push(@{$self->{fields}},$elem124);
           }
           $xfer += $input->readListEnd();
         }
@@ -3406,9 +3091,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRING, scalar(@{$self->{fields}}));
       {
-        foreach my $iter132 (@{$self->{fields}}) 
+        foreach my $iter125 (@{$self->{fields}}) 
         {
-          $xfer += $output->writeString($iter132);
+          $xfer += $output->writeString($iter125);
         }
       }
       $xfer += $output->writeListEnd();
@@ -3530,15 +3215,15 @@ sub read {
       last; };
       /^8$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size133 = 0;
+          my $_size126 = 0;
           $self->{shardIndexes} = [];
-          my $_etype136 = 0;
-          $xfer += $input->readListBegin(\$_etype136, \$_size133);
-          for (my $_i137 = 0; $_i137 < $_size133; ++$_i137)
+          my $_etype129 = 0;
+          $xfer += $input->readListBegin(\$_etype129, \$_size126);
+          for (my $_i130 = 0; $_i130 < $_size126; ++$_i130)
           {
-            my $elem138 = undef;
-            $xfer += $input->readI32(\$elem138);
-            push(@{$self->{shardIndexes}},$elem138);
+            my $elem131 = undef;
+            $xfer += $input->readI32(\$elem131);
+            push(@{$self->{shardIndexes}},$elem131);
           }
           $xfer += $input->readListEnd();
         }
@@ -3598,9 +3283,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::I32, scalar(@{$self->{shardIndexes}}));
       {
-        foreach my $iter139 (@{$self->{shardIndexes}}) 
+        foreach my $iter132 (@{$self->{shardIndexes}}) 
         {
-          $xfer += $output->writeI32($iter139);
+          $xfer += $output->writeI32($iter132);
         }
       }
       $xfer += $output->writeListEnd();
@@ -3678,16 +3363,16 @@ sub read {
       last; };
       /^3$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size140 = 0;
+          my $_size133 = 0;
           $self->{scoreDocs} = [];
-          my $_etype143 = 0;
-          $xfer += $input->readListBegin(\$_etype143, \$_size140);
-          for (my $_i144 = 0; $_i144 < $_size140; ++$_i144)
+          my $_etype136 = 0;
+          $xfer += $input->readListBegin(\$_etype136, \$_size133);
+          for (my $_i137 = 0; $_i137 < $_size133; ++$_i137)
           {
-            my $elem145 = undef;
-            $elem145 = new Blur::ScoreDoc();
-            $xfer += $elem145->read($input);
-            push(@{$self->{scoreDocs}},$elem145);
+            my $elem138 = undef;
+            $elem138 = new Blur::ScoreDoc();
+            $xfer += $elem138->read($input);
+            push(@{$self->{scoreDocs}},$elem138);
           }
           $xfer += $input->readListEnd();
         }
@@ -3703,16 +3388,16 @@ sub read {
       last; };
       /^5$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size146 = 0;
+          my $_size139 = 0;
           $self->{fields} = [];
-          my $_etype149 = 0;
-          $xfer += $input->readListBegin(\$_etype149, \$_size146);
-          for (my $_i150 = 0; $_i150 < $_size146; ++$_i150)
+          my $_etype142 = 0;
+          $xfer += $input->readListBegin(\$_etype142, \$_size139);
+          for (my $_i143 = 0; $_i143 < $_size139; ++$_i143)
           {
-            my $elem151 = undef;
-            $elem151 = new Blur::SortField();
-            $xfer += $elem151->read($input);
-            push(@{$self->{fields}},$elem151);
+            my $elem144 = undef;
+            $elem144 = new Blur::SortField();
+            $xfer += $elem144->read($input);
+            push(@{$self->{fields}},$elem144);
           }
           $xfer += $input->readListEnd();
         }
@@ -3747,9 +3432,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{scoreDocs}}));
       {
-        foreach my $iter152 (@{$self->{scoreDocs}}) 
+        foreach my $iter145 (@{$self->{scoreDocs}}) 
         {
-          $xfer += ${iter152}->write($output);
+          $xfer += ${iter145}->write($output);
         }
       }
       $xfer += $output->writeListEnd();
@@ -3766,9 +3451,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{fields}}));
       {
-        foreach my $iter153 (@{$self->{fields}}) 
+        foreach my $iter146 (@{$self->{fields}}) 
         {
-          $xfer += ${iter153}->write($output);
+          $xfer += ${iter146}->write($output);
         }
       }
       $xfer += $output->writeListEnd();
@@ -3927,16 +3612,16 @@ sub read {
     {
       /^1$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size154 = 0;
+          my $_size147 = 0;
           $self->{fields} = [];
-          my $_etype157 = 0;
-          $xfer += $input->readListBegin(\$_etype157, \$_size154);
-          for (my $_i158 = 0; $_i158 < $_size154; ++$_i158)
+          my $_etype150 = 0;
+          $xfer += $input->readListBegin(\$_etype150, \$_size147);
+          for (my $_i151 = 0; $_i151 < $_size147; ++$_i151)
           {
-            my $elem159 = undef;
-            $elem159 = new Blur::Field();
-            $xfer += $elem159->read($input);
-            push(@{$self->{fields}},$elem159);
+            my $elem152 = undef;
+            $elem152 = new Blur::Field();
+            $xfer += $elem152->read($input);
+            push(@{$self->{fields}},$elem152);
           }
           $xfer += $input->readListEnd();
         }
@@ -3961,9 +3646,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{fields}}));
       {
-        foreach my $iter160 (@{$self->{fields}}) 
+        foreach my $iter153 (@{$self->{fields}}) 
         {
-          $xfer += ${iter160}->write($output);
+          $xfer += ${iter153}->write($output);
         }
       }
       $xfer += $output->writeListEnd();
@@ -4212,16 +3897,16 @@ sub read {
       last; };
       /^2$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size161 = 0;
+          my $_size154 = 0;
           $self->{documents} = [];
-          my $_etype164 = 0;
-          $xfer += $input->readListBegin(\$_etype164, \$_size161);
-          for (my $_i165 = 0; $_i165 < $_size161; ++$_i165)
+          my $_etype157 = 0;
+          $xfer += $input->readListBegin(\$_etype157, \$_size154);
+          for (my $_i158 = 0; $_i158 < $_size154; ++$_i158)
           {
-            my $elem166 = undef;
-            $elem166 = new Blur::Document();
-            $xfer += $elem166->read($input);
-            push(@{$self->{documents}},$elem166);
+            my $elem159 = undef;
+            $elem159 = new Blur::Document();
+            $xfer += $elem159->read($input);
+            push(@{$self->{documents}},$elem159);
           }
           $xfer += $input->readListEnd();
         }
@@ -4251,9 +3936,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{documents}}));
       {
-        foreach my $iter167 (@{$self->{documents}}) 
+        foreach my $iter160 (@{$self->{documents}}) 
         {
-          $xfer += ${iter167}->write($output);
+          $xfer += ${iter160}->write($output);
         }
       }
       $xfer += $output->writeListEnd();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/06bb66eb/interface/gen-rb/blur_types.rb
----------------------------------------------------------------------
diff --git a/interface/gen-rb/blur_types.rb b/interface/gen-rb/blur_types.rb
index 3bc06d8..8f7018a 100644
--- a/interface/gen-rb/blur_types.rb
+++ b/interface/gen-rb/blur_types.rb
@@ -364,66 +364,6 @@ module Blur
   end
 
   # 
-  class BlurQuery
-    include ::Thrift::Struct, ::Thrift::Struct_Union
-    SIMPLEQUERY = 1
-    EXPERTQUERY = 2
-    FACETS = 3
-    SELECTOR = 4
-    ALLOWSTALEDATA = 5
-    USECACHEIFPRESENT = 6
-    START = 7
-    FETCH = 8
-    MINIMUMNUMBEROFRESULTS = 9
-    MAXQUERYTIME = 10
-    UUID = 11
-    USERCONTEXT = 12
-    CACHERESULT = 13
-    STARTTIME = 14
-    MODIFYFILECACHES = 15
-
-    FIELDS = {
-      # 
-      SIMPLEQUERY => {:type => ::Thrift::Types::STRUCT, :name => 'simpleQuery', :class => ::Blur::SimpleQuery},
-      # 
-      EXPERTQUERY => {:type => ::Thrift::Types::STRUCT, :name => 'expertQuery', :class => ::Blur::ExpertQuery},
-      # 
-      FACETS => {:type => ::Thrift::Types::LIST, :name => 'facets', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Blur::Facet}},
-      # Selector is used to fetch data in the search results, if null only location ids will be fetched.
-      SELECTOR => {:type => ::Thrift::Types::STRUCT, :name => 'selector', :class => ::Blur::Selector},
-      # @deprecated This value is no longer used.  This allows the query to see the most current data that has been added to the table.
-      ALLOWSTALEDATA => {:type => ::Thrift::Types::BOOL, :name => 'allowStaleData', :default => false},
-      # 
-      USECACHEIFPRESENT => {:type => ::Thrift::Types::BOOL, :name => 'useCacheIfPresent', :default => true},
-      # 
-      START => {:type => ::Thrift::Types::I64, :name => 'start', :default => 0},
-      # 
-      FETCH => {:type => ::Thrift::Types::I32, :name => 'fetch', :default => 10},
-      # 
-      MINIMUMNUMBEROFRESULTS => {:type => ::Thrift::Types::I64, :name => 'minimumNumberOfResults', :default => 9223372036854775807},
-      # 
-      MAXQUERYTIME => {:type => ::Thrift::Types::I64, :name => 'maxQueryTime', :default => 9223372036854775807},
-      # 
-      UUID => {:type => ::Thrift::Types::I64, :name => 'uuid'},
-      # 
-      USERCONTEXT => {:type => ::Thrift::Types::STRING, :name => 'userContext'},
-      # 
-      CACHERESULT => {:type => ::Thrift::Types::BOOL, :name => 'cacheResult', :default => true},
-      # 
-      STARTTIME => {:type => ::Thrift::Types::I64, :name => 'startTime', :default => 0},
-      # 
-      MODIFYFILECACHES => {:type => ::Thrift::Types::BOOL, :name => 'modifyFileCaches', :default => true}
-    }
-
-    def struct_fields; FIELDS; end
-
-    def validate
-    end
-
-    ::Thrift::Struct.generate_accessors self
-  end
-
-  # 
   class CpuTime
     include ::Thrift::Struct, ::Thrift::Struct_Union
     CPUTIME = 1
@@ -447,7 +387,6 @@ module Blur
   # 
   class BlurQueryStatus
     include ::Thrift::Struct, ::Thrift::Struct_Union
-    QUERY = 1
     CPUTIMES = 2
     COMPLETESHARDS = 3
     TOTALSHARDS = 4
@@ -456,8 +395,6 @@ module Blur
 
     FIELDS = {
       # 
-      QUERY => {:type => ::Thrift::Types::STRUCT, :name => 'query', :class => ::Blur::BlurQuery},
-      # 
       CPUTIMES => {:type => ::Thrift::Types::MAP, :name => 'cpuTimes', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRUCT, :class => ::Blur::CpuTime}},
       # 
       COMPLETESHARDS => {:type => ::Thrift::Types::I32, :name => 'completeShards'},

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/06bb66eb/src/blur-core/src/main/java/org/apache/blur/manager/BlurQueryChecker.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/BlurQueryChecker.java b/src/blur-core/src/main/java/org/apache/blur/manager/BlurQueryChecker.java
deleted file mode 100644
index 2676d21..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/manager/BlurQueryChecker.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.apache.blur.manager;
-
-/**
- * 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.BlurConfiguration;
-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 static org.apache.blur.utils.BlurConstants.*;
-
-public class BlurQueryChecker {
-
-  private static final Log LOG = LogFactory.getLog(BlurQueryChecker.class);
-
-  private int _maxQueryRowFetch;
-  private int _maxQueryRecordFetch;
-  private int _maxQueryResultsFetch;
-
-  public BlurQueryChecker(BlurConfiguration configuration) {
-    _maxQueryResultsFetch = configuration.getInt(BLUR_QUERY_MAX_RESULTS_FETCH, 100);
-    _maxQueryRowFetch = configuration.getInt(BLUR_QUERY_MAX_ROW_FETCH, 100);
-    _maxQueryRecordFetch = configuration.getInt(BLUR_QUERY_MAX_RECORD_FETCH, 100);
-  }
-
-  public void checkQuery(BlurQuery blurQuery) throws BlurException {
-    if (blurQuery.selector != null) {
-      if (blurQuery.selector.recordOnly) {
-        if (blurQuery.fetch > _maxQueryRecordFetch) {
-          LOG.warn("Number of records requested to be fetched [{0}] is greater than the max allowed [{1}]", _maxQueryRecordFetch);
-          blurQuery.fetch = (int) blurQuery.minimumNumberOfResults;
-        }
-      } else {
-        if (blurQuery.fetch > _maxQueryRowFetch) {
-          LOG.warn("Number of rows requested to be fetched [{0}] is greater than the max allowed [{1}]", _maxQueryRowFetch);
-          blurQuery.fetch = (int) blurQuery.minimumNumberOfResults;
-        }
-      }
-    }
-    if (blurQuery.fetch > _maxQueryResultsFetch) {
-      LOG.warn("Number of results requested to be fetched [{0}] is greater than the max allowed [{1}]", _maxQueryResultsFetch);
-      blurQuery.fetch = (int) blurQuery.minimumNumberOfResults;
-    }
-    if (blurQuery.fetch > blurQuery.minimumNumberOfResults) {
-      LOG.warn("Number of rows/records requested to be fetched [{0}] is greater than the minimum number of results [{1}]", blurQuery.fetch, blurQuery.minimumNumberOfResults);
-      blurQuery.fetch = (int) blurQuery.minimumNumberOfResults;
-    }
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/06bb66eb/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 e6e23ec..bd00f3a 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,21 +34,15 @@ import java.util.TreeSet;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLongArray;
 
-import org.apache.blur.analysis.BlurAnalyzer;
 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.status.QueryStatusManager;
 import org.apache.blur.manager.writer.BlurIndex;
 import org.apache.blur.metrics.BlurMetrics;
 import org.apache.blur.metrics.QueryMetrics;
 import org.apache.blur.thrift.BException;
 import org.apache.blur.thrift.generated.BlurException;
-import org.apache.blur.thrift.generated.BlurQuery;
-import org.apache.blur.thrift.generated.BlurQueryStatus;
 import org.apache.blur.thrift.generated.ExpertQuery;
 import org.apache.blur.thrift.generated.FetchResult;
 import org.apache.blur.thrift.generated.FetchRowResult;
@@ -74,7 +68,6 @@ import org.apache.lucene.index.StoredFieldVisitor;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.index.Terms;
 import org.apache.lucene.index.TermsEnum;
-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;
@@ -94,7 +87,6 @@ public class IndexManager {
   private ExecutorService _executor;
   private ExecutorService _mutateExecutor;
   private int _threadCount;
-  private QueryStatusManager _statusManager = new QueryStatusManager();
   private boolean _closed;
   private BlurPartitioner<BytesWritable, Void> _blurPartitioner = new BlurPartitioner<BytesWritable, Void>();
   private BlurFilterCache _filterCache = new DefaultBlurFilterCache();
@@ -110,7 +102,6 @@ public class IndexManager {
     _executor = Executors.newThreadPool("index-manager", _threadCount);
     // @TODO give the mutate it's own thread pool
     _mutateExecutor = Executors.newThreadPool("index-manager-mutate", _threadCount);
-    _statusManager.init();
     _queryMetrics = QueryMetrics.getInstance();
     LOG.info("Init Complete");
   }
@@ -118,7 +109,6 @@ public class IndexManager {
   public synchronized void close() {
     if (!_closed) {
       _closed = true;
-      _statusManager.close();
       _executor.shutdownNow();
       _mutateExecutor.shutdownNow();
       _indexServer.close();
@@ -202,7 +192,8 @@ public class IndexManager {
   private void populateSelector(String table, Selector selector) throws IOException, BlurException {
     String rowId = selector.rowId;
     String recordId = selector.recordId;
-    String shardName = null;//MutationHelper.getShardName(table, rowId, getNumberOfShards(table), _blurPartitioner);
+    String shardName = null;// MutationHelper.getShardName(table, rowId,
+                            // getNumberOfShards(table), _blurPartitioner);
     Map<String, BlurIndex> indexes = _indexServer.getIndexes(table);
     BlurIndex blurIndex = indexes.get(shardName);
     if (blurIndex == null) {
@@ -287,29 +278,6 @@ public class IndexManager {
     throw new BException("Expert query not supported", new Throwable());
   }
 
-  private boolean isSimpleQuery(BlurQuery blurQuery) {
-    if (blurQuery.simpleQuery != null) {
-      return true;
-    }
-    return false;
-  }
-
-  private Query getFacetedQuery(BlurQuery blurQuery, Query userQuery, AtomicLongArray counts, BlurAnalyzer analyzer) throws ParseException {
-    if (blurQuery.facets == null) {
-      return userQuery;
-    }
-    return new FacetQuery(userQuery, getFacetQueries(blurQuery, analyzer), counts);
-  }
-
-  private Query[] getFacetQueries(BlurQuery blurQuery, BlurAnalyzer analyzer) throws ParseException {
-    int size = blurQuery.facets.size();
-    Query[] queries = new Query[size];
-    for (int i = 0; i < size; i++) {
-      queries[i] = QueryParserUtil.parseQuery(blurQuery.facets.get(i).queryStr, blurQuery.simpleQuery.superQueryOn, analyzer, null, null, ScoreType.CONSTANT);
-    }
-    return queries;
-  }
-
   private ScoreType getScoreType(ScoreType type) {
     if (type == null) {
       return ScoreType.SUPER;
@@ -317,22 +285,6 @@ public class IndexManager {
     return type;
   }
 
-  public void cancelQuery(String table, long uuid) {
-    _statusManager.cancelQuery(table, uuid);
-  }
-
-  public List<BlurQueryStatus> currentQueries(String table) {
-    return _statusManager.currentQueries(table);
-  }
-
-  public BlurQueryStatus queryStatus(String table, long uuid) throws BlurException {
-    return _statusManager.queryStatus(table, uuid);
-  }
-
-  public List<Long> queryStatusIdList(String table) {
-    return _statusManager.queryStatusIdList(table);
-  }
-
   public static void fetchRow(IndexReader reader, String table, Selector selector, FetchResult fetchResult) throws CorruptIndexException, IOException {
     fetchResult.table = table;
     String locationId = selector.locationId;
@@ -564,11 +516,8 @@ public class IndexManager {
   }
 
   public void setStatusCleanupTimerDelay(long delay) {
-    _statusManager.setStatusCleanupTimerDelay(delay);
   }
 
-
-
   private int getNumberOfShards(String table) {
     return _indexServer.getShardCount(table);
   }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/06bb66eb/src/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatus.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatus.java b/src/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatus.java
deleted file mode 100644
index f1fe931..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatus.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.apache.blur.manager.status;
-
-/**
- * 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.lang.management.ManagementFactory;
-import java.lang.management.ThreadMXBean;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.blur.thrift.generated.BlurQuery;
-import org.apache.blur.thrift.generated.BlurQueryStatus;
-import org.apache.blur.thrift.generated.QueryState;
-
-
-public class QueryStatus implements Comparable<QueryStatus> {
-
-  private final static boolean CPU_TIME_SUPPORTED = ManagementFactory.getThreadMXBean().isCurrentThreadCpuTimeSupported();
-
-  private final BlurQuery _blurQuery;
-  private final String _table;
-  private final long _startingTime;
-  private boolean _finished = false;
-  private long _finishedTime;
-  private final AtomicLong _cpuTimeOfFinishedThreads = new AtomicLong();
-  private final ThreadMXBean _bean = ManagementFactory.getThreadMXBean();
-  private final long _ttl;
-  private final ThreadLocal<Long> _cpuTimes = new ThreadLocal<Long>();
-  private final AtomicBoolean _interrupted = new AtomicBoolean(false);
-  private final AtomicInteger _totalShards = new AtomicInteger();
-  private final AtomicInteger _completeShards = new AtomicInteger();
-  private AtomicBoolean _running;
-
-  public QueryStatus(long ttl, String table, BlurQuery blurQuery, AtomicBoolean running) {
-    _ttl = ttl;
-    _table = table;
-    _blurQuery = blurQuery;
-    _startingTime = System.currentTimeMillis();
-    _running = running;
-  }
-
-  public QueryStatus attachThread() {
-    if (CPU_TIME_SUPPORTED) {
-      _cpuTimes.set(_bean.getCurrentThreadCpuTime());
-    } else {
-      _cpuTimes.set(-1L);
-    }
-    _totalShards.incrementAndGet();
-    return this;
-  }
-
-  public QueryStatus deattachThread() {
-    _completeShards.incrementAndGet();
-    if (CPU_TIME_SUPPORTED) {
-      long startingThreadCpuTime = _cpuTimes.get();
-      long currentThreadCpuTime = _bean.getCurrentThreadCpuTime();
-      _cpuTimeOfFinishedThreads.addAndGet(currentThreadCpuTime - startingThreadCpuTime);
-    }
-    return this;
-  }
-
-  public long getUserUuid() {
-    return _blurQuery.uuid;
-  }
-
-  public void cancelQuery() {
-    _interrupted.set(true);
-    _running.set(false);
-  }
-
-  public BlurQueryStatus getQueryStatus() {
-    BlurQueryStatus queryStatus = new BlurQueryStatus();
-    queryStatus.query = _blurQuery;
-    queryStatus.totalShards = _totalShards.get();
-    queryStatus.completeShards = _completeShards.get();
-    queryStatus.state = getQueryState();
-    if (queryStatus.query != null) {
-      queryStatus.uuid = queryStatus.query.uuid;
-    }
-    return queryStatus;
-  }
-
-  private QueryState getQueryState() {
-    if (_interrupted.get()) {
-      return QueryState.INTERRUPTED;
-    } else if (_finished) {
-      return QueryState.COMPLETE;
-    } else {
-      return QueryState.RUNNING;
-    }
-  }
-
-  public String getTable() {
-    return _table;
-  }
-
-  public boolean isFinished() {
-    return _finished;
-  }
-
-  public void setFinished(boolean finished) {
-    this._finished = finished;
-    _finishedTime = System.currentTimeMillis();
-  }
-
-  public long getFinishedTime() {
-    return _finishedTime;
-  }
-
-  public boolean isValidForCleanUp() {
-    if (!isFinished()) {
-      return false;
-    }
-    if (getFinishedTime() + _ttl < System.currentTimeMillis()) {
-      return true;
-    }
-    return false;
-  }
-
-  @Override
-  public int compareTo(QueryStatus o) {
-    long startingTime2 = o._startingTime;
-    if (_startingTime == startingTime2) {
-      int hashCode2 = o.hashCode();
-      return hashCode() < hashCode2 ? -1 : 1;
-    }
-    return _startingTime < startingTime2 ? -1 : 1;
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/06bb66eb/src/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatusManager.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatusManager.java b/src/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatusManager.java
deleted file mode 100644
index 17c333f..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatusManager.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.apache.blur.manager.status;
-
-/**
- * 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.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-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.thrift.generated.BlurQueryStatus;
-
-
-public class QueryStatusManager {
-
-  private static final Log LOG = LogFactory.getLog(QueryStatusManager.class);
-  private static final Object CONSTANT_VALUE = new Object();
-
-  private Timer statusCleanupTimer;
-  private long statusCleanupTimerDelay = TimeUnit.SECONDS.toMillis(10);
-  private ConcurrentHashMap<QueryStatus, Object> currentQueryStatusCollection = new ConcurrentHashMap<QueryStatus, Object>();
-
-  public void init() {
-    statusCleanupTimer = new Timer("Query-Status-Cleanup", true);
-    statusCleanupTimer.schedule(new TimerTask() {
-      @Override
-      public void run() {
-        try {
-          cleanupFinishedQueryStatuses();
-        } catch (Throwable e) {
-          LOG.error("Unknown error while trying to cleanup finished queries.", e);
-        }
-      }
-    }, statusCleanupTimerDelay, statusCleanupTimerDelay);
-  }
-
-  public void close() {
-    statusCleanupTimer.cancel();
-    statusCleanupTimer.purge();
-  }
-
-  public QueryStatus newQueryStatus(String table, BlurQuery blurQuery, int maxNumberOfThreads, AtomicBoolean running) {
-    QueryStatus queryStatus = new QueryStatus(statusCleanupTimerDelay, table, blurQuery, running);
-    currentQueryStatusCollection.put(queryStatus, CONSTANT_VALUE);
-    return queryStatus;
-  }
-
-  public void removeStatus(QueryStatus status) {
-    status.setFinished(true);
-  }
-
-  private void cleanupFinishedQueryStatuses() {
-    LOG.debug("QueryStatus Start count [{0}].", currentQueryStatusCollection.size());
-    Iterator<QueryStatus> iterator = currentQueryStatusCollection.keySet().iterator();
-    while (iterator.hasNext()) {
-      QueryStatus status = iterator.next();
-      if (status.isValidForCleanUp()) {
-        currentQueryStatusCollection.remove(status);
-      }
-    }
-    LOG.debug("QueryStatus Finish count [{0}].", currentQueryStatusCollection.size());
-  }
-
-  public long getStatusCleanupTimerDelay() {
-    return statusCleanupTimerDelay;
-  }
-
-  public void setStatusCleanupTimerDelay(long statusCleanupTimerDelay) {
-    this.statusCleanupTimerDelay = statusCleanupTimerDelay;
-  }
-
-  public void cancelQuery(String table, long uuid) {
-    for (QueryStatus status : currentQueryStatusCollection.keySet()) {
-      if (status.getUserUuid() == uuid && status.getTable().equals(table)) {
-        status.cancelQuery();
-      }
-    }
-  }
-
-  public List<BlurQueryStatus> currentQueries(String table) {
-    List<BlurQueryStatus> result = new ArrayList<BlurQueryStatus>();
-    for (QueryStatus status : currentQueryStatusCollection.keySet()) {
-      if (status.getTable().equals(table)) {
-        result.add(status.getQueryStatus());
-      }
-    }
-    return result;
-  }
-
-  public BlurQueryStatus queryStatus(String table, long uuid) throws BlurException {
-    for (QueryStatus status : currentQueryStatusCollection.keySet()) {
-      if (status.getUserUuid() == uuid && status.getTable().equals(table)) {
-        return status.getQueryStatus();
-      }
-    }
-    throw new BlurException("Query status for table [" + table + "] and uuid [" + uuid + "] not found", null);
-  }
-
-  public List<Long> queryStatusIdList(String table) {
-    Set<Long> ids = new HashSet<Long>();
-    for (QueryStatus status : currentQueryStatusCollection.keySet()) {
-      ids.add(status.getUserUuid());
-    }
-    return new ArrayList<Long>(ids);
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/06bb66eb/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 4c321e1..b88320b 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
@@ -37,7 +37,6 @@ import org.apache.blur.concurrent.Executors;
 import org.apache.blur.log.Log;
 import org.apache.blur.log.LogFactory;
 import org.apache.blur.manager.BlurPartitioner;
-import org.apache.blur.manager.BlurQueryChecker;
 import org.apache.blur.manager.clusterstatus.ZookeeperPathConstants;
 import org.apache.blur.manager.indexserver.DistributedLayoutManager;
 import org.apache.blur.manager.stats.MergerTableStats;
@@ -67,7 +66,6 @@ import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.ZooDefs.Ids;
 import org.apache.zookeeper.data.Stat;
 
-
 public class BlurControllerServer extends TableAdmin implements Iface {
 
   public static abstract class BlurClient {
@@ -95,7 +93,6 @@ public class BlurControllerServer extends TableAdmin implements Iface {
   private int _remoteFetchCount = 100;
   private long _maxTimeToLive = TimeUnit.MINUTES.toMillis(1);
   private int _maxQueryCacheElements = 128;
-  private BlurQueryChecker _queryChecker;
   private AtomicBoolean _running = new AtomicBoolean();
 
   private int _maxFetchRetries = 3;
@@ -378,7 +375,6 @@ public class BlurControllerServer extends TableAdmin implements Iface {
     return tableLayout;
   }
 
-
   @Override
   public Schema schema(final String table) throws BlurException, TException {
     checkTable(table);
@@ -484,10 +480,6 @@ public class BlurControllerServer extends TableAdmin implements Iface {
     _maxQueryCacheElements = maxQueryCacheElements;
   }
 
-  public void setQueryChecker(BlurQueryChecker queryChecker) {
-    _queryChecker = queryChecker;
-  }
-
   public void setThreadCount(int threadCount) {
     _threadCount = threadCount;
   }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/06bb66eb/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 c8be02d..b7f11c5 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
@@ -42,7 +42,6 @@ import org.apache.blur.analysis.BlurAnalyzer;
 import org.apache.blur.concurrent.Executors;
 import org.apache.blur.log.Log;
 import org.apache.blur.log.LogFactory;
-import org.apache.blur.manager.BlurQueryChecker;
 import org.apache.blur.manager.IndexManager;
 import org.apache.blur.manager.IndexServer;
 import org.apache.blur.manager.writer.BlurIndex;
@@ -78,7 +77,6 @@ public class BlurShardServer extends TableAdmin implements Iface {
   private boolean _closed;
   private long _maxTimeToLive = TimeUnit.MINUTES.toMillis(1);
   private int _maxQueryCacheElements = 128;
-  private BlurQueryChecker _queryChecker;
   private ExecutorService _dataFetch;
   private ExecutorService _indexSearcherExecutor;
   private ExecutorService _searchExecutor;
@@ -101,24 +99,12 @@ public class BlurShardServer extends TableAdmin implements Iface {
 
   @Override
   public void cancelQuery(String table, long uuid) throws BlurException, TException {
-    checkTable(_cluster, table);
-    try {
-      _indexManager.cancelQuery(table, uuid);
-    } catch (Exception e) {
-      LOG.error("Unknown error while trying to cancel search [uuid={0}]", e, uuid);
-      throw new BException(e.getMessage(), e);
-    }
+    throw new BlurException("Not implemented", null);
   }
 
   @Override
   public List<BlurQueryStatus> currentQueries(String table) throws BlurException, TException {
-    checkTable(_cluster, table);
-    try {
-      return _indexManager.currentQueries(table);
-    } catch (Exception e) {
-      LOG.error("Unknown error while trying to get current search status [table={0}]", e, table);
-      throw new BException(e.getMessage(), e);
-    }
+    throw new BlurException("Not implemented", null);
   }
 
   @Override
@@ -193,10 +179,6 @@ public class BlurShardServer extends TableAdmin implements Iface {
     _maxQueryCacheElements = maxQueryCacheElements;
   }
 
-  public void setQueryChecker(BlurQueryChecker queryChecker) {
-    _queryChecker = queryChecker;
-  }
-
   public void setIndexManager(IndexManager indexManager) {
     _indexManager = indexManager;
   }
@@ -207,24 +189,12 @@ public class BlurShardServer extends TableAdmin implements Iface {
 
   @Override
   public BlurQueryStatus queryStatusById(String table, long uuid) throws BlurException, TException {
-    checkTable(_cluster, table);
-    try {
-      return _indexManager.queryStatus(table, uuid);
-    } catch (Exception e) {
-      LOG.error("Unknown error while trying to get current query status [table={0},uuid={1}]", e, table, uuid);
-      throw new BException(e.getMessage(), e);
-    }
+    throw new BlurException("Not implemented", null);
   }
 
   @Override
   public List<Long> queryStatusIdList(String table) throws BlurException, TException {
-    checkTable(_cluster, table);
-    try {
-      return _indexManager.queryStatusIdList(table);
-    } catch (Exception e) {
-      LOG.error("Unknown error while trying to get query status id list [table={0}]", e, table);
-      throw new BException(e.getMessage(), e);
-    }
+    throw new BlurException("Not implemented", null);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/06bb66eb/src/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java b/src/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java
index a26cc5c..5c4b5d0 100644
--- a/src/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java
+++ b/src/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java
@@ -48,7 +48,6 @@ import org.apache.blur.concurrent.ThreadWatcher;
 import org.apache.blur.gui.HttpJettyServer;
 import org.apache.blur.log.Log;
 import org.apache.blur.log.LogFactory;
-import org.apache.blur.manager.BlurQueryChecker;
 import org.apache.blur.manager.clusterstatus.ZookeeperClusterStatus;
 import org.apache.blur.manager.indexserver.BlurServerShutDown;
 import org.apache.blur.manager.indexserver.BlurServerShutDown.BlurShutdown;
@@ -89,8 +88,6 @@ public class ThriftBlurControllerServer extends ThriftServer {
     nodeName = nodeName + ":" + bindPort;
     String zkConnectionStr = isEmpty(configuration.get(BLUR_ZOOKEEPER_CONNECTION), BLUR_ZOOKEEPER_CONNECTION);
 
-    BlurQueryChecker queryChecker = new BlurQueryChecker(configuration);
-
     final ZooKeeper zooKeeper = ZkUtils.newZooKeeper(zkConnectionStr);
     ZookeeperSystemTime.checkSystemTime(zooKeeper, configuration.getLong(BLUR_ZOOKEEPER_SYSTEM_TIME_TOLERANCE, 3000));
 
@@ -108,7 +105,6 @@ public class ThriftBlurControllerServer extends ThriftServer {
     controllerServer.setRemoteFetchCount(configuration.getInt(BLUR_CONTROLLER_REMOTE_FETCH_COUNT, 100));
     controllerServer.setMaxQueryCacheElements(configuration.getInt(BLUR_CONTROLLER_CACHE_MAX_QUERYCACHE_ELEMENTS, 128));
     controllerServer.setMaxTimeToLive(configuration.getLong(BLUR_CONTROLLER_CACHE_MAX_TIMETOLIVE, TimeUnit.MINUTES.toMillis(1)));
-    controllerServer.setQueryChecker(queryChecker);
     controllerServer.setThreadCount(configuration.getInt(BLUR_CONTROLLER_SERVER_REMOTE_THREAD_COUNT, 64));
     controllerServer.setMaxFetchRetries(configuration.getInt(BLUR_CONTROLLER_RETRY_MAX_FETCH_RETRIES, 3));
     controllerServer.setMaxMutateRetries(configuration.getInt(BLUR_CONTROLLER_RETRY_MAX_MUTATE_RETRIES, 3));

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/06bb66eb/src/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java b/src/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java
index fb26a12..4d05a7f 100644
--- a/src/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java
+++ b/src/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurShardServer.java
@@ -46,7 +46,6 @@ import org.apache.blur.gui.HttpJettyServer;
 import org.apache.blur.log.Log;
 import org.apache.blur.log.LogFactory;
 import org.apache.blur.manager.BlurFilterCache;
-import org.apache.blur.manager.BlurQueryChecker;
 import org.apache.blur.manager.DefaultBlurFilterCache;
 import org.apache.blur.manager.IndexManager;
 import org.apache.blur.manager.clusterstatus.ZookeeperClusterStatus;
@@ -150,8 +149,6 @@ public class ThriftBlurShardServer extends ThriftServer {
     String nodeName = nodeNameHostName + ":" + bindPort;
     String zkConnectionStr = isEmpty(configuration.get(BLUR_ZOOKEEPER_CONNECTION), BLUR_ZOOKEEPER_CONNECTION);
 
-    BlurQueryChecker queryChecker = new BlurQueryChecker(configuration);
-
     final ZooKeeper zooKeeper = ZkUtils.newZooKeeper(zkConnectionStr);
     try {
       ZookeeperSystemTime.checkSystemTime(zooKeeper, configuration.getLong(BLUR_ZOOKEEPER_SYSTEM_TIME_TOLERANCE, 3000));
@@ -204,7 +201,6 @@ public class ThriftBlurShardServer extends ThriftServer {
     shardServer.setIndexManager(indexManager);
     shardServer.setZookeeper(zooKeeper);
     shardServer.setClusterStatus(clusterStatus);
-    shardServer.setQueryChecker(queryChecker);
     shardServer.setConfiguration(configuration);
     shardServer.init();
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/06bb66eb/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 ba7fdb6..3fe4f70 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
@@ -43,12 +43,10 @@ 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.BlurQuery;
 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.Selector;
-import org.apache.blur.thrift.generated.SimpleQuery;
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
@@ -126,14 +124,6 @@ public class BlurUtil {
     }
   }
 
-  public static BlurQuery newSimpleQuery(String query) {
-    BlurQuery blurQuery = new BlurQuery();
-    SimpleQuery simpleQuery = new SimpleQuery();
-    simpleQuery.setQueryStr(query);
-    blurQuery.setSimpleQuery(simpleQuery);
-    blurQuery.setSelector(new Selector());
-    return blurQuery;
-  }
 
   public static void createIfMissing(ZooKeeper zookeeper, String path) throws KeeperException, InterruptedException {
     if (zookeeper.exists(path, false) == null) {
@@ -266,12 +256,6 @@ public class BlurUtil {
     return new AtomicLongArray(list.size());
   }
 
-  public static void setStartTime(BlurQuery query) {
-    if (query.startTime == 0) {
-      query.startTime = System.currentTimeMillis();
-    }
-  }
-
   public static String getVersion() {
     String path = "/META-INF/maven/com.nearinfinity.blur/blur-core/pom.properties";
     InputStream inputStream = BlurUtil.class.getResourceAsStream(path);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/06bb66eb/src/blur-core/src/main/java/org/apache/blur/utils/QueryCacheKey.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/utils/QueryCacheKey.java b/src/blur-core/src/main/java/org/apache/blur/utils/QueryCacheKey.java
deleted file mode 100644
index e17aa23..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/utils/QueryCacheKey.java
+++ /dev/null
@@ -1,77 +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.BlurQuery;
-
-public class QueryCacheKey {
-  private String table;
-  private BlurQuery query;
-
-  public String getTable() {
-    return table;
-  }
-
-  public void setTable(String table) {
-    this.table = table;
-  }
-
-  public BlurQuery getQuery() {
-    return query;
-  }
-
-  public void setQuery(BlurQuery query) {
-    this.query = query;
-  }
-
-  public QueryCacheKey(String table, BlurQuery query) {
-    this.table = table;
-    this.query = query;
-  }
-
-  @Override
-  public int hashCode() {
-    final int prime = 31;
-    int result = 1;
-    result = prime * result + ((query == null) ? 0 : query.hashCode());
-    result = prime * result + ((table == null) ? 0 : table.hashCode());
-    return result;
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (this == obj)
-      return true;
-    if (obj == null)
-      return false;
-    if (getClass() != obj.getClass())
-      return false;
-    QueryCacheKey other = (QueryCacheKey) obj;
-    if (query == null) {
-      if (other.query != null)
-        return false;
-    } else if (!query.equals(other.query))
-      return false;
-    if (table == null) {
-      if (other.table != null)
-        return false;
-    } else if (!table.equals(other.table))
-      return false;
-    return true;
-  }
-
-}


Mime
View raw message