thrift 0.24.0 → 0.25.0

data/benchmark/client.rb

@@ -1,118 +0,0 @@
-# frozen_string_literal: true
-#
-# 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.
-#
-
-$:.unshift File.dirname(__FILE__) + '/../lib'
-$:.unshift File.dirname(__FILE__) + '/../ext'
-require 'thrift'
-require 'openssl'
-$:.unshift File.dirname(__FILE__) + "/gen-rb"
-require 'benchmark_service'
-
-class Client
-  def initialize(host, port, clients_per_process, calls_per_client, log_exceptions, tls, protocol_type)
-    @host = host
-    @port = port
-    @clients_per_process = clients_per_process
-    @calls_per_client = calls_per_client
-    @log_exceptions = log_exceptions
-    @tls = tls
-    @protocol_type = protocol_type || 'binary'
-  end
-
-  def create_protocol(socket)
-    case @protocol_type
-    when 'binary'
-      transport = Thrift::FramedTransport.new(socket)
-      Thrift::BinaryProtocol.new(transport)
-    when 'compact'
-      transport = Thrift::FramedTransport.new(socket)
-      Thrift::CompactProtocol.new(transport)
-    when 'header'
-      Thrift::HeaderProtocol.new(socket)
-    when 'header-compact'
-      Thrift::HeaderProtocol.new(socket, nil, Thrift::HeaderSubprotocolID::COMPACT)
-    when 'header-zlib'
-      protocol = Thrift::HeaderProtocol.new(socket)
-      protocol.add_transform(Thrift::HeaderTransformID::ZLIB)
-      protocol
-    else
-      transport = Thrift::FramedTransport.new(socket)
-      Thrift::BinaryProtocol.new(transport)
-    end
-  end
-
-  def run
-    @clients_per_process.times do
-      socket = if @tls
-        ssl_context = OpenSSL::SSL::SSLContext.new.tap do |ctx|
-          ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
-          ctx.min_version = OpenSSL::SSL::TLS1_2_VERSION
-
-          keys_dir = File.expand_path("../../../test/keys", __dir__)
-          ctx.ca_file = File.join(keys_dir, "CA.pem")
-          ctx.cert = OpenSSL::X509::Certificate.new(File.open(File.join(keys_dir, "client.crt")))
-          ctx.cert_store = OpenSSL::X509::Store.new
-          ctx.cert_store.add_file(File.join(keys_dir, 'server.pem'))
-          ctx.key = OpenSSL::PKey::RSA.new(File.open(File.join(keys_dir, "client.key")))
-        end
-
-        Thrift::SSLSocket.new(@host, @port, 5, ssl_context)
-      else
-        Thrift::Socket.new(@host, @port, 5)
-      end
-      protocol = create_protocol(socket)
-      transport = protocol.trans
-      client = ThriftBenchmark::BenchmarkService::Client.new(protocol)
-      begin
-        start = Time.now
-        transport.open
-        Marshal.dump [:start, start], STDOUT
-      rescue => e
-        Marshal.dump [:connection_failure, Time.now], STDOUT
-        print_exception e if @log_exceptions
-      else
-        begin
-          @calls_per_client.times do
-            Marshal.dump [:call_start, Time.now], STDOUT
-            client.fibonacci(15)
-            Marshal.dump [:call_end, Time.now], STDOUT
-          end
-          transport.close
-          Marshal.dump [:end, Time.now], STDOUT
-        rescue Thrift::TransportException => e
-          Marshal.dump [:connection_error, Time.now], STDOUT
-          print_exception e if @log_exceptions
-        end
-      end
-    end
-  end
-
-  def print_exception(e)
-    STDERR.puts "ERROR: #{e.message}"
-    STDERR.puts "\t#{e.backtrace * "\n\t"}"
-  end
-end
-
-log_exceptions = true if ARGV[0] == '-log-exceptions' and ARGV.shift
-tls = true if ARGV[0] == '-tls' and ARGV.shift
-
-host, port, clients_per_process, calls_per_client, protocol_type = ARGV
-
-Client.new(host, port.to_i, clients_per_process.to_i, calls_per_client.to_i, log_exceptions, tls, protocol_type).run

