detector 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2fdcd9559b7c9d9d40b8908d4ec47ef17ff63d62305832bbe7f69b10b05a35b
-  data.tar.gz: 0560305f80f5d1f5aea6eb5959ef7ebb3cc225479492a69594bf227d618804f1
+  metadata.gz: 803cfd73b761e5b098dac4d15062b3a47e768d70d862c61301f3e8444c011762
+  data.tar.gz: f96d8885689baed71e8dfd8aa986ee24a6b0620c2745ff91a60e541d9324b781
 SHA512:
-  metadata.gz: 82be9fdd64b14e11e3ff0ff0d927b2508129eb0a84d5a5a4340c7afd991273ddd83f114f6ffdfb1d2add0e84a9526ba8ccd727887ecf70d694f4fb8cc2a0e053
-  data.tar.gz: 53d7ee213ff018c23a7df00df47d8a3cf8525bb475a9eafb4415ee8ba9ffc4db3c2c22dbc48711f06fa2a390ef1f92a3fbf215451a2460022d34e3f23174bf79
+  metadata.gz: ec4621a88022efbac688c988275d21077dc260139a630659fef4f9257f4baa1409805add6f8056fe6c5a53b2329db849abc685839a5ace170b309089b9a909b3
+  data.tar.gz: ec584db3cb9ea42c2ce979c17cbc2d0facd7831d08105ab5ed1de0559c5ec5ca6e80fd32734851142ebb45eac676317fd8ac2f8fa72cd44eac41a5189c39bfe1

data/bin/detector

@@ -7,10 +7,23 @@ if ARGV.empty?
   puts "Detector v#{Detector::VERSION}"
   puts "Usage: detector <URI>"
   puts "Example: detector \"postgres://user:pass@host:port/dbname\""
+  puts "Additional options:"
+  puts "  --table=TABLE_NAME [--database=DB_NAME] : Estimate row count for a specific table"
   exit 1
 end
 
 uri = ARGV[0]
+options = {}
+
+# Parse command-line options
+ARGV[1..-1].each do |arg|
+  if arg.start_with?('--table=')
+    options[:table] = arg.split('=', 2)[1]
+  elsif arg.start_with?('--database=')
+    options[:database] = arg.split('=', 2)[1]
+  end
+end
+
 detector = Detector.detect(uri)
 
 if detector.nil?
@@ -18,11 +31,28 @@ if detector.nil?
   exit 1
 end
 
+# If table is specified, show row count estimate and exit
+if options[:table]
+  count = detector.estimated_row_count(table: options[:table], database: options[:database])
+  if count
+    puts "Estimated row count for #{options[:table]}: #{count}"
+  else
+    puts "Unable to estimate row count for #{options[:table]}"
+  end
+  detector.close
+  exit 0
+end
+
 puts "Detector v#{Detector::VERSION}"
 puts "Detected: #{detector.kind}"
 puts "Version: #{detector.version}"
 puts "Host: #{detector.host}:#{detector.port}"
 
+if detector.connection_count && detector.connection_limit
+  usage = detector.connection_usage_percentage
+  puts "Connections: #{detector.connection_count}/#{detector.connection_limit} (#{usage}%)"
+end
+
 if detector.respond_to?(:replication_available?) && !detector.replication_available?.nil?
   puts "Replication: #{detector.replication_available? ? 'Available' : 'Not available'}"
 end
@@ -71,4 +101,7 @@ if detector.databases?
       end
     end
   end
-end 
+end
+
+# Make sure to close the connection
+detector.close 

data/lib/detector/addons/mariadb.rb

@@ -108,6 +108,11 @@ module Detector
         
         access_level
       end
+      
+      # MariaDB inherits the estimated_row_count method from MySQL, but we might want to override
+      # with MariaDB-specific optimizations or different statistics approaches in the future
+      
+      # MariaDB inherits the close method from MySQL
     end
   end
   

data/lib/detector/addons/mysql.rb

@@ -187,6 +187,33 @@ module Detector
           nil
         end
       end
