incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [44/50] [abbrv] Blur-core compiling but several other projects are still broken.
Date Wed, 07 Nov 2012 02:26:56 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/interface/gen-perl/Blur/ShardServer.pm
----------------------------------------------------------------------
diff --git a/interface/gen-perl/Blur/ShardServer.pm b/interface/gen-perl/Blur/ShardServer.pm
index 67fae11..d52aff1 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 $_size286 = 0;
+            my $_size272 = 0;
             $self->{success} = [];
-            my $_etype289 = 0;
-            $xfer += $input->readListBegin(\$_etype289, \$_size286);
-            for (my $_i290 = 0; $_i290 < $_size286; ++$_i290)
+            my $_etype275 = 0;
+            $xfer += $input->readListBegin(\$_etype275, \$_size272);
+            for (my $_i276 = 0; $_i276 < $_size272; ++$_i276)
             {
-              my $elem291 = undef;
-              $elem291 = new Blur::TopFieldDocs();
-              $xfer += $elem291->read($input);
-              push(@{$self->{success}},$elem291);
+              my $elem277 = undef;
+              $elem277 = new Blur::TopFieldDocs();
+              $xfer += $elem277->read($input);
+              push(@{$self->{success}},$elem277);
             }
             $xfer += $input->readListEnd();
           }
@@ -322,9 +322,9 @@ sub write {
       {
         $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{success}}));
         {
-          foreach my $iter292 (@{$self->{success}}) 
+          foreach my $iter278 (@{$self->{success}}) 
           {
-            $xfer += ${iter292}->write($output);
+            $xfer += ${iter278}->write($output);
           }
         }
         $xfer += $output->writeListEnd();
