Skip to content

GH-45402: [CI][Dev][Ruby] Reformat codes before apply lint - #45403

Merged
kou merged 8 commits into
apache:mainfrom
hiroyuki-sato:topic/reformat-ruby-code
Feb 3, 2025
Merged

GH-45402: [CI][Dev][Ruby] Reformat codes before apply lint#45403
kou merged 8 commits into
apache:mainfrom
hiroyuki-sato:topic/reformat-ruby-code

Conversation

@hiroyuki-sato

@hiroyuki-satohiroyuki-sato commented Feb 1, 2025

Copy link
Copy Markdown
Collaborator

Rationale for this change

#45398 will apply Ruby lint. Before this change, some code needs to be reformatted to avoid format errors.

Ruby Format..............................................................Failed
- hook id: rubocop
- exit code: 1
- files were modified by this hook
Inspecting 79 files
..............................C................................................
Offenses:
c_glib/test/test-record-batch-datum.rb:52:101: C: [Corrected] Layout/LineLength: Line is too long. [107/100]
assert_equal("RecordBatch(visible: [\n" + " true,\n" + " false\n" + " ]\n" + ")", @datum.to_s)
^^^^^^^
c_glib/test/test-record-batch-datum.rb:53:1: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
@datum.to_s)
^^^^^^^^^^^
79 files inspected, 2 offenses detected, 2 offenses corrected
Inspecting 79 files
..................C................................C.....................C.....
Offenses:
dev/release/01-prepare-test.rb:267:101: C: Layout/LineLength: Line is too long. [101/100]
"+<p><a href=\"../#{@previous_compatible_version}/r/\">#{@previous_r_version}</a></p>",
^
c_glib/test/test-struct-field-options.rb:45:101: C: Layout/LineLength: Line is too long. [112/100]
message = "[struct-field-options][set-field-ref]: Invalid: Dot path '[foo]' contained an unterminated index"
^^^^^^^^^^^^
ruby/red-arrow/test/test-table.rb:1524:21: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
table1.join(table2, ...
^^^^^^^^^^^^^^^^^^^
79 files inspected, 3 offenses detected, 1 offense corrected
Inspecting 79 files
......................C........................................................
Offenses:
c_glib/test/test-chunked-array-datum.rb:52:101: C: [Corrected] Layout/LineLength: Line is too long. [108/100]
assert_equal("ChunkedArray([\n" + " [\n" + " true,\n" + " false\n" + " ]\n" + "])", @datum.to_s)
^^^^^^^^
c_glib/test/test-chunked-array-datum.rb:53:1: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
@datum.to_s)
^^^^^^^^^^^
79 files inspected, 2 offenses detected, 2 offenses corrected
Inspecting 79 files
..............C............................C....C..............................
Offenses:
c_glib/test/dataset/test-file-system-dataset.rb:98:30: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
label: [ ...
^^^^^^^^
dev/release/post-12-bump-versions-test.rb:305:101: C: Layout/LineLength: Line is too long. [103/100]
"+<p><a href=\"../#{@previous_compatible_version}/r/\">#{@previous_r_version}</a></p>",
^^^
c_glib/test/test-array.rb:122:101: C: [Corrected] Layout/LineLength: Line is too long. [103/100]
build_int32_array([0, 1069547520, -1071644672, nil]).view(Arrow::FloatDataType.new))
^^^
79 files inspected, 3 offenses detected, 2 offenses corrected
Inspecting 79 files
...............................................................................
79 files inspected, no offenses detected
Inspecting 79 files
........................................................................C......
Offenses:
c_glib/test/test-large-list-array.rb:91:30: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
[ ...
^
79 files inspected, 1 offense detected, 1 offense corrected
Inspecting 79 files
...............................................................................
79 files inspected, no offenses detected
Inspecting 79 files
...............................C...............................................
Offenses:
c_glib/test/test-uint-array-builder.rb:35:40: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
Arrow::Buffer.new(values.pack("S*")),
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
c_glib/test/test-uint-array-builder.rb:36:40: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
Arrow::Buffer.new([0b011].pack("C*")),
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
c_glib/test/test-uint-array-builder.rb:37:40: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
-1))
^^
c_glib/test/test-uint-array-builder.rb:45:40: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
Arrow::Buffer.new(values.pack("L*")),
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
c_glib/test/test-uint-array-builder.rb:46:40: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
Arrow::Buffer.new([0b011].pack("C*")),
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
c_glib/test/test-uint-array-builder.rb:47:40: C: [Corrected] Layout/ArgumentAlignment: Align the arguments of a method call if they span more than one line.
-1))
^^
79 files inspected, 6 offenses detected, 6 offenses corrected
pre-commit hook(s) made changes.
If you are seeing this message in CI, reproduce locally with: `pre-commit run --all-files`.
To run `pre-commit` as part of git workflow, use `pre-commit install`.
All changes made by hooks:
diff --git a/c_glib/test/dataset/test-file-system-dataset.rb b/c_glib/test/dataset/test-file-system-dataset.rb
index 96deedf6b..0cd2a61ea 100644
--- a/c_glib/test/dataset/test-file-system-dataset.rb
+++ b/c_glib/test/dataset/test-file-system-dataset.rb
@@ -95,11 +95,11 @@ class TestDatasetFileSystemDataset < Test::Unit::TestCase
build_int32_array([2]),
build_int32_array([3]),
],
- label: [
- build_string_array(["a", "a"]),
- build_string_array(["b"]),
- build_string_array(["c"]),
- ])
+ label: [
+ build_string_array(["a", "a"]),
+ build_string_array(["b"]),
+ build_string_array(["c"]),
+ ])
return dataset, expected_table
end
diff --git a/c_glib/test/test-array.rb b/c_glib/test/test-array.rb
index aa129a474..681544920 100644
--- a/c_glib/test/test-array.rb
+++ b/c_glib/test/test-array.rb
@@ -119,7 +119,8 @@ class TestArray < Test::Unit::TestCase
sub_test_case("#view") do
def test_valid
assert_equal(build_float_array([0.0, 1.5, -2.5, nil]),
- build_int32_array([0, 1069547520, -1071644672, nil]).view(Arrow::FloatDataType.new))
+ build_int32_array([0, 1069547520, -1071644672,
+nil]).view(Arrow::FloatDataType.new))
end
def test_invalid
diff --git a/c_glib/test/test-chunked-array-datum.rb b/c_glib/test/test-chunked-array-datum.rb
index b82f3eed8..17a2cbd1a 100644
--- a/c_glib/test/test-chunked-array-datum.rb
+++ b/c_glib/test/test-chunked-array-datum.rb
@@ -49,7 +49,8 @@ class TestChunkedArrayDatum < Test::Unit::TestCase
end
def test_to_string
- assert_equal("ChunkedArray([\n" + " [\n" + " true,\n" + " false\n" + " ]\n" + "])", @datum.to_s)
+ assert_equal("ChunkedArray([\n" + " [\n" + " true,\n" + " false\n" + " ]\n" + "])",
+ @datum.to_s)
end
def test_value
diff --git a/c_glib/test/test-large-list-array.rb b/c_glib/test/test-large-list-array.rb
index 2f7efab5a..fa9c92ec8 100644
--- a/c_glib/test/test-large-list-array.rb
+++ b/c_glib/test/test-large-list-array.rb
@@ -88,10 +88,10 @@ class TestLargeListArray < Test::Unit::TestCase
def test_value_offsets
array = build_large_list_array(Arrow::Int8DataType.new,
- [
- [-29, 29],
- [-1, 0, 1],
- ])
+ [
+ [-29, 29],
+ [-1, 0, 1],
+ ])
assert_equal([0, 2, 5],
array.value_offsets)
end
diff --git a/c_glib/test/test-record-batch-datum.rb b/c_glib/test/test-record-batch-datum.rb
index ec572e0f1..e2d9c0258 100644
--- a/c_glib/test/test-record-batch-datum.rb
+++ b/c_glib/test/test-record-batch-datum.rb
@@ -49,7 +49,8 @@ class TestRecordBatchDatum < Test::Unit::TestCase
end
def test_to_string
- assert_equal("RecordBatch(visible: [\n" + " true,\n" + " false\n" + " ]\n" + ")", @datum.to_s)
+ assert_equal("RecordBatch(visible: [\n" + " true,\n" + " false\n" + " ]\n" + ")",
+ @datum.to_s)
end
def test_value
diff --git a/c_glib/test/test-uint-array-builder.rb b/c_glib/test/test-uint-array-builder.rb
index 89621189b..3aa3a1c48 100644
--- a/c_glib/test/test-uint-array-builder.rb
+++ b/c_glib/test/test-uint-array-builder.rb
@@ -32,9 +32,9 @@ class TestUIntArrayBuilder < Test::Unit::TestCase
values = [0, border_value]
assert_equal(build_uint_array([*values, nil]),
Arrow::UInt16Array.new(3,
- Arrow::Buffer.new(values.pack("S*")),
- Arrow::Buffer.new([0b011].pack("C*")),
- -1))
+ Arrow::Buffer.new(values.pack("S*")),
+ Arrow::Buffer.new([0b011].pack("C*")),
+ -1))
end
def test_uint32
@@ -42,9 +42,9 @@ class TestUIntArrayBuilder < Test::Unit::TestCase
values = [0, border_value]
assert_equal(build_uint_array([*values, nil]),
Arrow::UInt32Array.new(3,
- Arrow::Buffer.new(values.pack("L*")),
- Arrow::Buffer.new([0b011].pack("C*")),
- -1))
+ Arrow::Buffer.new(values.pack("L*")),
+ Arrow::Buffer.new([0b011].pack("C*")),
+ -1))
end
def test_uint64
diff --git a/ruby/red-arrow/test/test-table.rb b/ruby/red-arrow/test/test-table.rb
index a69e92615..2117e60df 100644
--- a/ruby/red-arrow/test/test-table.rb
+++ b/ruby/red-arrow/test/test-table.rb
@@ -1521,10 +1521,10 @@ visible: false
["key2_right", [100, 20]],
["string", ["1-100", "2-20"]],
]),
- table1.join(table2,
- ["key1", "key2"],
- left_suffix: "_left",
- right_suffix: "_right"))
+ table1.join(table2,
+ ["key1", "key2"],
+ left_suffix: "_left",
+ right_suffix: "_right"))
end
end
end

