aerospike 1.0.12 → 2.0.0

data/lib/aerospike/cdt/map_order.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+# Copyright 2016 Aerospike, Inc.
+#
+# Portions may be licensed to Aerospike, Inc. under one or more contributor
+# license agreements.
+#
+# Licensed 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.
+
+module Aerospike
+  module CDT
+    module MapOrder
+
+      ##
+      # Map is not ordered. This is the default.
+      UNORDERED = 0
+
+      ##
+      # Order map by key.
+      KEY_ORDERED = 1
+
+      ##
+      # Order map by key, then value.
+      KEY_VALUE_ORDERED = 3
+
+      ##
+      # Default order
+      DEFAULT = UNORDERED
+    end
+  end
+end

data/lib/aerospike/cdt/map_policy.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+# Copyright 2016 Aerospike, Inc.
+#
+# Portions may be licensed to Aerospike, Inc. under one or more contributor
+# license agreements.
+#
+# Licensed 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.
+
+module Aerospike
+  module CDT
+
+    class MapPolicy
+
+      attr_accessor :order, :write_mode
+
+      def initialize(order: nil, write_mode: nil)
+        @order = order || MapOrder::DEFAULT
+        @write_mode = write_mode || MapWriteMode::DEFAULT
+      end
+
+      DEFAULT = MapPolicy.new
+
+      def value
+        order.to_int
+      end
+    end
+
+  end
+end

data/lib/aerospike/cdt/map_return_type.rb

@@ -0,0 +1,74 @@
+# encoding: utf-8
+# Copyright 2016 Aerospike, Inc.
+#
+# Portions may be licensed to Aerospike, Inc. under one or more contributor
+# license agreements.
+#
+# Licensed 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.
+
+module Aerospike
+  module CDT
+    module MapReturnType
+
+      ##
+      # Do not return a result.
+      NONE = 0
+
+      ##
+      # Return key index order.
+      # 0 = first key
+      # N = Nth key
+      # -1 = last key
+      INDEX = 1
+
+      ##
+      # Return reverse key order.
+      # 0 = last key
+      # -1 = first key
+      REVERSE_INDEX = 2
+
+      ##
+      # Return value order.
+      # 0 = smalles value
+      # N = Nth smalles value
+      # -1 = largest value
+      RANK = 3
+
+      ##
+      # Return reverse value order.
+      # 0 = largest value
+      # N = Nth largest value
+      # -1 = smallest values
+      REVERSE_RANK = 4
+
+      ##
+      # Return count of items selected.
+      COUNT = 5
+
+      ##
+      # Return key for single read and key list for range read.
+      KEY = 6
+
+      ##
+      # Return value for single key read and value list for range read.
+      VALUE = 7
+
+      ##
+      # Return key/value items.
+      KEY_VALUE = 8
+
+      ##
+      # Default return type: NONE
+      DEFAULT_RETURN_TYPE = NONE
+
+    end
+  end
+end

data/lib/aerospike/cdt/map_write_mode.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+# Copyright 2016 Aerospike, Inc.
+#
+# Portions may be licensed to Aerospike, Inc. under one or more contributor
+# license agreements.
+#
+# Licensed 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.
+
+module Aerospike
+  module CDT
+    module MapWriteMode
+
+      ##
+      # If the key already exists, the item will be overwritten.
+      # If the key does not exist, a new item will be created.
+      UPDATE = 0
+
+      ##
+      # If the key already exists, the item will be overwritten.
+      # If the key does not exist, the write will fail.
+      UPDATE_ONLY = 1
+
+      ##
+      # If the key already exists, the write will fail.
+      # If the key does not exist, a new item will be created.
+      CREATE_ONLY = 2
+
+      ##
+      # Default write mode
+      DEFAULT = UPDATE
+    end
+  end
+end

data/lib/aerospike/client.rb

@@ -29,7 +29,7 @@ module Aerospike
   # Examples:
   #
   # # connect to the database
-  # client = Client.new('192.168.0.1', 3000)
+  # client = Client.new('192.168.0.1')
   #
   # #=> raises Aerospike::Exceptions::Timeout if a +:timeout+ is specified and
   # +:fail_if_not_connected+ set to true
