sqlui 0.1.76 → 0.1.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8a1521fc269ae7ca6ff4686c9697e2b52138a893c8088543a557f99381edb76
-  data.tar.gz: 963fac5e9aca7948f24d29ab7be3a053c89510c079c5ad4a78de6f7b1b1030e6
+  metadata.gz: 813ba5e47c2d4409ff6601fd9974f649f4099da7bc61dc82d2f619313c033cbe
+  data.tar.gz: 57e1ebab4287fd3b49f2d6e1cc37009cabc60aba6d3fb6c7b2fed5f3cc107d5f
 SHA512:
-  metadata.gz: ce2b404e42b73506ac2acfc4e6bff1b804e08089c9bbf3e4951bae9df4098f5ee7356f978551343c6b724280e9cbef3b0fb7669355fa6a517e6b89a5ef3e76db
-  data.tar.gz: 062de95c20aca88831dd9789109881a816dd18692feb5e87a6b881c392c406c27c794e83bd132fcd5bc09486f9320d69e26ee1326c804585688b98fa65cd13f2
+  metadata.gz: 48a36192980463f3a2ce4ef80b3b74011ee8e42b8d6dd215b8ac8f01f5146682ceca736888c661789c024b57a33bf7e7b771ea10c1f5b33f2d91891689eae5ef
+  data.tar.gz: 21ea275d80725c1907ed6d04e3c5d3c83bd84a18fbbfdf56d490f60959b3fb515c84bb219020afc3fd4769add109031c6bba9a6cbd89698116a8cb1ca715019d

data/.release-version

@@ -1 +1 @@
-0.1.76
+0.1.77

data/app/github/tree_client.rb

@@ -25,10 +25,7 @@ module Github
     end
 
     DEFAULT_MAX_TREE_CACHE_AGE_SECONDS = 60 * 5 # 5 minutes
-    DEFAULT_MAX_FILE_CACHE_AGE_SECONDS = 60 * 60 * 24 * 7 # 1 week
-
-    MAX_TREE_SIZE = 100
-    private_constant :MAX_TREE_SIZE
+    DEFAULT_MAX_FILE_CACHE_AGE_SECONDS = 60 * 60 * 24 * 365 # 1 year
 
     def initialize(access_token:, cache:, logger: Logger.new($stdout))
       check_non_empty_string(access_token: access_token)
@@ -52,9 +49,8 @@ module Github
                  end
 
       response['tree'] = response['tree'].select { |blob| regex.match?(blob['path']) }
-      raise "trees with more than #{MAX_TREE_SIZE} blobs not supported" if response['tree'].size > MAX_TREE_SIZE
-
-      latch = CountDownLatch.new(response['tree'].size)
+      tree_size = response['tree'].size
+      latch = CountDownLatch.new(tree_size)
       response['tree'].each do |blob|
         TreeClient.thread_pool.post do
           blob['content'] =
@@ -64,7 +60,7 @@ module Github
         end
       end
 
-      latch.await(timeout: 20)
+      latch.await(timeout: [10, tree_size / 2].max)
       raise 'failed to load saved files' unless response['tree'].all? { |blob| blob['content'] }
 
       Tree.for(owner: owner, repo: repo, ref: ref, tree_response: response)

data/app/server.rb

@@ -36,7 +36,7 @@ class Server < Sinatra::Base
     end
   end
 
-  def self.init_and_run(config, resources_dir, github_cache)
+  def self.init_and_run(config, resources_dir)
     Sqlui.logger.info("Starting SQLUI v#{Version::SQLUI}")
     Sqlui.logger.info("Airbrake enabled: #{config.airbrake[:server]&.[](:enabled) || false}")
 
@@ -113,7 +113,23 @@ class Server < Sinatra::Base
       erb :databases, locals: { config: config, resource_path_map: resource_path_map }
     end
 
+    github_cache = create_github_cache
     config.database_configs.each do |database|
+      # Prefetch all trees on startup. This should happen before the health endpoint is available.
+      if (saved_config = database.saved_config)
+        tree_client = Github::TreeClient.new(
+          access_token: database.saved_config.token,
+          cache: github_cache,
+          logger: Sqlui.logger
+        )
+        tree_client.get_tree(
+          owner: saved_config.owner,
+          repo: saved_config.repo,
+          ref: saved_config.branch,
+          regex: saved_config.regex
+        )
+      end
+
       get "#{config.base_url_path}/#{database.url_path}/?" do
         redirect "#{database.url_path}/query", 301
       end
@@ -121,11 +137,6 @@ class Server < Sinatra::Base
       post "#{config.base_url_path}/#{database.url_path}/metadata" do
         tree = nil
         if (saved_config = database.saved_config)
-          tree_client = Github::TreeClient.new(
-            access_token: database.saved_config.token,
-            cache: github_cache,
-            logger: Sqlui.logger
-          )
           tree = tree_client.get_tree(
             owner: saved_config.owner,
             repo: saved_config.repo,
@@ -361,7 +372,31 @@ class Server < Sinatra::Base
     run!
   end
 
-  private
+  def self.create_github_cache
+    return Github::Cache.new({}, logger: Sqlui.logger) unless ENV['USE_LOCAL_SAVED_FILES']
+
+    paths = Dir.glob('sql/**/*.sql')
+    blobs = paths.map { |path| { 'path' => path, 'sha' => 'foo' } }
+    github_cache_hash = {
+      'https://api.github.com/repos/nicholasdower/sqlui/git/trees/master?recursive=true' =>
+        Github::Cache::Entry.new(
+          {
+            'sha' => 'foo',
+            'truncated' => false,
+            'tree' => blobs
+          }, 60 * 60 * 24 * 365
+        )
+    }
+    paths.each do |path|
+      github_cache_hash["https://api.github.com/repos/nicholasdower/sqlui/contents/#{path}?ref=foo"] =
+        Github::Cache::Entry.new(
+          {
+            'content' => Base64.encode64(File.read(path))
+          }, 60 * 60 * 24 * 365
+        )
+    end
+    Github::Cache.new(github_cache_hash, logger: Sqlui.logger)
+  end
 
   def find_selected_queries(full_sql, selection)
     if selection

data/app/sqlui.rb

@@ -28,7 +28,7 @@ class Sqlui
   end
 
   def run
-    Server.init_and_run(@config, @resources_dir, github_cache)
+    Server.init_and_run(@config, @resources_dir)
   end
 
   def self.from_command_line(args)
@@ -42,32 +42,4 @@ class Sqlui
 
     Sqlui.new(args[0])
   end
-
-  private
-
-  def github_cache
-    return Github::Cache.new({}, logger: Sqlui.logger) unless ENV['USE_LOCAL_SAVED_FILES']
-
-    paths = Dir.glob('sql/friends/*.sql')
-    blobs = paths.map { |path| { 'path' => path, 'sha' => 'foo' } }
-    github_cache_hash = {
-      'https://api.github.com/repos/nicholasdower/sqlui/git/trees/master?recursive=true' =>
-        Github::Cache::Entry.new(
-          {
-            'sha' => 'foo',
-            'truncated' => false,
-            'tree' => blobs
-          }, 60 * 60 * 24 * 365
-        )
-    }
-    paths.each do |path|
-      github_cache_hash["https://api.github.com/repos/nicholasdower/sqlui/contents/#{path}?ref=foo"] =
-        Github::Cache::Entry.new(
-          {
-            'content' => Base64.encode64(File.read(path))
-          }, 60 * 60 * 24 * 365
-        )
-    end
-    Github::Cache.new(github_cache_hash, logger: Sqlui.logger)
-  end
 end