Also run cpplint and clang-format on .cpp files

wesm · romainfrancois · commit db15104480ed · 2019-03-07T16:41:38.000+01:00
diff --git a/cpp/build-support/lintutils.py b/cpp/build-support/lintutils.py
@@ -66,13 +66,15 @@ def run_parallel(cmds, **kwargs):
 _source_extensions = '''
 .h
 .cc
+.cpp
 '''.split()
 
 
 def get_sources(source_dir, exclude_globs=[]):
     sources = []
     for directory, subdirs, basenames in os.walk(source_dir):
-        for path in [os.path.join(directory, basename) for basename in basenames]:
+        for path in [os.path.join(directory, basename)
+                     for basename in basenames]:
             # filter out non-source files
             if os.path.splitext(path)[1] not in _source_extensions:
                 continue
diff --git a/cpp/build-support/run_cpplint.py b/cpp/build-support/run_cpplint.py
@@ -110,8 +110,6 @@ def _check_some_files(completed_processes, filenames):
         # distill a list of problematic files
         for problem_files, stdout in pool.imap(checker, chunks):
             if problem_files:
-                msg = "{} had cpplint issues"
-                print("\n".join(map(msg.format, problem_files)))
                 if isinstance(stdout, bytes):
                     stdout = stdout.decode('utf8')
                 print(stdout, file=sys.stderr)
diff --git a/r/clang_format.sh b/r/clang_format.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+CPP_BUILD_SUPPORT=$SOURCE_DIR/../cpp/build-support
+
+# Run clang-format
+CLANG_FORMAT=clang-format-7
+$CPP_BUILD_SUPPORT/run_clang_format.py \
+    --clang_format_binary=$CLANG_FORMAT \
+    --exclude_glob=$CPP_BUILD_SUPPORT/lint_exclusions.txt \
+    --source_dir=$SOURCE_DIR/src --quiet --fix $1
diff --git a/r/src/array__to_vector.cpp b/r/src/array__to_vector.cpp
@@ -468,8 +468,7 @@ class Converter_Decimal : public Converter {
         *p_data = bitmap_reader.IsSet() ? std::stod(decimals_arr.FormatValue(i).c_str())
                                         : NA_REAL;
       }
-    }
-    else {
+    } else {
       for (size_t i = 0; i < n; i++, ++p_data) {
         *p_data = std::stod(decimals_arr.FormatValue(i).c_str());
       }
diff --git a/r/src/array_from_vector.cpp b/r/src/array_from_vector.cpp

Original file line number	Diff line number	Diff line change
`@@ -468,8 +468,7 @@ class Converter_Decimal : public Converter {`
`468`	`468`	`*p_data = bitmap_reader.IsSet() ? std::stod(decimals_arr.FormatValue(i).c_str())`
`469`	`469`	`: NA_REAL;`
`470`	`470`	`}`
`471`		`- }`
`472`		`- else {`
	`471`	`+ } else {`
`473`	`472`	`for (size_t i = 0; i < n; i++, ++p_data) {`
`474`	`473`	`*p_data = std::stod(decimals_arr.FormatValue(i).c_str());`
`475`	`474`	`}`