What changes are included in this PR?

Reformat Ruby codes.

Are these changes tested?

Yes.

Are there any user-facing changes?

No.

@github-actions

Copy link
Copy Markdown

⚠️ GitHub issue #45402has been automatically assigned in GitHub to PR creator.

@koukou changed the title GH-45402: [CI][DEV][Ruby] Reformat codes before apply lintGH-45402: [CI][Dev][Ruby] Reformat codes before apply lintFeb 1, 2025
Comment threadc_glib/test/test-array.rb Outdated
Comment threadc_glib/test/test-chunked-array-datum.rb Outdated
Comment threadc_glib/test/test-record-batch-datum.rb Outdated
Comment on lines +113 to +114
system ENV.cxx, "test.cpp", "-std=c++17", "-I#{include}", "-L#{lib}",
"-larrow", "-o", "test"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you exclude this from lint targets?
This is a vendored file. Upstream is https://github.com/Homebrew/homebrew-core/blob/master/Formula/a/apache-arrow.rb .

BTW, we should resync this and apache-arrow-glib.rb...

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reverted this change and add the exclude section in the .pre-commit-config.yaml
( A PR of .pre-commit-config.yaml will create later.)

exclude: >- ( ?^dev/tasks/homebrew-formulae/.*\.rb$| )