@@ -394,16 +394,16 @@ sub read {
         last; };
         /^2$/ && do{        if ($ftype == TType::LIST) {
           {
-            my $_size293 = 0;
+            my $_size279 = 0;
             $self->{docLocations} = [];
-            my $_etype296 = 0;
-            $xfer += $input->readListBegin(\$_etype296, \$_size293);
-            for (my $_i297 = 0; $_i297 < $_size293; ++$_i297)
+            my $_etype282 = 0;
+            $xfer += $input->readListBegin(\$_etype282, \$_size279);
+            for (my $_i283 = 0; $_i283 < $_size279; ++$_i283)
             {
-              my $elem298 = undef;
-              $elem298 = new Blur::DocLocation();
-              $xfer += $elem298->read($input);
-              push(@{$self->{docLocations}},$elem298);
+              my $elem284 = undef;
+              $elem284 = new Blur::DocLocation();
+              $xfer += $elem284->read($input);
+              push(@{$self->{docLocations}},$elem284);
             }
             $xfer += $input->readListEnd();
           }
@@ -413,15 +413,15 @@ sub read {
         last; };
         /^4$/ && do{        if ($ftype == TType::SET) {
           {
-            my $_size299 = 0;
+            my $_size285 = 0;
             $self->{fields} = {};
-            my $_etype302 = 0;
-            $xfer += $input->readSetBegin(\$_etype302, \$_size299);
-            for (my $_i303 = 0; $_i303 < $_size299; ++$_i303)
+            my $_etype288 = 0;
+            $xfer += $input->readSetBegin(\$_etype288, \$_size285);
+            for (my $_i289 = 0; $_i289 < $_size285; ++$_i289)
             {
-              my $elem304 = undef;
-              $xfer += $input->readString(\$elem304);
-              $self->{fields}->{$elem304} = 1;
+              my $elem290 = undef;
+              $xfer += $input->readString(\$elem290);
+              $self->{fields}->{$elem290} = 1;
             }
             $xfer += $input->readSetEnd();
           }
@@ -451,9 +451,9 @@ sub write {
       {
         $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{docLocations}}));
         {
-          foreach my $iter305 (@{$self->{docLocations}}) 
+          foreach my $iter291 (@{$self->{docLocations}}) 
           {
-            $xfer += ${iter305}->write($output);
+            $xfer += ${iter291}->write($output);
           }
         }
         $xfer += $output->writeListEnd();
@@ -465,9 +465,9 @@ sub write {
       {
         $xfer += $output->writeSetBegin(TType::STRING, scalar(@{$self->{fields}}));
         {
-          foreach my $iter306 (@{$self->{fields}})
+          foreach my $iter292 (@{$self->{fields}})
           {
-            $xfer += $output->writeString($iter306);
+            $xfer += $output->writeString($iter292);
           }
         }
         $xfer += $output->writeSetEnd();
@@ -521,16 +521,16 @@ sub read {
       {
         /^0$/ && do{        if ($ftype == TType::LIST) {
           {
-            my $_size307 = 0;
+            my $_size293 = 0;
             $self->{success} = [];
-            my $_etype310 = 0;
-            $xfer += $input->readListBegin(\$_etype310, \$_size307);
-            for (my $_i311 = 0; $_i311 < $_size307; ++$_i311)
+            my $_etype296 = 0;
+            $xfer += $input->readListBegin(\$_etype296, \$_size293);
+            for (my $_i297 = 0; $_i297 < $_size293; ++$_i297)
             {
-              my $elem312 = undef;
-              $elem312 = new Blur::Document();
-              $xfer += $elem312->read($input);
-              push(@{$self->{success}},$elem312);
+              my $elem298 = undef;
+              $elem298 = new Blur::Document();
+              $xfer += $elem298->read($input);
+              push(@{$self->{success}},$elem298);
             }
             $xfer += $input->readListEnd();
           }
@@ -562,9 +562,9 @@ sub write {
       {
         $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{success}}));
         {
-          foreach my $iter313 (@{$self->{success}}) 
+          foreach my $iter299 (@{$self->{success}}) 
           {
-            $xfer += ${iter313}->write($output);
+            $xfer += ${iter299}->write($output);
           }
         }
         $xfer += $output->writeListEnd();
@@ -760,16 +760,16 @@ sub read {
         last; };
         /^2$/ && do{        if ($ftype == TType::LIST) {
           {
-            my $_size314 = 0;
+            my $_size300 = 0;
             $self->{documents} = [];
-            my $_etype317 = 0;
-            $xfer += $input->readListBegin(\$_etype317, \$_size314);
-            for (my $_i318 = 0; $_i318 < $_size314; ++$_i318)
+            my $_etype303 = 0;
+            $xfer += $input->readListBegin(\$_etype303, \$_size300);
+            for (my $_i304 = 0; $_i304 < $_size300; ++$_i304)
             {
-              my $elem319 = undef;
-              $elem319 = new Blur::Document();
-              $xfer += $elem319->read($input);
-              push(@{$self->{documents}},$elem319);
+              my $elem305 = undef;
+              $elem305 = new Blur::Document();
+              $xfer += $elem305->read($input);
+              push(@{$self->{documents}},$elem305);
             }
             $xfer += $input->readListEnd();
           }
@@ -799,9 +799,9 @@ sub write {
       {
         $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{documents}}));
         {
-          foreach my $iter320 (@{$self->{documents}}) 
+          foreach my $iter306 (@{$self->{documents}}) 
           {
-            $xfer += ${iter320}->write($output);
+            $xfer += ${iter306}->write($output);
           }
         }
         $xfer += $output->writeListEnd();
@@ -927,15 +927,15 @@ sub read {
         last; };
         /^2$/ && do{        if ($ftype == TType::LIST) {
           {
-            my $_size321 = 0;
+            my $_size307 = 0;
             $self->{queries} = [];
-            my $_etype324 = 0;
-            $xfer += $input->readListBegin(\$_etype324, \$_size321);
-            for (my $_i325 = 0; $_i325 < $_size321; ++$_i325)
+            my $_etype310 = 0;
+            $xfer += $input->readListBegin(\$_etype310, \$_size307);
+            for (my $_i311 = 0; $_i311 < $_size307; ++$_i311)
             {
-              my $elem326 = undef;
-              $xfer += $input->readString(\$elem326);
-              push(@{$self->{queries}},$elem326);
+              my $elem312 = undef;
+              $xfer += $input->readString(\$elem312);
+              push(@{$self->{queries}},$elem312);
             }
             $xfer += $input->readListEnd();
           }
@@ -965,9 +965,9 @@ sub write {
       {
         $xfer += $output->writeListBegin(TType::STRING, scalar(@{$self->{queries}}));
         {
-          foreach my $iter327 (@{$self->{queries}}) 
+          foreach my $iter313 (@{$self->{queries}}) 
           {
-            $xfer += $output->writeString($iter327);
+            $xfer += $output->writeString($iter313);
           }
         }
         $xfer += $output->writeListEnd();
@@ -1093,16 +1093,16 @@ sub read {
         last; };
         /^2$/ && do{        if ($ftype == TType::LIST) {
           {
-            my $_size328 = 0;
+            my $_size314 = 0;
             $self->{terms} = [];
-            my $_etype331 = 0;
-            $xfer += $input->readListBegin(\$_etype331, \$_size328);
-            for (my $_i332 = 0; $_i332 < $_size328; ++$_i332)
+            my $_etype317 = 0;
+            $xfer += $input->readListBegin(\$_etype317, \$_size314);
+            for (my $_i318 = 0; $_i318 < $_size314; ++$_i318)
             {
-              my $elem333 = undef;
-              $elem333 = new Blur::Term();
-              $xfer += $elem333->read($input);
-              push(@{$self->{terms}},$elem333);
+              my $elem319 = undef;
+              $elem319 = new Blur::Term();
+              $xfer += $elem319->read($input);
+              push(@{$self->{terms}},$elem319);
             }
             $xfer += $input->readListEnd();
           }
@@ -1132,9 +1132,9 @@ sub write {
       {
         $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{terms}}));
         {
-          foreach my $iter334 (@{$self->{terms}}) 
+          foreach my $iter320 (@{$self->{terms}}) 
           {
-            $xfer += ${iter334}->write($output);
+            $xfer += ${iter320}->write($output);
           }
         }
         $xfer += $output->writeListEnd();
@@ -1260,16 +1260,16 @@ sub read {
         last; };
         /^2$/ && do{        if ($ftype == TType::LIST) {
           {
-            my $_size335 = 0;
+            my $_size321 = 0;
             $self->{updatePackages} = [];
-            my $_etype338 = 0;
-            $xfer += $input->readListBegin(\$_etype338, \$_size335);
-            for (my $_i339 = 0; $_i339 < $_size335; ++$_i339)
+            my $_etype324 = 0;
+            $xfer += $input->readListBegin(\$_etype324, \$_size321);
+            for (my $_i325 = 0; $_i325 < $_size321; ++$_i325)
             {
-              my $elem340 = undef;
-              $elem340 = new Blur::UpdatePackage();
-              $xfer += $elem340->read($input);
-              push(@{$self->{updatePackages}},$elem340);
+              my $elem326 = undef;
+              $elem326 = new Blur::UpdatePackage();
+              $xfer += $elem326->read($input);
+              push(@{$self->{updatePackages}},$elem326);
             }
             $xfer += $input->readListEnd();
           }
@@ -1299,9 +1299,9 @@ sub write {
       {
         $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{updatePackages}}));
         {
-          foreach my $iter341 (@{$self->{updatePackages}}) 
+          foreach my $iter327 (@{$self->{updatePackages}}) 
           {
-            $xfer += ${iter341}->write($output);
+            $xfer += ${iter327}->write($output);
           }
         }
         $xfer += $output->writeListEnd();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/interface/gen-rb/blur.rb
----------------------------------------------------------------------
diff --git a/interface/gen-rb/blur.rb b/interface/gen-rb/blur.rb
index aa17c7a..2f445d9 100644
--- a/interface/gen-rb/blur.rb
+++ b/interface/gen-rb/blur.rb
@@ -124,22 +124,6 @@ module Blur
         raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'describe failed: unknown result')
       end
 
-      def query(table, blurQuery)
-        send_query(table, blurQuery)
-        return recv_query()
-      end
-
-      def send_query(table, blurQuery)
-        send_message('query', Query_args, :table => table, :blurQuery => blurQuery)
-      end
-
-      def recv_query()
-        result = receive_message(Query_result)
-        return result.success unless result.success.nil?
-        raise result.ex unless result.ex.nil?
-        raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'query failed: unknown result')
-      end
-
       def cancelQuery(table, uuid)
         send_cancelQuery(table, uuid)
         recv_cancelQuery()
@@ -251,84 +235,6 @@ module Blur
         raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'tableStats failed: unknown result')
       end
 
-      def terms(table, columnFamily, columnName, startWith, size)
-        send_terms(table, columnFamily, columnName, startWith, size)
-        return recv_terms()
-      end
-
-      def send_terms(table, columnFamily, columnName, startWith, size)
-        send_message('terms', Terms_args, :table => table, :columnFamily => columnFamily, :columnName => columnName, :startWith => startWith, :size => size)
-      end
-
-      def recv_terms()
-        result = receive_message(Terms_result)
-        return result.success unless result.success.nil?
-        raise result.ex unless result.ex.nil?
-        raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'terms failed: unknown result')
-      end
-
-      def recordFrequency(table, columnFamily, columnName, value)
-        send_recordFrequency(table, columnFamily, columnName, value)
-        return recv_recordFrequency()
-      end
-
-      def send_recordFrequency(table, columnFamily, columnName, value)
-        send_message('recordFrequency', RecordFrequency_args, :table => table, :columnFamily => columnFamily, :columnName => columnName, :value => value)
-      end
-
-      def recv_recordFrequency()
-        result = receive_message(RecordFrequency_result)
-        return result.success unless result.success.nil?
-        raise result.ex unless result.ex.nil?
-        raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'recordFrequency failed: unknown result')
-      end
-
-      def fetchRow(table, selector)
-        send_fetchRow(table, selector)
-        return recv_fetchRow()
-      end
-
-      def send_fetchRow(table, selector)
-        send_message('fetchRow', FetchRow_args, :table => table, :selector => selector)
-      end
-
-      def recv_fetchRow()
-        result = receive_message(FetchRow_result)
-        return result.success unless result.success.nil?
-        raise result.ex unless result.ex.nil?
-        raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'fetchRow failed: unknown result')
-      end
-
-      def mutate(mutation)
-        send_mutate(mutation)
-        recv_mutate()
-      end
-
-      def send_mutate(mutation)
-        send_message('mutate', Mutate_args, :mutation => mutation)
-      end
-
-      def recv_mutate()
-        result = receive_message(Mutate_result)
-        raise result.ex unless result.ex.nil?
-        return
-      end
-
-      def mutateBatch(mutations)
-        send_mutateBatch(mutations)
-        recv_mutateBatch()
-      end
-
-      def send_mutateBatch(mutations)
-        send_message('mutateBatch', MutateBatch_args, :mutations => mutations)
-      end
-
-      def recv_mutateBatch()
-        result = receive_message(MutateBatch_result)
-        raise result.ex unless result.ex.nil?
-        return
-      end
-
       def createTable(tableDescriptor)
         send_createTable(tableDescriptor)
         recv_createTable()
@@ -518,17 +424,6 @@ module Blur
         write_result(result, oprot, 'describe', seqid)
       end
 
-      def process_query(seqid, iprot, oprot)
-        args = read_args(iprot, Query_args)
-        result = Query_result.new()
-        begin
-          result.success = @handler.query(args.table, args.blurQuery)
-        rescue ::Blur::BlurException => ex
-          result.ex = ex
-        end
-        write_result(result, oprot, 'query', seqid)
-      end
-
       def process_cancelQuery(seqid, iprot, oprot)
         args = read_args(iprot, CancelQuery_args)
         result = CancelQuery_result.new()
@@ -606,61 +501,6 @@ module Blur
         write_result(result, oprot, 'tableStats', seqid)
       end
 
-      def process_terms(seqid, iprot, oprot)
-        args = read_args(iprot, Terms_args)
-        result = Terms_result.new()
-        begin
-          result.success = @handler.terms(args.table, args.columnFamily, args.columnName, args.startWith, args.size)
-        rescue ::Blur::BlurException => ex
-          result.ex = ex
-        end
-        write_result(result, oprot, 'terms', seqid)
-      end
-
-      def process_recordFrequency(seqid, iprot, oprot)
-        args = read_args(iprot, RecordFrequency_args)
-        result = RecordFrequency_result.new()
-        begin
-          result.success = @handler.recordFrequency(args.table, args.columnFamily, args.columnName, args.value)
-        rescue ::Blur::BlurException => ex
-          result.ex = ex
-        end
-        write_result(result, oprot, 'recordFrequency', seqid)
-      end
-
-      def process_fetchRow(seqid, iprot, oprot)
-        args = read_args(iprot, FetchRow_args)
-        result = FetchRow_result.new()
-        begin
-          result.success = @handler.fetchRow(args.table, args.selector)
-        rescue ::Blur::BlurException => ex
-          result.ex = ex
-        end
-        write_result(result, oprot, 'fetchRow', seqid)
-      end
-
-      def process_mutate(seqid, iprot, oprot)
-        args = read_args(iprot, Mutate_args)
-        result = Mutate_result.new()
-        begin
-          @handler.mutate(args.mutation)
-        rescue ::Blur::BlurException => ex
-          result.ex = ex
-        end
-        write_result(result, oprot, 'mutate', seqid)
-      end
-
-      def process_mutateBatch(seqid, iprot, oprot)
-        args = read_args(iprot, MutateBatch_args)
-        result = MutateBatch_result.new()
-        begin
-          @handler.mutateBatch(args.mutations)
-        rescue ::Blur::BlurException => ex
-          result.ex = ex
-        end
-        write_result(result, oprot, 'mutateBatch', seqid)
-      end
-
       def process_createTable(seqid, iprot, oprot)
         args = read_args(iprot, CreateTable_args)
         result = CreateTable_result.new()
@@ -977,42 +817,6 @@ module Blur
       ::Thrift::Struct.generate_accessors self
     end
 
-    class Query_args
-      include ::Thrift::Struct, ::Thrift::Struct_Union
-      TABLE = 1
-      BLURQUERY = 2
-
-      FIELDS = {
-        TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
-        BLURQUERY => {:type => ::Thrift::Types::STRUCT, :name => 'blurQuery', :class => ::Blur::BlurQuery}
-      }
-
-      def struct_fields; FIELDS; end
-
-      def validate
-      end
-
-      ::Thrift::Struct.generate_accessors self
-    end
-
-    class Query_result
-      include ::Thrift::Struct, ::Thrift::Struct_Union
-      SUCCESS = 0
-      EX = 1
-
-      FIELDS = {
-        SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Blur::BlurResults},
-        EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => ::Blur::BlurException}
-      }
-
-      def struct_fields; FIELDS; end
-
-      def validate
-      end
-
-      ::Thrift::Struct.generate_accessors self
-    end
-
     class CancelQuery_args
       include ::Thrift::Struct, ::Thrift::Struct_Union
       TABLE = 1
@@ -1253,188 +1057,6 @@ module Blur
       ::Thrift::Struct.generate_accessors self
     end
 
-    class Terms_args
-      include ::Thrift::Struct, ::Thrift::Struct_Union
-      TABLE = 1
-      COLUMNFAMILY = 2
-      COLUMNNAME = 3
-      STARTWITH = 4
-      SIZE = 5
-
-      FIELDS = {
-        TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
-        COLUMNFAMILY => {:type => ::Thrift::Types::STRING, :name => 'columnFamily'},
-        COLUMNNAME => {:type => ::Thrift::Types::STRING, :name => 'columnName'},
-        STARTWITH => {:type => ::Thrift::Types::STRING, :name => 'startWith'},
-        SIZE => {:type => ::Thrift::Types::I16, :name => 'size'}
-      }
-
-      def struct_fields; FIELDS; end
-
-      def validate
-      end
-
-      ::Thrift::Struct.generate_accessors self
-    end
-
-    class Terms_result
-      include ::Thrift::Struct, ::Thrift::Struct_Union
-      SUCCESS = 0
-      EX = 1
-
-      FIELDS = {
-        SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRING}},
-        EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => ::Blur::BlurException}
-      }
-
-      def struct_fields; FIELDS; end
-
-      def validate
-      end
-
-      ::Thrift::Struct.generate_accessors self
-    end
-
-    class RecordFrequency_args
-      include ::Thrift::Struct, ::Thrift::Struct_Union
-      TABLE = 1
-      COLUMNFAMILY = 2
-      COLUMNNAME = 3
-      VALUE = 4
-
-      FIELDS = {
-        TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
-        COLUMNFAMILY => {:type => ::Thrift::Types::STRING, :name => 'columnFamily'},
-        COLUMNNAME => {:type => ::Thrift::Types::STRING, :name => 'columnName'},
-        VALUE => {:type => ::Thrift::Types::STRING, :name => 'value'}
-      }
-
-      def struct_fields; FIELDS; end
-
-      def validate
-      end
-
-      ::Thrift::Struct.generate_accessors self
-    end
-
-    class RecordFrequency_result
-      include ::Thrift::Struct, ::Thrift::Struct_Union
-      SUCCESS = 0
-      EX = 1
-
-      FIELDS = {
-        SUCCESS => {:type => ::Thrift::Types::I64, :name => 'success'},
-        EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => ::Blur::BlurException}
-      }
-
-      def struct_fields; FIELDS; end
-
-      def validate
-      end
-
-      ::Thrift::Struct.generate_accessors self
-    end
-
-    class FetchRow_args
-      include ::Thrift::Struct, ::Thrift::Struct_Union
-      TABLE = 1
-      SELECTOR = 2
-
-      FIELDS = {
-        TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
-        SELECTOR => {:type => ::Thrift::Types::STRUCT, :name => 'selector', :class => ::Blur::Selector}
-      }
-
-      def struct_fields; FIELDS; end
-
-      def validate
-      end
-
-      ::Thrift::Struct.generate_accessors self
-    end
-
-    class FetchRow_result
-      include ::Thrift::Struct, ::Thrift::Struct_Union
-      SUCCESS = 0
-      EX = 1
-
-      FIELDS = {
-        SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Blur::FetchResult},
-        EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => ::Blur::BlurException}
-      }
-
-      def struct_fields; FIELDS; end
-
-      def validate
-      end
-
-      ::Thrift::Struct.generate_accessors self
-    end
-
-    class Mutate_args
-      include ::Thrift::Struct, ::Thrift::Struct_Union
-      MUTATION = 1
-
-      FIELDS = {
-        MUTATION => {:type => ::Thrift::Types::STRUCT, :name => 'mutation', :class => ::Blur::RowMutation}
-      }
-
-      def struct_fields; FIELDS; end
-
-      def validate
-      end
-
-      ::Thrift::Struct.generate_accessors self
-    end
-
-    class Mutate_result
-      include ::Thrift::Struct, ::Thrift::Struct_Union
-      EX = 1
-
-      FIELDS = {
-        EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => ::Blur::BlurException}
-      }
-
-      def struct_fields; FIELDS; end
-
-      def validate
-      end
-
-      ::Thrift::Struct.generate_accessors self
-    end
-
-    class MutateBatch_args
-      include ::Thrift::Struct, ::Thrift::Struct_Union
-      MUTATIONS = 1
-
-      FIELDS = {
-        MUTATIONS => {:type => ::Thrift::Types::LIST, :name => 'mutations', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Blur::RowMutation}}
-      }
-
-      def struct_fields; FIELDS; end
-
-      def validate
-      end
-
-      ::Thrift::Struct.generate_accessors self
-    end
-
-    class MutateBatch_result
-      include ::Thrift::Struct, ::Thrift::Struct_Union
-      EX = 1
-
-      FIELDS = {
-        EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => ::Blur::BlurException}
-      }
-
-      def struct_fields; FIELDS; end
-
-      def validate
-      end
-
-      ::Thrift::Struct.generate_accessors self
-    end
-
     class CreateTable_args
       include ::Thrift::Struct, ::Thrift::Struct_Union
       TABLEDESCRIPTOR = 1

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableClient.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableClient.java b/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableClient.java
deleted file mode 100644
index d6f62a0..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableClient.java
+++ /dev/null
@@ -1,149 +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.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.atomic.AtomicLongArray;
-
-import org.apache.blur.log.Log;
-import org.apache.blur.log.LogFactory;
-import org.apache.blur.thrift.generated.Blur;
-import org.apache.blur.thrift.generated.BlurQuery;
-import org.apache.blur.thrift.generated.BlurResult;
-import org.apache.blur.thrift.generated.BlurResults;
-import org.apache.blur.thrift.generated.Blur.Client;
-
-
-public class BlurResultIterableClient implements BlurResultIterable {
-
-  private static final Log LOG = LogFactory.getLog(BlurResultIterableClient.class);
-
-  private Map<String, Long> _shardInfo = new TreeMap<String, Long>();
-  private Client _client;
-  private String _table;
-  private BlurResults _results;
-  private int _remoteFetchCount;
-  private int _batch = 0;
-  private long _totalResults;
-  private long _skipTo;
-  private AtomicLongArray _facetCounts;
-  private boolean _alreadyProcessed;
-  private BlurQuery _originalQuery;
-
-  public BlurResultIterableClient(Blur.Client client, String table, BlurQuery query, AtomicLongArray facetCounts, int remoteFetchCount) {
-    _client = client;
-    _table = table;
-    _facetCounts = facetCounts;
-    _originalQuery = query;
-    _remoteFetchCount = remoteFetchCount;
-    performSearch();
-  }
-
-  private void performSearch() {
-    try {
-      long cursor = _remoteFetchCount * _batch;
-      BlurQuery blurQuery = new BlurQuery(_originalQuery.simpleQuery, _originalQuery.expertQuery, _originalQuery.facets, null, false, _originalQuery.useCacheIfPresent, cursor,
-          _remoteFetchCount, _originalQuery.minimumNumberOfResults, _originalQuery.maxQueryTime, _originalQuery.uuid, _originalQuery.userContext, _originalQuery.cacheResult,
-          _originalQuery.startTime, _originalQuery.modifyFileCaches);
-      _results = _client.query(_table, blurQuery);
-      addFacets();
-      _totalResults = _results.totalResults;
-      _shardInfo.putAll(_results.shardInfo);
-      _batch++;
-    } catch (Exception e) {
-      LOG.error("Error during for [{0}]", e, _originalQuery);
-      throw new RuntimeException(e);
-    }
-  }
-
-  private void addFacets() {
-    if (!_alreadyProcessed) {
-      List<Long> counts = _results.facetCounts;
-      if (counts != null) {
-        int size = counts.size();
-        for (int i = 0; i < size; i++) {
-          _facetCounts.addAndGet(i, counts.get(i));
-        }
-      }
-      _alreadyProcessed = true;
-    }
-  }
-
-  @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() {
-    SearchIterator iterator = new SearchIterator();
-    long start = 0;
-    while (iterator.hasNext() && start < _skipTo) {
-      iterator.next();
-      start++;
-    }
-    return iterator;
-  }
-
-  public class SearchIterator implements Iterator<BlurResult> {
-
-    private int position = 0;
-    private int relposition = 0;
-
-    @Override
-    public boolean hasNext() {
-      if (position < _originalQuery.minimumNumberOfResults && position < _totalResults) {
-        return true;
-      }
-      return false;
-    }
-
-    @Override
-    public BlurResult next() {
-      if (relposition >= _results.results.size()) {
-        performSearch();
-        relposition = 0;
-      }
-      position++;
-      return _results.results.get(relposition++);
-    }
-
-    @Override
-    public void remove() {
-
-    }
-  }
-
-  @Override
-  public void close() throws IOException {
-    // nothing
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/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
index 625c663..c3d3cc6 100644
--- 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
@@ -26,6 +26,7 @@ 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 {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/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
index 7eddb0a..c41fac4 100644
--- 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
@@ -19,6 +19,7 @@ package org.apache.blur.manager.results;
 import java.util.Comparator;
 
 import org.apache.blur.thrift.generated.BlurResult;
+import org.apache.blur.utils.PeekableIterator;
 
 
 public class BlurResultPeekableIteratorComparator implements Comparator<PeekableIterator<BlurResult>> {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/src/blur-core/src/main/java/org/apache/blur/manager/results/PeekableIterator.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/results/PeekableIterator.java b/src/blur-core/src/main/java/org/apache/blur/manager/results/PeekableIterator.java
deleted file mode 100644
index 4b5b5f8..0000000
--- a/src/blur-core/src/main/java/org/apache/blur/manager/results/PeekableIterator.java
+++ /dev/null
@@ -1,66 +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.Iterator;
-
-public class PeekableIterator<E> implements Iterator<E> {
-
-  private Iterator<E> iterator;
-  private E current;
-
-  public PeekableIterator(Iterator<E> iterator) {
-    if (iterator.hasNext()) {
-      current = iterator.next();
-    }
-    this.iterator = iterator;
-  }
-
-  /**
-   * Only valid is hasNext is true. If hasNext if false, peek will return null;
-   * 
-   * @return <E>
-   */
-  public E peek() {
-    return current;
-  }
-
-  @Override
-  public boolean hasNext() {
-    if (current != null) {
-      return true;
-    }
-    return iterator.hasNext();
-  }
-
-  @Override
-  public E next() {
-    E next = null;
-    if (iterator.hasNext()) {
-      next = iterator.next();
-    }
-    E result = current;
-    current = next;
-    return result;
-  }
-
-  @Override
-  public void remove() {
-
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/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 2ce0fe5..e805888 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
@@ -24,16 +24,13 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
-import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 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 java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.blur.concurrent.Executors;
@@ -41,42 +38,30 @@ 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.IndexManager;
 import org.apache.blur.manager.clusterstatus.ZookeeperPathConstants;
 import org.apache.blur.manager.indexserver.DistributedLayoutManager;
-import org.apache.blur.manager.results.BlurResultIterable;
-import org.apache.blur.manager.results.BlurResultIterableClient;
-import org.apache.blur.manager.results.MergerBlurResultIterable;
 import org.apache.blur.manager.stats.MergerTableStats;
 import org.apache.blur.manager.status.MergerQueryStatus;
 import org.apache.blur.manager.status.MergerQueryStatusSingle;
-import org.apache.blur.thrift.BException;
-import org.apache.blur.thrift.BlurClientManager;
 import org.apache.blur.thrift.commands.BlurCommand;
+import org.apache.blur.thrift.generated.Blur.Client;
+import org.apache.blur.thrift.generated.Blur.Iface;
 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.BlurResults;
-import org.apache.blur.thrift.generated.FetchResult;
-import org.apache.blur.thrift.generated.RowMutation;
 import org.apache.blur.thrift.generated.Schema;
 import org.apache.blur.thrift.generated.Selector;
 import org.apache.blur.thrift.generated.TableDescriptor;
 import org.apache.blur.thrift.generated.TableStats;
-import org.apache.blur.thrift.generated.Blur.Client;
-import org.apache.blur.thrift.generated.Blur.Iface;
 import org.apache.blur.utils.BlurConstants;
 import org.apache.blur.utils.BlurExecutorCompletionService;
 import org.apache.blur.utils.BlurUtil;
 import org.apache.blur.utils.ForkJoin;
-import org.apache.blur.utils.QueryCache;
-import org.apache.blur.utils.QueryCacheEntry;
-import org.apache.blur.utils.QueryCacheKey;
 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.WatchNodeExistance;
 import org.apache.blur.zookeeper.WatchChildren.OnChange;
+import org.apache.blur.zookeeper.WatchNodeExistance;
 import org.apache.hadoop.io.BytesWritable;
 import org.apache.thrift.TException;
 import org.apache.zookeeper.CreateMode;
@@ -295,86 +280,6 @@ public class BlurControllerServer extends TableAdmin implements Iface {
   }
 
   @Override
-  public BlurResults query(final String table, final BlurQuery blurQuery) throws BlurException, TException {
-    // @TODO make this faster
-    checkTable(table);
-    String cluster = _clusterStatus.getCluster(true, table);
-    _queryChecker.checkQuery(blurQuery);
-    int shardCount = _clusterStatus.getShardCount(true, cluster, table);
-
-    OUTER: for (int retries = 0; retries < _maxDefaultRetries; retries++) {
-      try {
-        final AtomicLongArray facetCounts = BlurUtil.getAtomicLongArraySameLengthAsList(blurQuery.facets);
-
-        BlurQuery original = new BlurQuery(blurQuery);
-        if (blurQuery.useCacheIfPresent) {
-          LOG.debug("Using cache for query [{0}] on table [{1}].", blurQuery, table);
-          QueryCacheKey key = QueryCache.getNormalizedBlurQueryKey(table, blurQuery);
-          QueryCacheEntry queryCacheEntry = _queryCache.get(key);
-          if (_queryCache.isValid(queryCacheEntry)) {
-            LOG.debug("Cache hit for query [{0}] on table [{1}].", blurQuery, table);
-            return queryCacheEntry.getBlurResults(blurQuery);
-          } else {
-            _queryCache.remove(key);
-          }
-        }
-
-        BlurUtil.setStartTime(original);
-
-        Selector selector = blurQuery.getSelector();
-        blurQuery.setSelector(null);
-
-        BlurResultIterable hitsIterable = scatterGather(getCluster(table), new BlurCommand<BlurResultIterable>() {
-          @Override
-          public BlurResultIterable call(Client client) throws BlurException, TException {
-            return new BlurResultIterableClient(client, table, blurQuery, facetCounts, _remoteFetchCount);
-          }
-        }, new MergerBlurResultIterable(blurQuery));
-        BlurResults results = BlurUtil.convertToHits(hitsIterable, blurQuery, facetCounts, _executor, selector, this, table);
-        if (!validResults(results, shardCount, blurQuery)) {
-          BlurClientManager.sleep(_defaultDelay, _maxDefaultDelay, retries, _maxDefaultRetries);
-          continue OUTER;
-        }
-        return _queryCache.cache(table, original, results);
-      } catch (Exception e) {
-        LOG.error("Unknown error during search of [table={0},blurQuery={1}]", e, table, blurQuery);
-        throw new BException("Unknown error during search of [table={0},blurQuery={1}]", e, table, blurQuery);
-      }
-    }
-    throw new BlurException("Query could not be completed.", null);
-  }
-
-  private boolean validResults(BlurResults results, int shardCount, BlurQuery query) {
-    if (results.totalResults >= query.minimumNumberOfResults) {
-      return true;
-    }
-    int shardInfoSize = results.getShardInfoSize();
-    if (shardInfoSize == shardCount) {
-      return true;
-    }
-    return false;
-  }
-
-  @Override
-  public FetchResult fetchRow(final String table, final Selector selector) throws BlurException, TException {
-    checkTable(table);
-    IndexManager.validSelector(selector);
-    String clientHostnamePort = null;
-    try {
-      clientHostnamePort = getNode(table, selector);
-      return _client.execute(clientHostnamePort, new BlurCommand<FetchResult>() {
-        @Override
-        public FetchResult call(Client client) throws BlurException, TException {
-          return client.fetchRow(table, selector);
-        }
-      }, _maxFetchRetries, _fetchDelay, _maxFetchDelay);
-    } catch (Exception e) {
-      LOG.error("Unknown error during fetch of row from table [{0}] selector [{1}] node [{2}]", e, table, selector, clientHostnamePort);
-      throw new BException("Unknown error during fetch of row from table [{0}] selector [{1}] node [{2}]", e, table, selector, clientHostnamePort);
-    }
-  }
-
-  @Override
   public void cancelQuery(final String table, final long uuid) throws BlurException, TException {
     checkTable(table);
     try {
@@ -477,32 +382,6 @@ public class BlurControllerServer extends TableAdmin implements Iface {
     return tableLayout;
   }
 
-  @Override
-  public long recordFrequency(final String table, final String columnFamily, final String columnName, final String value) throws BlurException, TException {
-    checkTable(table);
-    try {
-      return scatterGather(getCluster(table), new BlurCommand<Long>() {
-        @Override
-        public Long call(Client client) throws BlurException, TException {
-          return client.recordFrequency(table, columnFamily, columnName, value);
-        }
-      }, new Merger<Long>() {
-
-        @Override
-        public Long merge(BlurExecutorCompletionService<Long> service) throws BlurException {
-          Long total = 0L;
-          while (service.getRemainingCount() > 0) {
-            Future<Long> future = service.poll(_defaultParallelCallTimeout, TimeUnit.MILLISECONDS, true, table, columnFamily, columnName, value);
-            total += service.getResultThrowException(future, table, columnFamily, columnName, value);
-          }
-          return total;
-        }
-      });
-    } catch (Exception e) {
-      LOG.error("Unknown error while trying to get record frequency [{0}/{1}/{2}/{3}]", e, table, columnFamily, columnName, value);
-      throw new BException("Unknown error while trying to get record frequency [{0}/{1}/{2}/{3}]", e, table, columnFamily, columnName, value);
-    }
-  }
 
   @Override
   public Schema schema(final String table) throws BlurException, TException {
@@ -535,33 +414,6 @@ public class BlurControllerServer extends TableAdmin implements Iface {
     }
   }
 
-  @Override
-  public List<String> terms(final String table, final String columnFamily, final String columnName, final String startWith, final short size) throws BlurException, TException {
-    checkTable(table);
-    try {
-      return scatterGather(getCluster(table), new BlurCommand<List<String>>() {
-        @Override
-        public List<String> call(Client client) throws BlurException, TException {
-          return client.terms(table, columnFamily, columnName, startWith, size);
-        }
-      }, new Merger<List<String>>() {
-        @Override
-        public List<String> merge(BlurExecutorCompletionService<List<String>> service) throws BlurException {
-          TreeSet<String> terms = new TreeSet<String>();
-          while (service.getRemainingCount() > 0) {
-            Future<List<String>> future = service.poll(_defaultParallelCallTimeout, TimeUnit.MILLISECONDS, true, table, columnFamily, columnName, startWith, size);
-            terms.addAll(service.getResultThrowException(future, table, columnFamily, columnName, startWith, size));
-          }
-          return new ArrayList<String>(terms).subList(0, Math.min(terms.size(), size));
-        }
-      });
-    } catch (Exception e) {
-      LOG.error("Unknown error while trying to terms table [{0}] columnFamily [{1}] columnName [{2}] startWith [{3}] size [{4}]", e, table, columnFamily, columnName, startWith,
-          size);
-      throw new BException("Unknown error while trying to terms table [{0}] columnFamily [{1}] columnName [{2}] startWith [{3}] size [{4}]", e, table, columnFamily, columnName,
-          startWith, size);
-    }
-  }
 
   private String getNode(String table, Selector selector) throws BlurException, TException {
     Map<String, String> layout = shardServerLayout(table);
@@ -624,34 +476,6 @@ public class BlurControllerServer extends TableAdmin implements Iface {
     return result;
   }
 
-  @Override
-  public void mutate(final RowMutation mutation) throws BlurException, TException {
-    checkTable(mutation.table);
-    checkForUpdates(mutation.table);
-    try {
-      MutationHelper.validateMutation(mutation);
-      String table = mutation.getTable();
-
-      int numberOfShards = getShardCount(table);
-      Map<String, String> tableLayout = _shardServerLayout.get().get(table);
-      if (tableLayout.size() != numberOfShards) {
-        throw new BlurException("Cannot update data while shard is missing", null);
-      }
-
-      String shardName = MutationHelper.getShardName(table, mutation.rowId, numberOfShards, _blurPartitioner);
-      String node = tableLayout.get(shardName);
-      _client.execute(node, new BlurCommand<Void>() {
-        @Override
-        public Void call(Client client) throws BlurException, TException {
-          client.mutate(mutation);
-          return null;
-        }
-      }, _maxMutateRetries, _mutateDelay, _maxMutateDelay);
-    } catch (Exception e) {
-      LOG.error("Unknown error during mutation of [{0}]", e, mutation);
-      throw new BException("Unknown error during mutation of [{0}]", e, mutation);
-    }
-  }
 
   private int getShardCount(String table) throws BlurException, TException {
     Integer numberOfShards = _tableShardCountMap.get(table);
@@ -663,54 +487,6 @@ public class BlurControllerServer extends TableAdmin implements Iface {
     return numberOfShards;
   }
 
-  @Override
-  public void mutateBatch(List<RowMutation> mutations) throws BlurException, TException {
-    for (RowMutation mutation : mutations) {
-      MutationHelper.validateMutation(mutation);
-    }
-    Map<String, List<RowMutation>> batches = new HashMap<String, List<RowMutation>>();
-    for (RowMutation mutation : mutations) {
-      checkTable(mutation.table);
-      checkForUpdates(mutation.table);
-
-      MutationHelper.validateMutation(mutation);
-      String table = mutation.getTable();
-
-      int numberOfShards = getShardCount(table);
-      Map<String, String> tableLayout = _shardServerLayout.get().get(table);
-      if (tableLayout.size() != numberOfShards) {
-        throw new BlurException("Cannot update data while shard is missing", null);
-      }
-
-      String shardName = MutationHelper.getShardName(table, mutation.rowId, numberOfShards, _blurPartitioner);
-      String node = tableLayout.get(shardName);
-      List<RowMutation> list = batches.get(node);
-      if (list == null) {
-        list = new ArrayList<RowMutation>();
-        batches.put(node, list);
-      }
-      list.add(mutation);
-
-    }
-
-    for (Entry<String, List<RowMutation>> entry : batches.entrySet()) {
-      String node = entry.getKey();
-      final List<RowMutation> mutationsLst = entry.getValue();
-      try {
-        _client.execute(node, new BlurCommand<Void>() {
-          @Override
-          public Void call(Client client) throws BlurException, TException {
-            client.mutateBatch(mutationsLst);
-            return null;
-          }
-        }, _maxMutateRetries, _mutateDelay, _maxMutateDelay);
-      } catch (Exception e) {
-        LOG.error("Unknown error during mutations of [{0}]", e, mutationsLst);
-        throw new BException("Unknown error during mutations of [{0}]", e, mutationsLst);
-      }
-    }
-  }
-
   public void setNodeName(String nodeName) {
     _nodeName = nodeName;
   }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/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 0308088..0e56c87 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
@@ -16,6 +16,7 @@ package org.apache.blur.thrift;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import static org.apache.blur.thrift.lucene.Convert.toThrift;
 import static org.apache.blur.utils.BlurConstants.BLUR_SHARD_CACHE_MAX_QUERYCACHE_ELEMENTS;
 import static org.apache.blur.utils.BlurConstants.BLUR_SHARD_CACHE_MAX_TIMETOLIVE;
 import static org.apache.blur.utils.BlurConstants.BLUR_SHARD_DATA_FETCH_THREAD_COUNT;
@@ -35,7 +36,6 @@ import java.util.concurrent.ConcurrentHashMap;
 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.BlurConfiguration;
 import org.apache.blur.analysis.BlurAnalyzer;
@@ -45,22 +45,16 @@ 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.results.BlurResultIterable;
 import org.apache.blur.manager.writer.BlurIndex;
 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.BlurResults;
 import org.apache.blur.thrift.generated.DocLocation;
 import org.apache.blur.thrift.generated.Document;
-import org.apache.blur.thrift.generated.FetchResult;
-import org.apache.blur.thrift.generated.ShardServer.Iface;
 import org.apache.blur.thrift.generated.MutateOptions;
 import org.apache.blur.thrift.generated.QueryArgs;
-import org.apache.blur.thrift.generated.RowMutation;
 import org.apache.blur.thrift.generated.Schema;
-import org.apache.blur.thrift.generated.Selector;
 import org.apache.blur.thrift.generated.Session;
+import org.apache.blur.thrift.generated.ShardServer.Iface;
 import org.apache.blur.thrift.generated.TableStats;
 import org.apache.blur.thrift.generated.Term;
 import org.apache.blur.thrift.generated.TopFieldDocs;
@@ -69,8 +63,6 @@ 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.blur.utils.QueryCacheEntry;
-import org.apache.blur.utils.QueryCacheKey;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.Filter;
 import org.apache.lucene.search.IndexSearcher;
@@ -78,7 +70,6 @@ import org.apache.lucene.search.Query;
 import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.Sort;
 import org.apache.thrift.TException;
-import static org.apache.blur.thrift.lucene.Convert.*;
 
 public class BlurShardServer extends TableAdmin implements Iface {
 
@@ -112,56 +103,6 @@ public class BlurShardServer extends TableAdmin implements Iface {
   }
 
   @Override
-  public BlurResults query(String table, BlurQuery blurQuery) throws BlurException, TException {
-    checkTable(_cluster, table);
-    _queryChecker.checkQuery(blurQuery);
-    try {
-      BlurQuery original = new BlurQuery(blurQuery);
-      if (blurQuery.useCacheIfPresent) {
-        LOG.debug("Using cache for query [{0}] on table [{1}].", blurQuery, table);
-        QueryCacheKey key = QueryCache.getNormalizedBlurQueryKey(table, blurQuery);
-        QueryCacheEntry queryCacheEntry = _queryCache.get(key);
-        if (_queryCache.isValid(queryCacheEntry, _indexServer.getShardListCurrentServerOnly(table))) {
-          LOG.debug("Cache hit for query [{0}] on table [{1}].", blurQuery, table);
-          return queryCacheEntry.getBlurResults(blurQuery);
-        } else {
-          _queryCache.remove(key);
-        }
-      }
-      BlurUtil.setStartTime(original);
-      BlurResultIterable hitsIterable = null;
-      try {
-        AtomicLongArray facetCounts = BlurUtil.getAtomicLongArraySameLengthAsList(blurQuery.facets);
-        hitsIterable = _indexManager.query(table, blurQuery, facetCounts);
-        return _queryCache.cache(table, original, BlurUtil.convertToHits(hitsIterable, blurQuery, facetCounts, _dataFetch, blurQuery.selector, this, table));
-      } catch (Exception e) {
-        LOG.error("Unknown error during search of [table={0},searchQuery={1}]", e, table, blurQuery);
-        throw new BException(e.getMessage(), e);
-      } finally {
-        if (hitsIterable != null) {
-          hitsIterable.close();
-        }
-      }
-    } catch (IOException e) {
-      LOG.error("Unknown error during search of [table={0},searchQuery={1}]", e, table, blurQuery);
-      throw new BException(e.getMessage(), e);
-    }
-  }
-
-  @Override
-  public FetchResult fetchRow(String table, Selector selector) throws BlurException, TException {
-    checkTable(_cluster, table);
-    try {
-      FetchResult fetchResult = new FetchResult();
-      _indexManager.fetchRow(table, selector, fetchResult);
-      return fetchResult;
-    } catch (Exception e) {
-      LOG.error("Unknown error while trying to get fetch row [table={0},selector={1}]", e, table, selector);
-      throw new BException(e.getMessage(), e);
-    }
-  }
-
-  @Override
   public void cancelQuery(String table, long uuid) throws BlurException, TException {
     checkTable(_cluster, table);
     try {
@@ -229,17 +170,6 @@ public class BlurShardServer extends TableAdmin implements Iface {
   }
 
   @Override
-  public long recordFrequency(String table, String columnFamily, String columnName, String value) throws BlurException, TException {
-    checkTable(_cluster, table);
-    try {
-      return _indexManager.recordFrequency(table, columnFamily, columnName, value);
-    } catch (Exception e) {
-      LOG.error("Unknown error while trying to get record frequency for [table={0},columnFamily={1},columnName={2},value={3}]", e, table, columnFamily, columnName, value);
-      throw new BException(e.getMessage(), e);
-    }
-  }
-
-  @Override
   public Schema schema(String table) throws BlurException, TException {
     checkTable(_cluster, table);
     try {
@@ -250,49 +180,6 @@ public class BlurShardServer extends TableAdmin implements Iface {
     }
   }
 
-  @Override
-  public List<String> terms(String table, String columnFamily, String columnName, String startWith, short size) throws BlurException, TException {
-    checkTable(_cluster, table);
-    try {
-      return _indexManager.terms(table, columnFamily, columnName, startWith, size);
-    } catch (Exception e) {
-      LOG.error("Unknown error while trying to get terms list for [table={0},columnFamily={1},columnName={2},startWith={3},size={4}]", e, table, columnFamily, columnName,
-          startWith, size);
-      throw new BException(e.getMessage(), e);
-    }
-  }
-
-  @Override
-  public void mutate(RowMutation mutation) throws BlurException, TException {
-    checkTable(_cluster, mutation.table);
-    checkForUpdates(_cluster, mutation.table);
-    MutationHelper.validateMutation(mutation);
-    try {
-      _indexManager.mutate(mutation);
-    } catch (Exception e) {
-      LOG.error("Unknown error during processing of [mutation={0}]", e, mutation);
-      throw new BException(e.getMessage(), e);
-    }
-  }
-
-  @Override
-  public void mutateBatch(List<RowMutation> mutations) throws BlurException, TException {
-    long s = System.nanoTime();
-    for (RowMutation mutation : mutations) {
-      checkTable(_cluster, mutation.table);
-      checkForUpdates(_cluster, mutation.table);
-      MutationHelper.validateMutation(mutation);
-    }
-    try {
-      _indexManager.mutate(mutations);
-    } catch (Exception e) {
-      LOG.error("Unknown error during processing of [mutations={0}]", e, mutations);
-      throw new BException(e.getMessage(), e);
-    }
-    long e = System.nanoTime();
-    LOG.debug("mutateBatch took [" + (e - s) / 1000000.0 + " ms] to complete");
-  }
-
   public long getMaxTimeToLive() {
     return _maxTimeToLive;
   }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/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 e3d7d14..6158b8e 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
@@ -23,7 +23,6 @@ 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.manager.results.PeekableIterator;
 import org.apache.blur.thrift.generated.BlurResult;
 import org.apache.lucene.index.Term;
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/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 22cf6c4..32016b8 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
@@ -325,50 +325,6 @@ public class BlurUtil {
     return new AtomicLongArray(list.size());
   }
 
-  public static BlurResults convertToHits(BlurResultIterable hitsIterable, BlurQuery query, AtomicLongArray facetCounts, ExecutorService executor, Selector selector,
-      final Iface iface, final String table) throws InterruptedException, ExecutionException {
-    BlurResults results = new BlurResults();
-    results.setTotalResults(hitsIterable.getTotalResults());
-    results.setShardInfo(hitsIterable.getShardInfo());
-    if (query.minimumNumberOfResults > 0) {
-      hitsIterable.skipTo(query.start);
-      int count = 0;
-      Iterator<BlurResult> iterator = hitsIterable.iterator();
-      while (iterator.hasNext() && count < query.fetch) {
-        results.addToResults(iterator.next());
-        count++;
-      }
-    }
-    if (results.results == null) {
-      results.results = new ArrayList<BlurResult>();
-    }
-    if (facetCounts != null) {
-      results.facetCounts = BlurUtil.toList(facetCounts);
-    }
-    if (selector != null) {
-      List<Future<FetchResult>> futures = new ArrayList<Future<FetchResult>>();
-      for (int i = 0; i < results.results.size(); i++) {
-        BlurResult result = results.results.get(i);
-        final Selector s = new Selector(selector);
-        s.setLocationId(result.locationId);
-        futures.add(executor.submit(new Callable<FetchResult>() {
-          @Override
-          public FetchResult call() throws Exception {
-            return iface.fetchRow(table, s);
-          }
-        }));
-      }
-      for (int i = 0; i < results.results.size(); i++) {
-        Future<FetchResult> future = futures.get(i);
-        BlurResult result = results.results.get(i);
-        result.setFetchResult(future.get());
-      }
-    }
-    results.query = query;
-    results.query.selector = selector;
-    return results;
-  }
-
   public static void setStartTime(BlurQuery query) {
     if (query.startTime == 0) {
       query.startTime = System.currentTimeMillis();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/src/blur-core/src/main/java/org/apache/blur/utils/PeekableIterator.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/utils/PeekableIterator.java b/src/blur-core/src/main/java/org/apache/blur/utils/PeekableIterator.java
new file mode 100644
index 0000000..b8e5b22
--- /dev/null
+++ b/src/blur-core/src/main/java/org/apache/blur/utils/PeekableIterator.java
@@ -0,0 +1,66 @@
+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.Iterator;
+
+public class PeekableIterator<E> implements Iterator<E> {
+
+  private Iterator<E> iterator;
+  private E current;
+
+  public PeekableIterator(Iterator<E> iterator) {
+    if (iterator.hasNext()) {
+      current = iterator.next();
+    }
+    this.iterator = iterator;
+  }
+
+  /**
+   * Only valid is hasNext is true. If hasNext if false, peek will return null;
+   * 
+   * @return <E>
+   */
+  public E peek() {
+    return current;
+  }
+
+  @Override
+  public boolean hasNext() {
+    if (current != null) {
+      return true;
+    }
+    return iterator.hasNext();
+  }
+
+  @Override
+  public E next() {
+    E next = null;
+    if (iterator.hasNext()) {
+      next = iterator.next();
+    }
+    E result = current;
+    current = next;
+    return result;
+  }
+
+  @Override
+  public void remove() {
+
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/src/blur-core/src/test/java/org/apache/blur/MiniCluster.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/org/apache/blur/MiniCluster.java b/src/blur-core/src/test/java/org/apache/blur/MiniCluster.java
index 1854f52..6f19ce5 100644
--- a/src/blur-core/src/test/java/org/apache/blur/MiniCluster.java
+++ b/src/blur-core/src/test/java/org/apache/blur/MiniCluster.java
@@ -44,31 +44,18 @@ import java.util.concurrent.ThreadPoolExecutor;
 
 import org.apache.blur.log.Log;
 import org.apache.blur.log.LogFactory;
-import org.apache.blur.thrift.BlurClient;
 import org.apache.blur.thrift.BlurClientManager;
 import org.apache.blur.thrift.Connection;
 import org.apache.blur.thrift.ThriftBlurControllerServer;
 import org.apache.blur.thrift.ThriftBlurShardServer;
 import org.apache.blur.thrift.ThriftServer;
-import org.apache.blur.thrift.generated.AnalyzerDefinition;
 import org.apache.blur.thrift.generated.Blur.Client;
-import org.apache.blur.thrift.generated.Blur.Iface;
-import org.apache.blur.thrift.generated.BlurException;
-import org.apache.blur.thrift.generated.BlurQuery;
-import org.apache.blur.thrift.generated.BlurResults;
-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.RowMutation;
-import org.apache.blur.thrift.generated.TableDescriptor;
-import org.apache.blur.utils.BlurUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransportException;
-import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.ZooKeeper;
@@ -84,47 +71,12 @@ public abstract class MiniCluster {
 
   private static MiniDFSCluster cluster;
   private static Thread serverThread;
-  // private static String zkConnectionString = "localhost:21810";
   private static ZooKeeperServerMainEmbedded zooKeeperServerMain;
   private static List<ThriftServer> controllers = new ArrayList<ThriftServer>();
   private static List<ThriftServer> shards = new ArrayList<ThriftServer>();
   private static String controllerConnectionStr;
   private static int zkPort;
 
-  public static void main(String[] args) throws IOException, InterruptedException, KeeperException, BlurException, TException {
-    startDfs("main");
-    startZooKeeper("main");
-    startControllers(1);
-    startShards(1);
-
-    try {
-      Iface client = BlurClient.getClient(getControllerConnectionStr());
-      createTable("test", client);
-      long start = System.nanoTime();
-      for (int i = 0; i < 1000; i++) {
-        long now = System.nanoTime();
-        if (start + 5000000000L < now) {
-          System.out.println("Total [" + i + "]");
-          start = now;
-        }
-        addRow("test", i, client);
-      }
-
-      // This waits for all the data to become visible.
-      Thread.sleep(2000);
-
-      for (int i = 0; i < 1000; i++) {
-        searchRow("test", i, client);
-      }
-
-    } finally {
-      stopShards();
-      stopControllers();
-      shutdownZooKeeper();
-      shutdownDfs();
-    }
-  }
-
   public static void startBlurCluster(String name, int controllerCount, int shardCount) {
     startDfs(name);
     startZooKeeper(name);
@@ -139,41 +91,10 @@ public abstract class MiniCluster {
     shutdownDfs();
   }
 
-  private static void createTable(String test, Iface client) throws BlurException, TException, IOException {
-    final TableDescriptor descriptor = new TableDescriptor();
-    descriptor.setName(test);
-    descriptor.setShardCount(7);
-    descriptor.setAnalyzerDefinition(new AnalyzerDefinition());
-    descriptor.setTableUri(getFileSystemUri() + "/blur/" + test);
-    client.createTable(descriptor);
-  }
-
   public static String getControllerConnectionStr() {
     return controllerConnectionStr;
   }
 
-  private static void addRow(String table, int i, Iface client) throws BlurException, TException {
-    Row row = new Row();
-    row.setId(Integer.toString(i));
-    Record record = new Record();
-    record.setRecordId(Integer.toString(i));
-    record.setFamily("test");
-    record.addToColumns(new Column("test", Integer.toString(i)));
-    row.addToRecords(record);
-    RowMutation rowMutation = BlurUtil.toRowMutation(table, row);
-    rowMutation.setWal(false);
-    client.mutate(rowMutation);
-  }
-
-  private static void searchRow(String table, int i, Iface client) throws BlurException, TException {
-    BlurQuery blurQuery = BlurUtil.newSimpleQuery("test.test:" + i);
-    System.out.println("Running [" + blurQuery + "]");
-    BlurResults results = client.query(table, blurQuery);
-    if (results.getTotalResults() != 1L) {
-      throw new RuntimeException("we got a problem here.");
-    }
-  }
-
   public static void stopControllers() {
     for (ThriftServer s : controllers) {
       s.close();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/src/blur-core/src/test/java/org/apache/blur/manager/results/BlurResultPeekableIteratorComparatorTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/org/apache/blur/manager/results/BlurResultPeekableIteratorComparatorTest.java b/src/blur-core/src/test/java/org/apache/blur/manager/results/BlurResultPeekableIteratorComparatorTest.java
index 02107fd..c80ecf7 100644
--- a/src/blur-core/src/test/java/org/apache/blur/manager/results/BlurResultPeekableIteratorComparatorTest.java
+++ b/src/blur-core/src/test/java/org/apache/blur/manager/results/BlurResultPeekableIteratorComparatorTest.java
@@ -22,9 +22,9 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.blur.manager.results.PeekableIterator;
 import org.apache.blur.thrift.generated.BlurResult;
 import org.apache.blur.utils.BlurConstants;
+import org.apache.blur.utils.PeekableIterator;
 import org.junit.Test;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/src/blur-core/src/test/java/org/apache/blur/manager/results/PeekableIteratorTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/org/apache/blur/manager/results/PeekableIteratorTest.java b/src/blur-core/src/test/java/org/apache/blur/manager/results/PeekableIteratorTest.java
index f590ef0..2527b99 100644
--- a/src/blur-core/src/test/java/org/apache/blur/manager/results/PeekableIteratorTest.java
+++ b/src/blur-core/src/test/java/org/apache/blur/manager/results/PeekableIteratorTest.java
@@ -20,7 +20,7 @@ package org.apache.blur.manager.results;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.apache.blur.manager.results.PeekableIterator;
+import org.apache.blur.utils.PeekableIterator;
 import org.junit.Test;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/src/blur-core/src/test/java/org/apache/blur/thrift/BlurClusterTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/org/apache/blur/thrift/BlurClusterTest.java b/src/blur-core/src/test/java/org/apache/blur/thrift/BlurClusterTest.java
index c6a31bc..d1fff57 100644
--- a/src/blur-core/src/test/java/org/apache/blur/thrift/BlurClusterTest.java
+++ b/src/blur-core/src/test/java/org/apache/blur/thrift/BlurClusterTest.java
@@ -96,24 +96,24 @@ public class BlurClusterTest {
     return BlurClient.getClient(MiniCluster.getControllerConnectionStr());
   }
 
-  @Test
-  public void testLoadTable() throws BlurException, TException, InterruptedException {
-    Iface client = getClient();
-    int length = 100;
-    List<RowMutation> mutations = new ArrayList<RowMutation>();
-    for (int i = 0; i < length; i++) {
-      String rowId = UUID.randomUUID().toString();
-      RecordMutation mutation = BlurUtil.newRecordMutation("test", rowId, BlurUtil.newColumn("test", "value"));
-      RowMutation rowMutation = BlurUtil.newRowMutation("test", rowId, mutation);
-      rowMutation.setWaitToBeVisible(true);
-      mutations.add(rowMutation);
-    }
-    client.mutateBatch(mutations);
-    BlurQuery blurQuery = new BlurQuery();
-    SimpleQuery simpleQuery = new SimpleQuery();
-    simpleQuery.setQueryStr("test.test:value");
-    blurQuery.setSimpleQuery(simpleQuery);
-    BlurResults results = client.query("test", blurQuery);
-    assertEquals(length, results.getTotalResults());
-  }
+//  @Test
+//  public void testLoadTable() throws BlurException, TException, InterruptedException {
+//    Iface client = getClient();
+//    int length = 100;
+//    List<RowMutation> mutations = new ArrayList<RowMutation>();
+//    for (int i = 0; i < length; i++) {
+//      String rowId = UUID.randomUUID().toString();
+//      RecordMutation mutation = BlurUtil.newRecordMutation("test", rowId, BlurUtil.newColumn("test", "value"));
+//      RowMutation rowMutation = BlurUtil.newRowMutation("test", rowId, mutation);
+//      rowMutation.setWaitToBeVisible(true);
+//      mutations.add(rowMutation);
+//    }
+//    client.mutateBatch(mutations);
+//    BlurQuery blurQuery = new BlurQuery();
+//    SimpleQuery simpleQuery = new SimpleQuery();
+//    simpleQuery.setQueryStr("test.test:value");
+//    blurQuery.setSimpleQuery(simpleQuery);
+//    BlurResults results = client.query("test", blurQuery);
+//    assertEquals(length, results.getTotalResults());
+//  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/83aa59f5/src/blur-core/src/test/java/org/apache/blur/thrift/DoNothingServer.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/org/apache/blur/thrift/DoNothingServer.java b/src/blur-core/src/test/java/org/apache/blur/thrift/DoNothingServer.java
index 56e3156..c9bc9f5 100644
--- a/src/blur-core/src/test/java/org/apache/blur/thrift/DoNothingServer.java
+++ b/src/blur-core/src/test/java/org/apache/blur/thrift/DoNothingServer.java
@@ -21,17 +21,12 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.blur.thrift.generated.Blur.Iface;
 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.BlurResults;
-import org.apache.blur.thrift.generated.FetchResult;
-import org.apache.blur.thrift.generated.RowMutation;
 import org.apache.blur.thrift.generated.Schema;
-import org.apache.blur.thrift.generated.Selector;
 import org.apache.blur.thrift.generated.TableDescriptor;
 import org.apache.blur.thrift.generated.TableStats;
-import org.apache.blur.thrift.generated.Blur.Iface;
 import org.apache.thrift.TException;
 
 
@@ -63,41 +58,21 @@ public class DoNothingServer implements Iface {
   }
 
   @Override
-  public BlurResults query(String table, BlurQuery blurQuery) throws BlurException, TException {
-    return null;
-  }
-
-  @Override
   public void cancelQuery(String table, long providedUuid) throws BlurException, TException {
 
   }
 
   @Override
-  public FetchResult fetchRow(String table, Selector selector) throws BlurException, TException {
-    return null;
-  }
-
-  @Override
   public List<BlurQueryStatus> currentQueries(String arg0) throws BlurException, TException {
     return null;
   }
 
   @Override
-  public long recordFrequency(String arg0, String arg1, String arg2, String arg3) throws BlurException, TException {
-    return 0;
-  }
-
-  @Override
   public Schema schema(String arg0) throws BlurException, TException {
     return null;
   }
 
   @Override
-  public List<String> terms(String arg0, String arg1, String arg2, String arg3, short arg4) throws BlurException, TException {
-    return null;
-  }
-
-  @Override
   public void createTable(TableDescriptor tableDescriptor) throws BlurException, TException {
 
   }
@@ -123,16 +98,6 @@ public class DoNothingServer implements Iface {
   }
 
   @Override
-  public void mutate(RowMutation mutation) throws BlurException, TException {
-
-  }
-
-  @Override
-  public void mutateBatch(List<RowMutation> mutations) throws BlurException, TException {
-
-  }
-
-  @Override
   public List<String> shardClusterList() throws BlurException, TException {
     return null;
   }


Mime
View raw message