knjrbfw 0.0.23 → 0.0.24

data/lib/knj/knjdb/drivers/mysql/knjdb_mysql.rb

@@ -71,6 +71,8 @@ class KnjDB_mysql
           args[key] = @knjdb.opts[key] if @knjdb.opts.key?(key)
         end
         
+        args[:as] = :array if @opts[:result] == "array"
+        
         tries = 0
         begin
           tries += 1
@@ -93,7 +95,7 @@ class KnjDB_mysql
           @jdbc_loaded = true
         end
         
-        @conn = java.sql::DriverManager.getConnection("jdbc:mysql://#{@knjdb.opts[:host]}:#{@port}/#{@knjdb.opts[:db]}?user=#{@knjdb.opts[:user]}&password=#{@knjdb.opts[:pass]}&populateInsertRowWithDefaultValues=true&zeroDateTimeBehavior=round&characterEncoding=#{@encoding}")
+        @conn = java.sql::DriverManager.getConnection("jdbc:mysql://#{@knjdb.opts[:host]}:#{@port}/#{@knjdb.opts[:db]}?user=#{@knjdb.opts[:user]}&password=#{@knjdb.opts[:pass]}&populateInsertRowWithDefaultValues=true&zeroDateTimeBehavior=round&characterEncoding=#{@encoding}&holdResultsOpenOverStatementClose=true")
         self.query("SET SQL_MODE = ''")
       else
         raise "Unknown subtype: #{@subtype}"
@@ -128,18 +130,25 @@ class KnjDB_mysql
               
               return nil
             else
+              id = nil
+              
               begin
                 res = stmt.execute_query(str)
                 ret = KnjDB_java_mysql_result.new(@knjdb, @opts, res)
+                id = ret.__id__
+                
+                #If ID is being reused we have to free the result.
+                self.java_mysql_resultset_killer(id) if @java_rs_data.key?(id)
                 
                 #Save reference to result and statement, so we can close them when they are garbage collected.
-                @java_rs_data[ret.__id__] = {:res => res, :stmt => stmt}
+                @java_rs_data[id] = {:res => res, :stmt => stmt}
                 ObjectSpace.define_finalizer(ret, self.method("java_mysql_resultset_killer"))
                 
                 return ret
               rescue => e
                 res.close if res
                 stmt.close
+                @java_rs_data.delete(id) if ret and id
                 raise e
               end
             end
@@ -162,7 +171,7 @@ class KnjDB_mysql
         end
       end
       
-      print str
+      #print str
       raise e
     end
   end
@@ -175,7 +184,7 @@ class KnjDB_mysql
           @conn.query_with_result = false
           return KnjDB_mysql_unbuffered_result.new(@conn, @opts, @conn.query(str))
         when "mysql2"
-          raise "MySQL2 does not support unbuffered queries yet! Waiting for :stream..."
+          return KnjDB_mysql2_result.new(@conn.query(str, @query_args.merge(:stream => true)))
         when "java"
           if str.match(/^\s*(delete|update|create|drop|insert\s+into)\s+/i)
             stmt = @conn.createStatement
@@ -206,7 +215,6 @@ class KnjDB_mysql
               raise e
             end
           end
-          raise "Not implemented yet."
         else
           raise "Unknown subtype: '#{@subtype}'"
       end
@@ -458,8 +466,13 @@ class KnjDB_mysql2_result
     end
   end
   
-  def each(&block)
-    @result.each(&block)
+  def each
+    @result.each do |res|
+      #This sometimes happens when streaming results...
+      next if !res
+      
+      yield(res)
+    end
   end
 end
 
@@ -491,11 +504,15 @@ class KnjDB_java_mysql_result
   
   def fetch
     return false if !@result
-    
     self.read_meta if !@keys
     status = @result.next
     
-    return false if !status
+    if !status
+      @result = nil
+      @keys = nil
+      @count = nil
+      return false
+    end
     
     if @as_hash
       ret = {}

data/lib/knj/knjdb/drivers/mysql/knjdb_mysql_columns.rb

