Skip to content

Commit

Permalink
Bump to YCH v.21.7
Browse files Browse the repository at this point in the history
Signed-off-by: Aleksandr Shilov <alex.shilov.by@gmail.com>
  • Loading branch information
shlima committed Jul 14, 2021
1 parent 94945de commit bf1f633
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

services:
clickhouse:
image: yandex/clickhouse-server:21.3
image: yandex/clickhouse-server:21.7
ports:
- 8123:8123

Expand Down
18 changes: 17 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ Performance/RedundantEqualityComparisonBlock:
Enabled: true
Performance/RedundantSplitRegexpArgument:
Enabled: true
Performance/MapCompact:
Enabled: true

# ============================== Metrics ============================
Metrics/ClassLength:
Expand All @@ -73,6 +75,8 @@ Naming/MethodParameterName:
Enabled: false
Naming/AccessorMethodName:
Enabled: false
Naming/InclusiveLanguage:
Enabled: true

# ============================== Layout =============================
Layout/LineLength:
Expand Down Expand Up @@ -111,7 +115,7 @@ Layout/SpaceAroundMethodCallOperator:
Enabled: true
Layout/SpaceBeforeBrackets:
Enabled: true
Lint/AmbiguousAssignment:
Layout/LineEndStringConcatenationIndentation:
Enabled: true

# ============================== Style ==============================
Expand Down Expand Up @@ -235,6 +239,14 @@ Style/HashConversion:
Enabled: true
Style/Documentation:
Enabled: false
Style/InPatternThen:
Enabled: true
Style/MultilineInPatternThen:
Enabled: true
Style/QuotedSymbols:
Enabled: true
Style/StringChars:
Enabled: true

# ============================== Lint ==============================
Lint/DuplicateMethods:
Expand Down Expand Up @@ -319,3 +331,7 @@ Lint/SymbolConversion:
Enabled: true
Lint/TripleQuotes:
Enabled: true
Lint/AmbiguousAssignment:
Enabled: true
Lint/EmptyInPattern:
Enabled: true
32 changes: 20 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,35 @@ GEM
ast (2.4.2)
coderay (1.1.3)
diff-lcs (1.4.4)
faraday (1.4.1)
faraday (1.5.1)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
faraday-patron (~> 1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.1.0)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday_middleware (1.0.0)
faraday (~> 1.0)
method_source (1.0.0)
multipart-post (2.1.1)
parallel (1.20.1)
parser (3.0.0.0)
parser (3.0.2.0)
ast (~> 2.4.1)
pry (0.14.0)
pry (0.14.1)
coderay (~> 1.1)
method_source (~> 1.0)
rainbow (3.0.0)
rake (13.0.3)
rake (13.0.6)
regexp_parser (2.1.1)
rexml (3.2.5)
rspec (3.10.0)
Expand All @@ -47,19 +55,19 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-support (3.10.2)
rubocop (1.11.0)
rubocop (1.18.3)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 1.2.0, < 2.0)
rubocop-ast (>= 1.7.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.4.1)
parser (>= 2.7.1.5)
rubocop-performance (1.10.1)
rubocop (>= 0.90.0, < 2.0)
rubocop-ast (1.7.0)
parser (>= 3.0.1.1)
rubocop-performance (1.11.4)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.4)
Expand All @@ -78,4 +86,4 @@ DEPENDENCIES
rubocop-performance

BUNDLED WITH
2.2.14
2.2.15
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.5'

services:
clickhouse:
image: yandex/clickhouse-server:21.3
image: yandex/clickhouse-server:21.7
ports:
- "8123:8123"
- "9000:9000"
Expand Down
19 changes: 8 additions & 11 deletions spec/click_house/extend/connection_explaining_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,14 @@

let(:expectation) do
<<~TXT
Expression (Projection)
CreatingSets (Create sets before main query execution)
Expression (Before ORDER BY)
Join (JOIN)
Expression (Before JOIN)
SettingQuotaAndLimits (Set limits and quota after reading from storage)
ReadFromStorage (TinyLog)
CreatingSet (Create set for JOIN)
Expression ((Projection + Before ORDER BY))
SettingQuotaAndLimits (Set limits and quota after reading from storage)
ReadFromStorage (TinyLog)
Expression ((Projection + Before ORDER BY))
Join (JOIN)
Expression (Before JOIN)
SettingQuotaAndLimits (Set limits and quota after reading from storage)
ReadFromStorage (TinyLog)
Expression ((Joined actions + (Rename joined columns + (Projection + Before ORDER BY))))
SettingQuotaAndLimits (Set limits and quota after reading from storage)
ReadFromStorage (TinyLog)
TXT
end

Expand Down

0 comments on commit bf1f633

Please sign in to comment.