data/benchmark/server.rb

@@ -1,121 +0,0 @@
-# frozen_string_literal: true
-#
-# 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.
-#
-
-$:.unshift File.dirname(__FILE__) + '/../lib'
-$:.unshift File.dirname(__FILE__) + '/../ext'
-require 'thrift'
-require 'openssl'
-$:.unshift File.dirname(__FILE__) + "/gen-rb"
-require 'benchmark_service'
-
-module Server
-  include Thrift
-
-  class BenchmarkHandler
-    # 1-based index into the fibonacci sequence
-    def fibonacci(n)
-      seq = [1, 1]
-      3.upto(n) do
-        seq << seq[-1] + seq[-2]
-      end
-      seq[n-1] # n is 1-based
-    end
-  end
-
-  def self.create_factories(protocol_type)
-    case protocol_type
-    when 'binary'
-      [FramedTransportFactory.new, BinaryProtocolFactory.new]
-    when 'compact'
-      [FramedTransportFactory.new, CompactProtocolFactory.new]
-    when 'header'
-      [HeaderTransportFactory.new, HeaderProtocolFactory.new]
-    when 'header-compact'
-      [HeaderTransportFactory.new, HeaderProtocolFactory.new(nil, HeaderSubprotocolID::COMPACT)]
-    when 'header-zlib'
-      # Note: Server doesn't add transforms - it mirrors client's transforms
-      [HeaderTransportFactory.new, HeaderProtocolFactory.new]
-    else
-      [FramedTransportFactory.new, BinaryProtocolFactory.new]
-    end
-  end
-
-  def self.start_server(host, port, serverClass, tls, protocol_type = nil)
-    handler = BenchmarkHandler.new
-    processor = ThriftBenchmark::BenchmarkService::Processor.new(handler)
-    transport = if tls
-      ssl_context = OpenSSL::SSL::SSLContext.new.tap do |ctx|
-        ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        ctx.min_version = OpenSSL::SSL::TLS1_2_VERSION
-
-        keys_dir = File.expand_path("../../../test/keys", __dir__)
-        ctx.ca_file = File.join(keys_dir, "CA.pem")
-        ctx.cert = OpenSSL::X509::Certificate.new(File.open(File.join(keys_dir, "server.crt")))
-        ctx.cert_store = OpenSSL::X509::Store.new
-        ctx.cert_store.add_file(File.join(keys_dir, 'client.pem'))
-        ctx.key = OpenSSL::PKey::RSA.new(File.open(File.join(keys_dir, "server.key")))
-      end
-
-      Thrift::SSLServerSocket.new(host, port, ssl_context)
-    else
-      ServerSocket.new(host, port)
-    end
-    transport_factory, protocol_factory = create_factories(protocol_type || 'binary')
-    args = [processor, transport, transport_factory, protocol_factory, 20]
-    if serverClass == NonblockingServer
-      logger = Logger.new(STDERR)
-      logger.level = Logger::WARN
-      args << logger
-    end
-    server = serverClass.new(*args)
-    @server_thread = Thread.new do
-      server.serve
-    end
-    @server = server
-  end
-
-  def self.shutdown
-    return if @server.nil?
-    if @server.respond_to? :shutdown
-      @server.shutdown
-    else
-      @server_thread.kill
-    end
-  end
-end
-
-def resolve_const(const)
-  const and const.split('::').inject(Object) { |k, c| k.const_get(c) }
-end
-
-tls = true if ARGV[0] == '-tls' and ARGV.shift
-
-host, port, serverklass, protocol_type = ARGV
-
-Server.start_server(host, port.to_i, resolve_const(serverklass), tls, protocol_type)
-
-# let our host know that the interpreter has started
-# ideally we'd wait until the server was serving, but we don't have a hook for that
-Marshal.dump(:started, STDOUT)
-STDOUT.flush
-
-Marshal.load(STDIN) # wait until we're instructed to shut down
-
-Server.shutdown