@@ -1,10 +1,9 @@
 class KnjDB_mysql::Columns
-  attr_reader :db, :driver
+  attr_reader :db
   
   def initialize(args)
     @args = args
     @db = @args[:db]
-    @driver = @args[:driver]
   end
   
   def data_sql(data)
@@ -39,12 +38,17 @@ class KnjDB_mysql::Columns::Column
     @args = args
   end
   
+  #Used to validate in Knj::Wrap_map.
+  def __object_unique_id__
+    return @args[:data][:Field]
+  end
+  
   def name
     return @args[:data][:Field]
   end
   
   def table
-    return @args[:db].tables[@args[:table_name]]
+    return @db.tables[@args[:table_name]]
   end
   
   def data
@@ -112,13 +116,12 @@ class KnjDB_mysql::Columns::Column
   end
   
   def drop
-    @args[:db].query("ALTER TABLE `#{@args[:table_name]}` DROP COLUMN `#{self.name}`")
+    @db.query("ALTER TABLE `#{@args[:table_name]}` DROP COLUMN `#{self.name}`")
   end
   
   def change(data)
-    esc_col = @args[:driver].escape_col
-    col_escaped = "#{esc_col}#{@args[:db].esc_col(self.name)}#{esc_col}"
-    table_escape = "#{@args[:driver].escape_table}#{@args[:driver].esc_table(self.table.name)}#{@args[:driver].escape_table}"
+    col_escaped = "#{@db.enc_col}#{@db.esc_col(self.name)}#{@db.enc_col}"
+    table_escape = "#{@db.enc_table}#{@db.esc_table(self.table.name)}#{@db.enc_table}"
     newdata = data.clone
     
     newdata["name"] = self.name if !newdata.key?("name")
@@ -129,6 +132,6 @@ class KnjDB_mysql::Columns::Column
     newdata.delete("primarykey") if newdata.key?("primarykey")
     
     type_s = newdata["type"].to_s
-    @args[:db].query("ALTER TABLE #{table_escape} CHANGE #{col_escaped} #{@args[:db].cols.data_sql(newdata)}")
+    @db.query("ALTER TABLE #{table_escape} CHANGE #{col_escaped} #{@db.cols.data_sql(newdata)}")
   end
 end

data/lib/knj/knjdb/drivers/mysql/knjdb_mysql_indexes.rb

@@ -12,6 +12,11 @@ class KnjDB_mysql::Indexes::Index
     @columns = []
   end
   
+  #Used to validate in Knj::Wrap_map.
+  def __object_unique_id__
+    return @args[:data][:Key_name]
+  end
+  
   def name
     return @args[:data][:Key_name]
   end

data/lib/knj/knjdb/drivers/mysql/knjdb_mysql_tables.rb

@@ -1,12 +1,11 @@
 require "#{$knjpath}wref"
 
 class KnjDB_mysql::Tables
-  attr_reader :db, :driver, :list
+  attr_reader :db, :list
   
   def initialize(args)
     @args = args
     @db = @args[:db]
-    @driver = @args[:driver]
     @subtype = @db.opts[:subtype]
     @list_mutex = Mutex.new
     @list = Knj::Wref_map.new
@@ -23,11 +22,11 @@ class KnjDB_mysql::Tables
     
     begin
       return @list[table_name]
-    rescue WeakRef::RefError
+    rescue Knj::Wref::Recycled
       #ignore.
     end
     
-    self.list do |table_obj|
+    self.list(:name => table_name) do |table_obj|
       return table_obj if table_obj.name == table_name
     end
     
@@ -37,16 +36,19 @@ class KnjDB_mysql::Tables
   def list(args = {})
     ret = {} unless block_given?
     
+    sql = "SHOW TABLE STATUS"
+    if args[:name]
+      sql << " WHERE `Name` = '#{@db.esc(args[:name])}'"
+    end
+    
     @list_mutex.synchronize do