+      
+      def estimated_row_count(table:, database: nil)
+        return nil unless connection
+        
+        # Use current database if none specified
+        db_name = database || info['database']
+        return nil unless db_name
+        
+        begin
+          # Query information_schema.tables for the statistics-based row estimate
+          result = connection.query("SELECT table_rows AS estimate 
+                                   FROM information_schema.tables 
+                                   WHERE table_schema = '#{db_name}' 
+                                   AND table_name = '#{table}'").first
+          
+          result ? result['estimate'].to_i : nil
+        rescue => e
+          nil
+        end
+      end
+      
+      def close
+        if @conn
+          @conn.close rescue nil
+          @conn = nil
+        end
+      end
     end
   end
   

data/lib/detector/addons/postgres.rb

@@ -204,6 +204,46 @@ module Detector
           nil
         end
       end
+      
+      def estimated_row_count(table:, database: nil)
+        return nil unless connection
+        
+        # Use the current database if none is specified
+        db_name = database || current_database
+        
+        begin
+          # If we need to query a different database, temporarily connect to it
+          if db_name != current_database
+            # Create a temporary connection to the specified database
+            temp_conn = PG::Connection.new(host: host, port: port, user: uri.user, 
+                                         password: uri.password, dbname: db_name) rescue nil
+            return nil unless temp_conn
+            
+            # Use pg_class.reltuples for a fast, statistics-based row estimate
+            count = temp_conn.exec("SELECT reltuples::bigint AS estimate 
+                                  FROM pg_class 
+                                  WHERE relname = '#{table}'").first
+            temp_conn.close
+            return count ? count['estimate'].to_i : nil
+          end
+          
+          # Query the current database using pg_class.reltuples
+          count = connection.exec("SELECT reltuples::bigint AS estimate 
+                                FROM pg_class 
+                                WHERE relname = '#{table}'").first
+          
+          count ? count['estimate'].to_i : nil
+        rescue => e
+          nil
+        end
+      end
+      
+      def close
+        if @conn
+          @conn.close rescue nil
+          @conn = nil
+        end
+      end
     end
   end
   

data/lib/detector/addons/redis.rb

@@ -1,4 +1,5 @@
 require 'redis'
+require 'timeout'
 
 module Detector
   module Addons
@@ -171,6 +172,52 @@ module Detector
           nil
         end
       end
+      
+      def estimated_row_count(table:, database: nil)
+        return nil unless connection
+        
+        # In Redis, the database is a number (0-15 typically) and "table" concept is closest to key patterns
+        # We'll interpret table parameter as a key pattern
+        
+        begin
+          # Set the database if specified
+          if database
+            # Redis db numbers are integers
+            db_num = database.to_s.gsub(/[^0-9]/, '').to_i
+            connection.select(db_num) rescue nil
+          end
+          
+          # Count keys matching the pattern (consider this a heuristic approximation)
+          # Use SCAN for larger datasets, as it doesn't block the server
+          count = 0
+          cursor = "0"
+          
+          begin
+            # Timeout after a reasonable time to prevent long-running operations
+            Timeout.timeout(5) do
+              loop do
+                cursor, keys = connection.scan(cursor, match: table, count: 1000)
+                count += keys.size
+                break if cursor == "0"
+              end
+            end
+          rescue Timeout::Error
+            # If we time out, return the partial count with a note
+            return count
+          end
+          
+          count
+        rescue => e
+          nil
+        end
+      end
+      
+      def close
+        if @conn
+          @conn.quit rescue nil
+          @conn = nil
+        end
+      end
     end
   end
   

data/lib/detector/base.rb

@@ -219,5 +219,27 @@ module Detector
     def replication_available?
       nil
     end
+    
+    def connection_count
+      nil
+    end
+    
+    def connection_limit
+      nil
+    end
+    
+    def connection_usage_percentage
+      return nil unless connection_count && connection_limit && connection_limit > 0
+      (connection_count.to_f / connection_limit.to_f * 100).round(1)
+    end
+    
+    def estimated_row_count(table:, database: nil)
+      nil
+    end
+    
+    def close
+      # Default implementation does nothing
+      # Subclasses should override to close any open connections
+    end
   end
 end 

data/lib/detector/version.rb

@@ -1,3 +1,3 @@
 module Detector
-  VERSION = "0.4.0"
+  VERSION = "0.7.0"
 end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: detector
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jonathan Siegel