data/benchmark/thin_server.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-#
-# 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.
-#
-
-$:.unshift File.dirname(__FILE__) + '/../lib'
-$:.unshift File.dirname(__FILE__) + '/../ext'
-require 'thrift'
-$:.unshift File.dirname(__FILE__) + "/gen-rb"
-require 'benchmark_service'
-HOST = 'localhost'
-PORT = 42587
-
-class BenchmarkHandler
-  # 1-based index into the fibonacci sequence
-  def fibonacci(n)
-    seq = [1, 1]
-    3.upto(n) do
-      seq << seq[-1] + seq[-2]
-    end
-    seq[n-1] # n is 1-based
-  end
-end
-
-handler = BenchmarkHandler.new
-processor = ThriftBenchmark::BenchmarkService::Processor.new(handler)
-transport = Thrift::ServerSocket.new(HOST, PORT)
-transport_factory = Thrift::FramedTransportFactory.new
-logger = Logger.new(STDERR)
-logger.level = Logger::WARN
-Thrift::NonblockingServer.new(processor, transport, transport_factory, nil, 20, logger).serve

data/lib/thrift/server/mongrel_http_server.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-#
-# 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.
-#
-
-require 'mongrel'
-
-## Sticks a service on a URL, using mongrel to do the HTTP work
-# <b>DEPRECATED:</b> Please use <tt>Thrift::ThinHTTPServer</tt> instead.
-module Thrift
-  class MongrelHTTPServer < BaseServer
-    class Handler < Mongrel::HttpHandler
-      def initialize(processor, protocol_factory)
-        @processor = processor
-        @protocol_factory = protocol_factory
-      end
-
-      def process(request, response)
-        if request.params["REQUEST_METHOD"] == "POST"
-          response.start(200) do |head, out|
-            head["Content-Type"] = "application/x-thrift"
-            transport = IOStreamTransport.new request.body, out
-            protocol = @protocol_factory.get_protocol transport
-            @processor.process protocol, protocol
-          end
-        else
-          response.start(404) {}
-        end
-      end
-    end
-
-    def initialize(processor, opts = {})
-      Kernel.warn "[DEPRECATION WARNING] `Thrift::MongrelHTTPServer` is deprecated.  Please use `Thrift::ThinHTTPServer` instead."
-      port = opts[:port] || 80
-      ip = opts[:ip] || "0.0.0.0"
-      path = opts[:path] || ""
-      protocol_factory = opts[:protocol_factory] || BinaryProtocolFactory.new
-      @server = Mongrel::HttpServer.new ip, port
-      @server.register "/#{path}", Handler.new(processor, protocol_factory)
-    end
-
-    def serve
-      @server.run.join
-    end
-  end
-end

data/spec/BaseService.thrift

@@ -1,27 +0,0 @@
-# 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.
-#
-
-namespace rb Base
-
-struct Hello {
-  1: string greeting = "hello world"
-}
-
-service BaseService {
-  Hello greeting(1:bool english)
-}

data/spec/ExtendedService.thrift

@@ -1,25 +0,0 @@
-# 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.
-#
-
-namespace rb Extended
-
-include "BaseService.thrift"
-
-service ExtendedService extends BaseService.BaseService {
-  void ping()
-}

data/spec/Referenced.thrift

@@ -1,44 +0,0 @@
-/*
- * 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.
- */
-
-#
-# 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.
-#
-
-namespace rb OtherNamespace
-
-enum SomeEnum {
-  ONE
-  TWO
-}

data/spec/ThriftNamespacedSpec.thrift

@@ -1,53 +0,0 @@
-/*
- * 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.
- */
-
-#
-# 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.
-#
-
-namespace rb NamespacedSpecNamespace
-
-include "Referenced.thrift"
-
-struct Hello {
-  1: string greeting = "hello world"
-}
-
-service NamespacedNonblockingService {
-  Hello greeting(1:bool english)
-  bool block()
-  oneway void unblock(1:i32 n)
-  oneway void shutdown()
-  void sleep(1:double seconds)
-}

data/spec/ThriftSpec.thrift