-      @db.q("SHOW TABLE STATUS") do |d_tables|
+      @db.q(sql) do |d_tables|
         obj = @list.get!(d_tables[:Name])
         
         if !obj
           obj = KnjDB_mysql::Tables::Table.new(
             :db => @db,
-            :driver => @driver,
-            :data => d_tables,
-            :tables => self
+            :data => d_tables
           )
           @list[d_tables[:Name]] = obj
         end
@@ -79,14 +81,19 @@ class KnjDB_mysql::Tables
       sql << @db.cols.data_sql(col_data)
     end
     
-    sql << ")"
-    
-    @db.query(sql)
-    
     if data["indexes"]
-      table_obj = self[name]
-      table_obj.create_indexes(data["indexes"])
+      sql << ", "
+      sql << KnjDB_mysql::Tables::Table.create_indexes(data["indexes"], {
+        :db => @db,
+        :return_sql => true,
+        :create => false,
+        :on_table => false,
+        :table_name => name
+      })
     end
+    
+    sql << ")"
+    @db.query(sql)
   end
 end
 
@@ -96,7 +103,6 @@ class KnjDB_mysql::Tables::Table
   def initialize(args)
     @args = args
     @db = args[:db]
-    @driver = args[:driver]
     @data = args[:data]
     @subtype = @db.opts[:subtype]
     @list = Knj::Wref_map.new
@@ -105,6 +111,15 @@ class KnjDB_mysql::Tables::Table
     raise "Could not figure out name from: '#{@data}'." if !@data[:Name]
   end
   
+  def reload
+    @data = @db.q("SHOW TABLE STATUS WHERE `Name` = '#{@db.esc(self.name)}'").fetch
+  end
+  
+  #Used to validate in Knj::Wrap_map.
+  def __object_unique_id__
+    return @data[:Name]
+  end
+  
   def name
     return @data[:Name]
   end
@@ -119,12 +134,16 @@ class KnjDB_mysql::Tables::Table
     return self
   end
   
+  def rows_count
+    return @data[:Rows].to_i
+  end
+  
   def column(name)
     name = name.to_s
     
     begin
       return @list[name]
-    rescue WeakRef::RefError
+    rescue Knj::Wref::Recycled
       #ignore.
     end
     
@@ -147,7 +166,6 @@ class KnjDB_mysql::Tables::Table
         obj = KnjDB_mysql::Columns::Column.new(
           :table_name => self.name,
           :db => @db,
-          :driver => @driver,
           :data => d_cols
         )
         @list[d_cols[:Field]] = obj
@@ -180,7 +198,6 @@ class KnjDB_mysql::Tables::Table
         obj = KnjDB_mysql::Indexes::Index.new(
           :table_name => self.name,
           :db => @db,
-          :driver => @driver,
           :data => d_indexes
         )
         obj.columns << d_indexes[:Column_name]
@@ -206,7 +223,7 @@ class KnjDB_mysql::Tables::Table
     
     begin
       return @indexes_list[name]
-    rescue WeakRef::RefError
+    rescue Knj::Wref::Recycled
       #ignore.
     end
     
@@ -224,8 +241,27 @@ class KnjDB_mysql::Tables::Table
     end
   end
   
-  def create_indexes(index_arr)
+  def create_indexes(index_arr, args = {})
+    return KnjDB_mysql::Tables::Table.create_indexes(index_arr, args.merge(:table_name => self.name, :db => @db))
+  end
+  
+  def self.create_indexes(index_arr, args = {})
+    db = args[:db]
+    
+    if args[:return_sql]
+      sql = ""
+      first = true
+    end
+    
     index_arr.each do |index_data|
+      if !args[:return_sql]
+        sql = ""
+      end
+      
+      if args[:create] or !args.key?(:create)
+        sql << "CREATE"
+      end
+      
       if index_data.is_a?(String)
         index_data = {"name" => index_data, "columns" => [index_data]}
       end
@@ -233,29 +269,50 @@ class KnjDB_mysql::Tables::Table
       raise "No name was given." if !index_data.key?("name") or index_data["name"].strip.length <= 0
       raise "No columns was given on index: '#{index_data["name"]}'." if !index_data["columns"] or index_data["columns"].empty?
       