Note

  • I will check apache-arrow-glib.rb on anther PR.
  • Is this typo? dev/tasks/homebrew-formulae ( formulae -> formula)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this typo? dev/tasks/homebrew-formulae (formulae -> formula)

No. formulae is a plural form of formula. There are 2 files in dev/tasks/homebrew-formulae/. So we use a plural form.

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, the plural of formula is formulae. I didn't know that. Thanks!

Comment threadruby/red-arrow/test/each-raw-record/test-map-array.rb Outdated
@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting review Awaiting review labels Feb 1, 2025
@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Feb 1, 2025
Comment threadc_glib/test/test-chunked-array-datum.rb Outdated
Comment threadc_glib/test/test-record-batch-datum.rb Outdated
@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Feb 1, 2025
Comment threadc_glib/test/test-record-batch.rb Outdated
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Feb 2, 2025
Comment threadc_glib/test/test-record-batch.rb Outdated
@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Feb 2, 2025
@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Feb 2, 2025
Comment threadruby/red-arrow/test/values/test-map-array.rb Outdated
Comment threadruby/red-arrow/test/values/test-map-array.rb Outdated
@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Feb 3, 2025
hiroyuki-satoand others added 2 commits February 3, 2025 10:43
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Feb 3, 2025
kou
kou approved these changes Feb 3, 2025

@koukou left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@github-actionsgithub-actionsBot added awaiting merge Awaiting merge and removed awaiting change review Awaiting change review labels Feb 3, 2025
@kou
kou merged commit ddc4bde into apache:mainFeb 3, 2025
@koukou removed the awaiting merge Awaiting merge label Feb 3, 2025
@hiroyuki-sato
hiroyuki-sato deleted the topic/reformat-ruby-code branch February 3, 2025 02:53
@conbench-apache-arrow

Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 4 benchmarking runs that have been run so far on merge-commit ddc4bde.

There were 8 benchmark results with an error:

There were no benchmark performance regressions. 🎉

The full Conbench report has more details. It also includes information about 1 possible false positive for unstable benchmarks that are known to sometimes produce them.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@hiroyuki-sato@kou