@@ -39,40 +39,27 @@ module Aerospike
     attr_accessor :default_policy, :default_write_policy,
       :default_scan_policy, :default_query_policy, :default_admin_policy
 
-    def initialize(host, port, options={})
+    def initialize(hosts = nil, policy: ClientPolicy.new, connect: true)
       @default_policy = Policy.new
       @default_write_policy = WritePolicy.new
       @default_scan_policy = ScanPolicy.new
       @default_query_policy = QueryPolicy.new
       @default_admin_policy = QueryPolicy.new
 
-      policy = opt_to_client_policy(options)
-
-      @cluster = Cluster.new(policy, Host.new(host, port))
+      hosts = parse_hosts(hosts || ENV["AEROSPIKE_HOSTS"] || "localhost")
+      policy = create_policy(policy, ClientPolicy)
+      @cluster = Cluster.new(policy, *hosts)
       @cluster.add_cluster_config_change_listener(self)
-      @cluster.connect
 
+      self.connect if connect
       self
     end
 
-    def self.new_many(hosts, options={})
-      # Don't initiualize, just instantiate
-      client = Client.allocate
-
-      client.default_policy = Policy.new
-      client.default_write_policy = WritePolicy.new
-      client.default_scan_policy = ScanPolicy.new
-      client.default_query_policy = QueryPolicy.new
-      client.default_admin_policy = QueryPolicy.new
-
-      policy = client.send(:opt_to_client_policy , options)
-
-      cluster = Cluster.new(policy, *hosts)
-      cluster.add_cluster_config_change_listener(client)
-      client.send(:cluster=, cluster)
-      cluster.connect
+    ##
+    #  Connect to the cluster.
 
-      client
+    def connect
+      @cluster.connect
     end
 
     ##
@@ -106,6 +93,10 @@ module Aerospike
       end
     end
 
+    def supports_feature?(feature)
+      @cluster.supports_feature?(feature)
+    end
+
     #-------------------------------------------------------
     # Write Record Operations
     #-------------------------------------------------------
@@ -122,7 +113,7 @@ module Aerospike
     #  client.put key, {'bin', 'value string'}, :timeout => 0.001
 
     def put(key, bins, options={})
-      policy = opt_to_write_policy(options)
+      policy = create_policy(options, WritePolicy)
       command = WriteCommand.new(@cluster, policy, key, hash_to_bins(bins), Aerospike::Operation::WRITE)
       execute_command(command)
     end
@@ -145,7 +136,7 @@ module Aerospike
     #  client.append key, {'bin', 'value to append'}, :timeout => 0.001
 
     def append(key, bins, options={})
-      policy = opt_to_write_policy(options)
+      policy = create_policy(options, WritePolicy)
       command = WriteCommand.new(@cluster, policy, key, hash_to_bins(bins), Aerospike::Operation::APPEND)
       execute_command(command)
     end
@@ -164,7 +155,7 @@ module Aerospike
     #  client.prepend key, {'bin', 'value to prepend'}, :timeout => 0.001
 
     def prepend(key, bins, options={})
-      policy = opt_to_write_policy(options)
+      policy = create_policy(options, WritePolicy)
       command = WriteCommand.new(@cluster, policy, key, hash_to_bins(bins), Aerospike::Operation::PREPEND)
       execute_command(command)
     end
@@ -187,7 +178,7 @@ module Aerospike
     #  client.add key, {'bin', -1}, :timeout => 0.001
 
     def add(key, bins, options={})
-      policy = opt_to_write_policy(options)
+      policy = create_policy(options, WritePolicy)
       command = WriteCommand.new(@cluster, policy, key, hash_to_bins(bins), Aerospike::Operation::ADD)
       execute_command(command)
     end
@@ -209,7 +200,7 @@ module Aerospike
     #  existed = client.delete key, :timeout => 0.001
 
     def delete(key, options={})
-      policy = opt_to_write_policy(options)
+      policy = create_policy(options, WritePolicy)
       command = DeleteCommand.new(@cluster, policy, key)
       execute_command(command)
       command.existed