-      sql = "CREATE"
+      if args[:return_sql]
+        if first
+          first = false
+        else
+          sql << ", "
+        end
+      end
+      
       sql << " UNIQUE" if index_data["unique"]
-      sql << " INDEX #{@db.escape_col}#{@db.esc_col(index_data["name"])}#{@db.escape_col} ON #{@db.escape_table}#{@db.esc_table(self.name)}#{@db.escape_table} ("
+      sql << " INDEX #{db.escape_col}#{db.esc_col(index_data["name"])}#{db.escape_col}"
+      
+      if args[:on_table] or !args.key?(:on_table)
+        sql << " ON #{db.escape_table}#{db.esc_table(args[:table_name])}#{db.escape_table}"
+      end
+      
+      sql << " ("
       
       first = true
       index_data["columns"].each do |col_name|
         sql << ", " if !first
         first = false if first
         
-        sql << "#{@db.escape_col}#{@db.esc_col(col_name)}#{@db.escape_col}"
+        sql << "#{db.escape_col}#{db.esc_col(col_name)}#{db.escape_col}"
       end
       
       sql << ")"
       
-      @db.query(sql)
+      if !args[:return_sql]
+        db.query(sql)
+      end
+    end
+    
+    if args[:return_sql]
+      return sql
+    else
+      return nil
     end
   end
   
   def rename(newname)
     oldname = self.name
     @db.query("ALTER TABLE `#{oldname}` RENAME TO `#{newname}`")
-    @args[:tables].list[newname] = self
-    @args[:tables].list.delete(oldname)
+    @db.tables.list[newname] = self
+    @db.tables.list.delete(oldname)
     @data[:Name] = newname
   end
   

data/lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_tables.rb

@@ -17,7 +17,7 @@ class KnjDB_sqlite3::Tables
     
     begin
       return @list[table_name]
-    rescue WeakRef::RefError
+    rescue Knj::Wref::Recycled
       #ignore.
     end
     
@@ -271,13 +271,13 @@ class KnjDB_sqlite3::Tables::Table
     
     begin
       return @indexes_list[name]
-    rescue WeakRef::RefError
+    rescue Knj::Wref::Recycled
       if @db.opts[:index_append_table_name]
         tryname = "#{self.name}__#{name}"
         
         begin
           return @indexes_list[tryname]
-        rescue WeakRef::RefError
+        rescue Knj::Wref::Recycled
           #ignore.
         end
       else

data/lib/knj/knjdb/libknjdb.rb

@@ -68,7 +68,7 @@ class Knj::Db
     
     fpaths = [
       "drivers/#{@opts[:type]}/knjdb_#{@opts[:type]}.rb",
-      "libknjdb_" + @opts[:type] + ".rb"
+      "libknjdb_#{@opts[:type]}.rb"
     ]
     fpaths.each do |fpath|
       rpath = "#{File.dirname(__FILE__)}/#{fpath}"
@@ -370,11 +370,10 @@ class Knj::Db
   #Executes a query and returns the result.
   def query(string)
     if @debug
-      begin
-        raise "test"
-      rescue => e
-        print "SQL: #{string}\n"
-        print e.backtrace.join("\n")
+      print "SQL: #{string}\n"
+      
+      if @debug.is_a?(Fixnum) and @debug >= 2
+        print caller.join("\n")
         print "\n"
       end
     end
@@ -402,15 +401,7 @@ class Knj::Db
   
   #Clones the connection, executes a unbuffered query and closes the connection again.
   def cloned_conn(args = nil, &block)
-    subtype = @opts[:subtype]
-    
-    #MySQL2-driver doesnt support unbuffered queries yet.
-    if @opts[:type] == "mysql" and @opts[:subtype] == "mysql2"
-      subtype = "mysql"
-    end
-    
     clone_conn_args = {
-      :subtype => subtype,
       :threadsafe => false
     }
     
@@ -513,15 +504,14 @@ class Knj::Db
   #Returns the table-module and spawns it if it isnt already spawned.
   def tables
     conn_exec do |driver|
