From 0bbef922eed20be3b7e58f0dc5bb6e8f2feae353 Mon Sep 17 00:00:00 2001 From: Bryan Duxbury Date: Tue, 7 Apr 2009 22:23:40 +0000 Subject: [PATCH] THRIFT-437. rb: fix benchmarking tools to require proper file names A few scripts in benchmark/ and script/ were using old-style require statments. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@763003 13f79535-47bb-0310-9956-ffa450edef68 --- lib/rb/benchmark/client.rb | 2 +- lib/rb/benchmark/server.rb | 2 +- lib/rb/benchmark/thin_server.rb | 2 +- lib/rb/script/proto_benchmark.rb | 4 +--- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/rb/benchmark/client.rb b/lib/rb/benchmark/client.rb index 948f08d6..703dc8f5 100644 --- a/lib/rb/benchmark/client.rb +++ b/lib/rb/benchmark/client.rb @@ -20,7 +20,7 @@ $:.unshift File.dirname(__FILE__) + '/../lib' require 'thrift' $:.unshift File.dirname(__FILE__) + "/gen-rb" -require 'BenchmarkService' +require 'benchmark_service' class Client def initialize(host, port, clients_per_process, calls_per_client, log_exceptions) diff --git a/lib/rb/benchmark/server.rb b/lib/rb/benchmark/server.rb index d44fa886..74e13f41 100644 --- a/lib/rb/benchmark/server.rb +++ b/lib/rb/benchmark/server.rb @@ -20,7 +20,7 @@ $:.unshift File.dirname(__FILE__) + '/../lib' require 'thrift' $:.unshift File.dirname(__FILE__) + "/gen-rb" -require 'BenchmarkService' +require 'benchmark_service' module Server include Thrift diff --git a/lib/rb/benchmark/thin_server.rb b/lib/rb/benchmark/thin_server.rb index 47126add..4de2eef3 100644 --- a/lib/rb/benchmark/thin_server.rb +++ b/lib/rb/benchmark/thin_server.rb @@ -20,7 +20,7 @@ $:.unshift File.dirname(__FILE__) + '/../lib' require 'thrift' $:.unshift File.dirname(__FILE__) + "/gen-rb" -require 'BenchmarkService' +require 'benchmark_service' HOST = 'localhost' PORT = 42587 diff --git a/lib/rb/script/proto_benchmark.rb b/lib/rb/script/proto_benchmark.rb index 4ff6a550..bb49e2e4 100644 --- a/lib/rb/script/proto_benchmark.rb +++ b/lib/rb/script/proto_benchmark.rb @@ -18,8 +18,6 @@ # require File.dirname(__FILE__) + "/../spec/spec_helper.rb" -require "lib/thrift/serializer" -require "lib/thrift/protocol/binary_protocol_accelerated" require "benchmark" # require "ruby-prof" @@ -120,4 +118,4 @@ Benchmark.bm(60) do |reporter| # end # f.close -end \ No newline at end of file +end -- 2.17.1