@@ -230,7 +221,7 @@ module Aerospike
     #  client.touch key, :timeout => 0.001
 
     def touch(key, options={})
-      policy = opt_to_write_policy(options)
+      policy = create_policy(options, WritePolicy)
       command = TouchCommand.new(@cluster, policy, key)
       execute_command(command)
     end
@@ -243,7 +234,7 @@ module Aerospike
     #  Determines if a record key exists.
     #  The policy can be used to specify timeouts.
     def exists(key, options={})
-      policy = opt_to_policy(options)
+      policy = create_policy(options, Policy)
       command = ExistsCommand.new(@cluster, policy, key)
       execute_command(command)
       command.exists
@@ -253,7 +244,7 @@ module Aerospike
     #  The returned array bool is in positional order with the original key array order.
     #  The policy can be used to specify timeouts.
     def batch_exists(keys, options={})
-      policy = opt_to_policy(options)
+      policy = create_policy(options, Policy)
 
       # same array can be used without sychronization;
       # when a key exists, the corresponding index will be marked true
@@ -276,7 +267,7 @@ module Aerospike
     #  Read record header and bins for specified key.
     #  The policy can be used to specify timeouts.
     def get(key, bin_names=[], options={})
-      policy = opt_to_policy(options)
+      policy = create_policy(options, Policy)
 
       command = ReadCommand.new(@cluster, policy, key, bin_names)
       execute_command(command)
@@ -286,7 +277,7 @@ module Aerospike
     #  Read record generation and expiration only for specified key.  Bins are not read.
     #  The policy can be used to specify timeouts.
     def get_header(key, options={})
-      policy = opt_to_policy(options)
+      policy = create_policy(options, Policy)
       command = ReadHeaderCommand.new(@cluster, policy, key)
       execute_command(command)
       command.record
@@ -301,7 +292,7 @@ module Aerospike
     #  If a key is not found, the positional record will be nil.
     #  The policy can be used to specify timeouts.
     def batch_get(keys, bin_names=[], options={})
-      policy = opt_to_policy(options)
+      policy = create_policy(options, Policy)
 
       # wait until all migrations are finished
       # TODO: implement
@@ -326,7 +317,7 @@ module Aerospike
     #  If a key is not found, the positional record will be nil.
     #  The policy can be used to specify timeouts.
     def batch_get_header(keys, options={})
-      policy = opt_to_policy(options)
+      policy = create_policy(options, Policy)
 
       # wait until all migrations are finished
       # TODO: Fix this and implement
@@ -357,7 +348,7 @@ module Aerospike
     #  Write operations are always performed first, regardless of operation order
     #  relative to read operations.
     def operate(key, operations, options={})
-      policy = opt_to_write_policy(options)
+      policy = create_policy(options, WritePolicy)
 
       command = OperateCommand.new(@cluster, policy, key, operations)
       execute_command(command)
@@ -373,7 +364,8 @@ module Aerospike
     #
     #  This method is only supported by Aerospike 3 servers.
     def get_large_list(key, bin_name, user_module=nil, options={})
-      LargeList.new(self, opt_to_write_policy(options), key, bin_name, user_module)
+      policy = create_policy(options, WritePolicy)
+      LargeList.new(self, policy, key, bin_name, user_module)
     end
 
     #  Initialize large map operator.  This operator can be used to create and manage a map
@@ -382,7 +374,8 @@ module Aerospike
     #  This method is only supported by Aerospike 3 servers.
     #  DEPRECATED. This method will be removed from the client in the future.
     def get_large_map(key, bin_name, user_module=nil, options={})
-      LargeMap.new(self, opt_to_write_policy(options), key, bin_name, user_module)
+      policy = create_policy(options, WritePolicy)
+      LargeMap.new(self, policy, key, bin_name, user_module)
     end
 
     #  Initialize large set operator.  This operator can be used to create and manage a set
@@ -391,7 +384,8 @@ module Aerospike
     #  This method is only supported by Aerospike 3 servers.
     #  DEPRECATED. This method will be removed from the client in the future.
     def get_large_set(key, bin_name, user_module=nil, options={})