-      if !driver.tables
+      if !@tables
         require "#{File.dirname(__FILE__)}/drivers/#{@opts[:type]}/knjdb_#{@opts[:type]}_tables" if (!@opts.key?(:require) or @opts[:require])
-        driver.tables = Kernel.const_get("KnjDB_#{@opts[:type]}".to_sym).const_get(:Tables).new(
-          :driver => driver,
+        @tables = Kernel.const_get("KnjDB_#{@opts[:type]}".to_sym).const_get(:Tables).new(
           :db => self
         )
       end
       
-      return driver.tables
+      return @tables
     end
   end
   
@@ -530,7 +520,6 @@ class Knj::Db
     if !@cols
       require "#{File.dirname(__FILE__)}/drivers/#{@opts[:type]}/knjdb_#{@opts[:type]}_columns" if (!@opts.key?(:require) or @opts[:require])
       @cols = Kernel.const_get("KnjDB_#{@opts[:type]}".to_sym).const_get(:Columns).new(
-        :driver => @conn,
         :db => self
       )
     end
@@ -543,7 +532,6 @@ class Knj::Db
     if !@indexes
       require "#{File.dirname(__FILE__)}/drivers/#{@opts[:type]}/knjdb_#{@opts[:type]}_indexes" if (!@opts.key?(:require) or @opts[:require])
       @indexes = Kernel.const_get("KnjDB_#{@opts[:type]}".to_sym).const_get(:Indexes).new(
-        :driver => @conn,
         :db => self
       )
     end
@@ -560,4 +548,15 @@ class Knj::Db
     
     raise "Method not found: #{method_name}"
   end
+  
+  #Beings a transaction and commits when the block ends.
+  def transaction
+    self.query("START TRANSACTION")
+    
+    begin
+      yield(self)
+    ensure
+      self.query("COMMIT")
+    end
+  end
 end

data/lib/knj/knjdb/revision.rb

@@ -5,6 +5,7 @@ class Knj::Db::Revision
   
   #This method checks if certain rows are present in a table based on a hash.
   def rows_init(args)
+    db = args["db"]
     table = args["table"]
     
     args["rows"].each do |row_data|
@@ -37,7 +38,6 @@ class Knj::Db::Revision
   def init_db(args)
     schema = args["schema"]
     db = args["db"]
-    @db = db
     
     #Check for normal bugs and raise apropiate error.
     raise "'schema' argument was not a Hash: '#{schema.class.name}'." if !schema.is_a?(Hash)
@@ -50,6 +50,7 @@ class Knj::Db::Revision
     schema["tables"].each do |table_name, table_data|
       begin
         begin
+          raise Knj::Errors::NotFound if !tables.key?(table_name)
           table_obj = db.tables[table_name]
           
           #Cache indexes- and column-objects to avoid constant reloading.
@@ -224,11 +225,12 @@ class Knj::Db::Revision
             end
           end
           
-          self.rows_init("table" => table_obj, "rows" => table_data["rows"]) if table_data and table_data["rows"]
+          self.rows_init("db" => db, "table" => table_obj, "rows" => table_data["rows"]) if table_data and table_data["rows"]
         rescue Knj::Errors::NotFound => e
           if table_data["renames"]
             table_data["renames"].each do |table_name_rename|
               begin
+                raise Knj::Errors::NotFound if !tables.key?(table_name)
                 table_rename = db.tables[table_name_rename]
                 table_rename.rename(table_name)
                 raise Knj::Errors::Retry
@@ -272,5 +274,10 @@ class Knj::Db::Revision
         end
       end
     end
+    
+    
+    #Free cache.
+    tables.clear
+    tables = nil
   end
 end

data/lib/knj/kvm.rb

@@ -0,0 +1,100 @@
+class Knj::Kvm
+  def self.list
+    list = []
+    
+    Knj::Unix_proc.list("grep" => "kvm") do |proc_obj|
+      next if !proc_obj["cmd"].match(/^\/usr\/bin\/kvm\s+/)
+      
+      args = {
+        :pid => proc_obj["pid"]
+      }
+      
+      if mac_match = proc_obj["cmd"].match(/mac=(.+?)(,|\s+|$)/)
+        args[:mac] = mac_match[1]
+      end
+      
+      if name_match = proc_obj["cmd"].match(/\-name\s+(.+?)(,|\s+|$)/)
+        args[:name] = name_match[1]
+      end
+      
+      if args.length > 0 and args[:name].to_s.length > 0
+        machine = Knj::Kvm::Machine.new(args)
+        if block_given?
+          yield(machine)
+        else
+          list << machine
+        end
+      end
+    end
+    
+    if block_given?
+      return nil
+    else
+      return list
+    end
+  end
+end
+
+class Knj::Kvm::Machine
+  def initialize(args)
+    @args = args
+  end
+  
+  def pid
+    return @args[:pid]
+  end
+  
+  def name
+    return @args[:name]
+  end
+  
+  def mac
+    raise "No MAC-address has been registered for this machine." if !@args.key?(:mac)
+    return @args[:mac]
+  end
+  
+  def iface
+    if !@iface
+      res = Knj::Os.shellcmd("ifconfig | grep \"#{self.mac[3, self.mac.length]}\"")
+      
+      if net_match = res.match(/^vnet(\d+)/)
+        @iface = net_match[0]
+      else
+        raise "Could not figure out iface from '#{res}' for '#{self.name}'."
+      end
+    end
+    
+    return @iface
+  end
+  
+  def net_status
+    res = Knj::Os.shellcmd("ifconfig \"#{self.iface}\"")
+    
+    ret = {}
+    
+    if tx_bytes_match = res.match(/TX\s*bytes:\s*(\d+)/)
+      ret[:tx] = tx_bytes_match[1].to_i
+    end
+    
+    if rx_bytes_match = res.match(/RX\s*bytes:\s*(\d+)/)
+      ret[:rx] = rx_bytes_match[1].to_i
+    end
+    
+    return ret
+  end
+  
+  def io_status
+    io_status = File.read("/proc/#{self.pid}/io")
+    
+    if !matches = io_status.scan(/^(.+): (\d+)$/)
+      raise "Could not match IO-status from: '#{io_status}'."
+    end
+    
+    ret = {}
+    matches.each do |match|
+      ret[match[0].to_sym] = match[1].to_i
+    end
+    
+    return ret
+  end
+end

data/lib/knj/locale_strings.rb

@@ -1,3 +1,32 @@
-[_("Monday"), _("Tuesday"), _("Wednesday"), _("Thursday"), _("Friday"), _("Saturday"), _("Sunday")]
-[_("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat"), _("Sun")]
-[_("January"), _("February"), _("March"), _("April"), _("May"), _("June"), _("July"), _("August"), _("September"), _("October"), _("November"), _("December")]
+#This file can be symlinked and thereby easily translated by POEdit. Further more the static methods can be used for stuff.
+module Knj::Locales
+  def self.days_arr
+    return [_("Monday"), _("Tuesday"), _("Wednesday"), _("Thursday"), _("Friday"), _("Saturday"), _("Sunday")]
+  end
+  
+  def self.days_short_arr
+    return [_("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat"), _("Sun")]
+  end
+  
+  def self.months_arr
+    return [_("January"), _("February"), _("March"), _("April"), _("May"), _("June"), _("July"), _("August"), _("September"), _("October"), _("November"), _("December")]
+  end
+  
+  def self.ago_strings
+    return {
+      :year_ago_str => _("%s year ago"),
+      :years_ago_str => _("%s years ago"),
+      :month_ago_str => _("%s month ago"),
+      :months_ago_str => _("%s months ago"),
+      :day_ago_str => _("%s day ago"),
+      :days_ago_str => _("%s days ago"),
+      :hour_ago_str => _("%s hour ago"),
+      :hours_ago_str => _("%s hours ago"),
+      :min_ago_str => _("%s minute ago"),
+      :mins_ago_str => _("%s minutes ago"),
+      :sec_ago_str => _("%s second ago"),
+      :secs_ago_str => _("%s seconds ago"),
+      :right_now_str => _("right now")
+    }
+  end
+end