@@ -1,203 +0,0 @@
-/*
- * 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.
- */
-
-#
-# 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.
-#
-
-namespace rb SpecNamespace
-
-struct Hello {
-  1: string greeting = "hello world"
-}
-
-enum SomeEnum {
-  ONE
-  TWO
-}
-
-struct StructWithSomeEnum {
-  1: SomeEnum some_enum;
-}
-
-union TestUnion {
-  /**
-   * A doc string
-   */
-  1: string string_field;
-  2: i32 i32_field;
-  3: i32 other_i32_field;
-  4: SomeEnum enum_field;
-  5: binary binary_field;
-  6: uuid uuid_field;
-}
-
-struct Foo {
-  1: i32 simple = 53,
-  2: string words = "words",
-  3: Hello hello = {'greeting' : "hello, world!"},
-  4: list<i32> ints = [1, 2, 2, 3],
-  5: map<i32, map<string, double>> complex,
-  6: set<i16> shorts = [5, 17, 239],
-  7: optional string opt_string
-  8: bool my_bool
-  9: optional uuid opt_uuid
-}
-
-struct Foo2 {
-  1: binary my_binary
-}
-
-struct BoolStruct {
-  1: bool yesno = 1
-}
-
-struct SimpleList {
-  1: list<bool> bools,
-  2: list<byte> bytes,
-  3: list<i16> i16s,
-  4: list<i32> i32s,
-  5: list<i64> i64s,
-  6: list<double> doubles,
-  7: list<string> strings,
-  8: list<map<i16, i16>> maps,
-  9: list<list<i16>> lists,
-  10: list<set<i16>> sets,
-  11: list<Hello> hellos,
-  12: list<uuid> uuids
-}
-
-exception Xception {
-  1: string message,
-  2: i32 code = 1
-}
-
-service NonblockingService {
-  Hello greeting(1:bool english)
-  bool block()
-  oneway void unblock(1:i32 n)
-  oneway void shutdown()
-  void sleep(1:double seconds)
-}
-
-union My_union {
-  1: bool im_true,
-  2: byte a_bite,
-  3: i16 integer16,
-  4: i32 integer32,
-  5: i64 integer64,
-  6: double double_precision,
-  7: string some_characters,
-  8: i32 other_i32
-  9: SomeEnum some_enum;
-  10: map<SomeEnum, list<SomeEnum>> my_map;
-  11: uuid unique_id;
-}
-
-struct Struct_with_union {
-  1: My_union fun_union
-  2: i32 integer32
-  3: string some_characters
-}
-
-struct StructWithEnumMap {
-  1: map<SomeEnum, list<SomeEnum>> my_map;
-}
-
-# Nested lists
-struct NestedListInList {
-  1: list<list<byte>> value
-}
-
-struct NestedListInSet {
-  1: set<list<byte>> value
-}
-
-struct NestedListInMapKey {
-  1: map<list<byte>, byte> value
-}
-
-struct NestedListInMapValue {
-  1: map<byte, list<byte>> value
-}
-
-# Nested sets
-struct NestedSetInList {
-  1: list<set<byte>> value
-}
-
-struct NestedSetInSet {
-  1: set<set<byte>> value
-}
-
-struct NestedSetInMapKey {
-  1: map<set<byte>, byte> value
-}
-
-struct NestedSetInMapValue {
-  1: map<byte, set<byte>> value
-}
-
-# Nested maps
-struct NestedMapInList {
-  1: list<map<byte, byte>> value
-}
-
-struct NestedMapInSet {
-  1: set<map<byte, byte>> value
-}
-
-struct NestedMapInMapKey {
-  2: map<map<byte, byte>, byte> value
-}
-
-struct NestedMapInMapValue {
-  2: map<byte, map<byte, byte>> value
-}
-
-# Recursive types for the struct/union/exception recursion-depth limit specs (THRIFT-6045).
-struct RecTree {
-  1: list<RecTree> children
-  2: i16 item
-}
-
-union RecUnion {
-  1: list<RecUnion> children
-  2: i32 leaf
-}
-
-exception RecError {
-  1: list<RecError> children
-  2: i32 leaf
-}