-      LargeSet.new(self, opt_to_write_policy(options), key, bin_name, user_module)
+      policy = create_policy(options, WritePolicy)
+      LargeSet.new(self, policy, key, bin_name, user_module)
     end
 
     #  Initialize large stack operator.  This operator can be used to create and manage a stack
@@ -400,7 +394,8 @@ module Aerospike
     #  This method is only supported by Aerospike 3 servers.
     #  DEPRECATED. This method will be removed from the client in the future.
     def get_large_stack(key, bin_name, user_module=nil, options={})
-      LargeStack.new(self, opt_to_write_policy(options), key, bin_name, user_module)
+      policy = create_policy(options, WritePolicy)
+      LargeStack.new(self, policy, key, bin_name, user_module)
     end
 
     #---------------------------------------------------------------
@@ -508,7 +503,7 @@ module Aerospike
     #
     #  This method is only supported by Aerospike 3 servers.
     def execute_udf(key, package_name, function_name, args=[], options={})
-      policy = opt_to_write_policy(options)
+      policy = create_policy(options, WritePolicy)
 
       command = ExecuteCommand.new(@cluster, policy, key, package_name, function_name, args)
       execute_command(command)
@@ -542,7 +537,7 @@ module Aerospike
     # This method is only supported by Aerospike 3 servers.
     # If the policy is nil, the default relevant policy will be used.
     def execute_udf_on_query(statement, package_name, function_name, function_args=[], options={})
-      policy = opt_to_query_policy(options)
+      policy = create_policy(options, QueryPolicy)
 
       nodes = @cluster.nodes
       if nodes.length == 0
@@ -555,7 +550,7 @@ module Aerospike
       # Use a thread per node
       nodes.each do |node|
         Thread.new do
-          abort_on_exception = true
+          Thread.current.abort_on_exception = true
           begin
             command = QueryCommand.new(node, policy, statement, nil)
             execute_command(command)
@@ -578,7 +573,7 @@ module Aerospike
     #  This method is only supported by Aerospike 3 servers.
     #  index_type should be :string, :numeric or :geo2dsphere (requires server version 3.7 or later)
     def create_index(namespace, set_name, index_name, bin_name, index_type, options={})
-      policy = opt_to_write_policy(options)
+      policy = create_policy(options, WritePolicy)
       str_cmd = "sindex-create:ns=#{namespace}"
       str_cmd << ";set=#{set_name}" unless set_name.to_s.strip.empty?
       str_cmd << ";indexname=#{index_name};numbins=1;indexdata=#{bin_name},#{index_type.to_s.upcase}"
@@ -605,7 +600,7 @@ module Aerospike
     #  Delete secondary index.
     #  This method is only supported by Aerospike 3 servers.
     def drop_index(namespace, set_name, index_name, options={})
-      policy = opt_to_write_policy(options)
+      policy = create_policy(options, WritePolicy)
       str_cmd = "sindex-delete:ns=#{namespace}"
       str_cmd << ";set=#{set_name}" unless set_name.to_s.strip.empty?
       str_cmd << ";indexname=#{index_name}"
@@ -620,7 +615,7 @@ module Aerospike
       # Index did not previously exist. Return without error.
       return if response.start_with?('FAIL:201')
 
-      raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::INDEX_GENERICINDEX_GENERIC, "Drop index failed: #{response}")
+      raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::INDEX_GENERIC, "Drop index failed: #{response}")
     end
 
     def request_info(*commands)
@@ -632,7 +627,7 @@ module Aerospike
     #-------------------------------------------------------
 
     def scan_all(namespace, set_name, bin_names=[], options={})
-      policy = opt_to_scan_policy(options)
+      policy = create_policy(options, ScanPolicy)
 
       # wait until all migrations are finished
       # TODO: implement
@@ -653,12 +648,12 @@ module Aerospike
         # Use a thread per node
         nodes.each do |node|
           Thread.new do
