mirror of
https://gh.wpcy.net/https://github.com/discourse/discourse.git
synced 2026-05-07 17:36:22 +08:00
89f26da39d
Ruby's compact module syntax (`module Migrations::Database::Schema::DSL`) breaks lexical constant lookup — `Module.nesting` only includes the innermost constant, so every cross-module reference must be fully qualified. In practice this means writing `Migrations::Database::Schema::Helpers` even when you're already inside `Migrations::Database::Schema`. Nested module definitions restore the full nesting chain, which brings several practical benefits: - **Less verbose code**: references like `Schema::Helpers`, `Database::IntermediateDB`, or `Converters::Base::ProgressStep` work without repeating the full path from root - **Easier to write new code**: contributors don't need to remember which prefixes are required — if you're inside the namespace, short names just work - **Fewer aliasing workarounds**: removes the need for constants like `MappingType = Migrations::Importer::MappingType` that existed solely to shorten references - **Standard Ruby style**: consistent with how most Ruby projects and gems structure their namespaces The diff is large but mechanical — no logic changes, just module wrapping and shortening references that the nesting now resolves. Generated code (intermediate_db models/enums) keeps fully qualified references like `Migrations::Database.format_*` since it must work regardless of the configured output namespace. - Convert 138 lib files from compact to nested module definitions - Remove now-redundant fully qualified prefixes and aliases - Update model and enum writers to generate nested modules with correct indentation - Regenerate all intermediate_db models and enums
60 lines
1.3 KiB
Ruby
60 lines
1.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module Migrations
|
|
module SetStore
|
|
class TwoKeySet
|
|
include Interface
|
|
|
|
def initialize
|
|
@store = {}
|
|
end
|
|
|
|
def add(key1, key2, value)
|
|
h1 = @store[key1] ||= {}
|
|
set = h1[key2] ||= Set.new
|
|
set.add(value)
|
|
self
|
|
end
|
|
|
|
def add?(key1, key2, value)
|
|
h1 = @store[key1] ||= {}
|
|
set = h1[key2] ||= Set.new
|
|
!!set.add?(value)
|
|
end
|
|
|
|
def include?(key1, key2, value)
|
|
h1 = @store[key1] or return false
|
|
set = h1[key2] or return false
|
|
set.include?(value)
|
|
end
|
|
|
|
def bulk_add(records)
|
|
current_key1 = :__uninitialized__
|
|
current_key2 = :__uninitialized__
|
|
current_h1 = nil
|
|
current_set = nil
|
|
|
|
records.each do |record|
|
|
key1, key2, value = record
|
|
|
|
if key1 != current_key1
|
|
current_key1 = key1
|
|
current_h1 = @store[key1] ||= {}
|
|
current_key2 = key2
|
|
current_set = current_h1[key2] ||= Set.new
|
|
elsif key2 != current_key2
|
|
current_key2 = key2
|
|
current_set = current_h1[key2] ||= Set.new
|
|
end
|
|
|
|
current_set.add(value)
|
|
end
|
|
nil
|
|
end
|
|
|
|
def empty?
|
|
@store.empty?
|
|
end
|
|
end
|
|
end
|
|
end
|