-            abort_on_exception = true
+            Thread.current.abort_on_exception = true
             command = ScanCommand.new(node, new_policy, namespace, set_name, bin_names, recordset)
             begin
               execute_command(command)
             rescue => e
-              Aerospike.logger.error(e.backtrace.join("\n")) unless e == SCAN_TERMINATED_EXCEPTION 
+              Aerospike.logger.error(e.backtrace.join("\n")) unless e == SCAN_TERMINATED_EXCEPTION
               recordset.cancel(e)
             ensure
               recordset.thread_finished
@@ -667,13 +662,13 @@ module Aerospike
         end
       else
         Thread.new do
-          abort_on_exception = true
+          Thread.current.abort_on_exception = true
           nodes.each do |node|
             command = ScanCommand.new(node, new_policy, namespace, set_name, bin_names, recordset)
             begin
               execute_command(command)
             rescue => e
-              Aerospike.logger.error(e.backtrace.join("\n")) unless e == SCAN_TERMINATED_EXCEPTION 
+              Aerospike.logger.error(e.backtrace.join("\n")) unless e == SCAN_TERMINATED_EXCEPTION
               recordset.cancel(e)
             ensure
               recordset.thread_finished
@@ -688,7 +683,7 @@ module Aerospike
     # ScanNode reads all records in specified namespace and set, from one node only.
     # The policy can be used to specify timeouts.
     def scan_node(node, namespace, set_name, bin_names=[], options={})
-      policy = opt_to_scan_policy(options)
+      policy = create_policy(options, ScanPolicy)
       # wait until all migrations are finished
       # TODO: implement
       # @cluster.WaitUntillMigrationIsFinished(policy.timeout)
@@ -703,12 +698,12 @@ module Aerospike
       recordset = Recordset.new(policy.record_queue_size, 1, :scan)
 
       Thread.new do
-        abort_on_exception = true
+        Thread.current.abort_on_exception = true
         command = ScanCommand.new(node, new_policy, namespace, set_name, bin_names, recordset)
         begin
           execute_command(command)
         rescue => e
-          Aerospike.logger.error(e.backtrace.join("\n")) unless e == SCAN_TERMINATED_EXCEPTION 
+          Aerospike.logger.error(e.backtrace.join("\n")) unless e == SCAN_TERMINATED_EXCEPTION
           recordset.cancel(e)
         ensure
           recordset.thread_finished
@@ -730,7 +725,7 @@ module Aerospike
     # This method is only supported by Aerospike 3 servers.
     # If the policy is nil, a default policy will be generated.
     def query(statement, options={})
-      policy = opt_to_query_policy(options)
+      policy = create_policy(options, QueryPolicy)
       new_policy = policy.clone
 
       nodes = @cluster.nodes
@@ -743,12 +738,12 @@ module Aerospike
       # Use a thread per node
       nodes.each do |node|
         Thread.new do
-          abort_on_exception = true
+          Thread.current.abort_on_exception = true
           command = QueryCommand.new(node, new_policy, statement, recordset)
           begin
             execute_command(command)
           rescue => e
-            Aerospike.logger.error(e.backtrace.join("\n")) unless e == QUERY_TERMINATED_EXCEPTION 
+            Aerospike.logger.error(e.backtrace.join("\n")) unless e == QUERY_TERMINATED_EXCEPTION
             recordset.cancel(e)
           ensure
             recordset.thread_finished
@@ -766,7 +761,7 @@ module Aerospike
     # Create user with password and roles. Clear-text password will be hashed using bcrypt
     # before sending to server.
     def create_user(user, password, roles, options={})
-      policy = opt_to_admin_policy(options)
+      policy = create_policy(options, AdminPolicy)
       hash = AdminCommand.hash_password(password)
       command = AdminCommand.new
       command.create_user(@cluster, policy, user, hash, roles)
@@ -774,14 +769,14 @@ module Aerospike
 
     # Remove user from cluster.
     def drop_user(user, options={})
-      policy = opt_to_admin_policy(options)
+      policy = create_policy(options, AdminPolicy)
       command = AdminCommand.new
       command.drop_user(@cluster, policy, user)
     end
 
     # Change user's password. Clear-text password will be hashed using bcrypt before sending to server.
     def change_password(user, password, options={})
-      policy = opt_to_admin_policy(options)
+      policy = create_policy(options, AdminPolicy)
       if @cluster.user == ''
         return NewAerospikeError(INVALID_USER)
       end
@@ -802,28 +797,28 @@ module Aerospike
 
     # Add roles to user's list of roles.
     def grant_roles(user, roles, options={})
-      policy = opt_to_admin_policy(options)
+      policy = create_policy(options, AdminPolicy)
       command = AdminCommand.new
       command.grant_roles(@cluster, policy, user, roles)
     end
 
     # Remove roles from user's list of roles.
     def revoke_roles(user, roles, options={})
-      policy = opt_to_admin_policy(options)
+      policy = create_policy(options, AdminPolicy)
       command = AdminCommand.new
       command.revoke_roles(@cluster, policy, user, roles)
     end
 
     # Retrieve roles for a given user.
     def query_user(user, options={})
-      policy = opt_to_admin_policy(options)
+      policy = create_policy(options, AdminPolicy)
       command = AdminCommand.new
       command.query_user(@cluster, policy, user)
     end
 
     # Retrieve all users and their roles.
     def query_users(options={})
-      policy = opt_to_admin_policy(options)
+      policy = create_policy(options, AdminPolicy)
       command = AdminCommand.new
       command.query_users(@cluster, policy)
     end
@@ -847,63 +842,33 @@ module Aerospike
       end
     end
 
-    def opt_to_client_policy(options)
-      if options.nil? || options == {}
-        ClientPolicy.new
-      elsif options.is_a?(ClientPolicy)
-        options
-      elsif options.is_a?(Hash)
-        ClientPolicy.new(options)
-      end
-    end
-
-    def opt_to_policy(options)
-      if options.nil? || options == {}
-        @default_policy
-      elsif options.is_a?(Policy)
-        options
-      elsif options.is_a?(Hash)
-        Policy.new(options)
-      end
-    end
-
-    def opt_to_write_policy(options)
-      if options.nil? || options == {}
-        @default_write_policy
-      elsif options.is_a?(WritePolicy)
-        options
-      elsif options.is_a?(Hash)
-        WritePolicy.new(options)
-      end
-    end
-
-    def opt_to_scan_policy(options)
-      if options.nil? || options == {}
-        @default_scan_policy
-      elsif options.is_a?(ScanPolicy)
-        options
-      elsif options.is_a?(Hash)
-        ScanPolicy.new(options)
-      end
-    end
-
-    def opt_to_query_policy(options)
-      if options.nil? || options == {}
-        @default_query_policy
-      elsif options.is_a?(QueryPolicy)
-        options
-      elsif options.is_a?(Hash)
-        QueryPolicy.new(options)
+    def create_policy(policy, policy_klass)
+      case policy
+      when nil
+        policy_klass.new
+      when policy_klass
+        policy
+      when Hash
+        policy_klass.new(policy)
+      else
+        fail TypeError, "policy should be a #{policy_klass.name} instance or a Hash"
       end
     end
 
-    def opt_to_admin_policy(options)
-      if options.nil? || options == {}
-        @default_admin_policy
-      elsif options.is_a?(AdminPolicy)
-        options
-      elsif options.is_a?(Hash)
-        AdminPolicy.new(options)
+    def parse_hosts(hosts)
+      case hosts
+      when Host
+        [hosts]
+      when Array
+        hosts
+      when String
+        hosts.split(?,).map { |host|
+          (addr, port) = host.split(?:)
+          port ||= 3000
+          Host.new(addr, port.to_i)
+        }
+      else
+        fail TypeError, "hosts should be a Host object, an Array of Host objects, or a String"
       end
     end
 
@@ -951,7 +916,7 @@ module Aerospike
         bn = batch_node
         bn.batch_namespaces.each do |bns|
           threads << Thread.new do
-            abort_on_exception=true
+            Thread.current.abort_on_exception = true
             command = cmd_gen.call(bn.node, bns)
             execute_command(command)
           end