arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject arrow git commit: ARROW-1460: [C++] Pin clang-format at LLVM 4.0
Date Mon, 04 Sep 2017 19:39:37 GMT
Repository: arrow
Updated Branches:
  refs/heads/master f391950b8 -> 0e0da74c5


ARROW-1460: [C++] Pin clang-format at LLVM 4.0

Author: Wes McKinney <wes.mckinney@twosigma.com>

Closes #1037 from wesm/ARROW-1460 and squashes the following commits:

2cfc3532 [Wes McKinney] Use clang-format-4.0


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/0e0da74c
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/0e0da74c
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/0e0da74c

Branch: refs/heads/master
Commit: 0e0da74c540bdd24ba9021ce66ea2d236ed3b1c9
Parents: f391950
Author: Wes McKinney <wes.mckinney@twosigma.com>
Authored: Mon Sep 4 15:39:32 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Mon Sep 4 15:39:32 2017 -0400

----------------------------------------------------------------------
 cpp/CMakeLists.txt                      |  2 +-
 cpp/src/arrow/ipc/ipc-json-test.cc      | 19 ++++++++++++++-----
 cpp/src/arrow/python/arrow_to_python.cc |  6 +++---
 cpp/src/arrow/python/python_to_arrow.cc |  4 ++--
 cpp/src/arrow/util/logging.h            |  3 +--
 cpp/src/plasma/protocol.cc              |  4 ++--
 6 files changed, 23 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/0e0da74c/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 12a5803..f25cc62 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -551,7 +551,7 @@ endif (UNIX)
 # "make format" and "make check-format" targets
 ############################################################
 
-set(CLANG_FORMAT_VERSION 3.9)
+set(CLANG_FORMAT_VERSION 4.0)
 
 # runs clang format and updates files in place.
 add_custom_target(format ${BUILD_SUPPORT_DIR}/run_clang_format.py

http://git-wip-us.apache.org/repos/asf/arrow/blob/0e0da74c/cpp/src/arrow/ipc/ipc-json-test.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/ipc/ipc-json-test.cc b/cpp/src/arrow/ipc/ipc-json-test.cc
index ddb2e37..1967e24 100644
--- a/cpp/src/arrow/ipc/ipc-json-test.cc
+++ b/cpp/src/arrow/ipc/ipc-json-test.cc
@@ -112,13 +112,22 @@ TEST(TestJsonSchemaWriter, FlatTypes) {
   // TODO
   // field("f14", date32())
   std::vector<std::shared_ptr<Field>> fields = {
-      field("f0", int8()), field("f1", int16(), false), field("f2", int32()),
-      field("f3", int64(), false), field("f4", uint8()), field("f5", uint16()),
-      field("f6", uint32()), field("f7", uint64()), field("f8", float32()),
-      field("f9", float64()), field("f10", utf8()), field("f11", binary()),
+      field("f0", int8()),
+      field("f1", int16(), false),
+      field("f2", int32()),
+      field("f3", int64(), false),
+      field("f4", uint8()),
+      field("f5", uint16()),
+      field("f6", uint32()),
+      field("f7", uint64()),
+      field("f8", float32()),
+      field("f9", float64()),
+      field("f10", utf8()),
+      field("f11", binary()),
       field("f12", list(int32())),
       field("f13", struct_({field("s1", int32()), field("s2", utf8())})),
-      field("f15", date64()), field("f16", timestamp(TimeUnit::NANO)),
+      field("f15", date64()),
+      field("f16", timestamp(TimeUnit::NANO)),
       field("f17", time64(TimeUnit::MICRO)),
       field("f18", union_({field("u1", int8()), field("u2", time32(TimeUnit::MILLI))},
                           {0, 1}, UnionMode::DENSE))};

http://git-wip-us.apache.org/repos/asf/arrow/blob/0e0da74c/cpp/src/arrow/python/arrow_to_python.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/python/arrow_to_python.cc b/cpp/src/arrow/python/arrow_to_python.cc
index 3ff1f11..b127971 100644
--- a/cpp/src/arrow/python/arrow_to_python.cc
+++ b/cpp/src/arrow/python/arrow_to_python.cc
@@ -171,20 +171,20 @@ Status GetValue(PyObject* context, std::shared_ptr<Array> arr,
int64_t index,
     }                                                                             \
   }                                                                               \
   *out = result.release();                                                        \
-  return Status::OK();
+  return Status::OK()
 
 Status DeserializeList(PyObject* context, std::shared_ptr<Array> array, int64_t start_idx,
                        int64_t stop_idx, PyObject* base,
                        const std::vector<std::shared_ptr<Tensor>>& tensors,
                        PyObject** out) {
-  DESERIALIZE_SEQUENCE(PyList_New, PyList_SET_ITEM)
+  DESERIALIZE_SEQUENCE(PyList_New, PyList_SET_ITEM);
 }
 
 Status DeserializeTuple(PyObject* context, std::shared_ptr<Array> array,
                         int64_t start_idx, int64_t stop_idx, PyObject* base,
                         const std::vector<std::shared_ptr<Tensor>>& tensors,
                         PyObject** out) {
-  DESERIALIZE_SEQUENCE(PyTuple_New, PyTuple_SET_ITEM)
+  DESERIALIZE_SEQUENCE(PyTuple_New, PyTuple_SET_ITEM);
 }
 
 Status ReadSerializedObject(io::RandomAccessFile* src, SerializedPyObject* out) {

http://git-wip-us.apache.org/repos/asf/arrow/blob/0e0da74c/cpp/src/arrow/python/python_to_arrow.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/python/python_to_arrow.cc b/cpp/src/arrow/python/python_to_arrow.cc
index d823bad..65e5f6a 100644
--- a/cpp/src/arrow/python/python_to_arrow.cc
+++ b/cpp/src/arrow/python/python_to_arrow.cc
@@ -522,7 +522,7 @@ Status SerializeSequences(PyObject* context, std::vector<PyObject*>
sequences,
         "recursively.");
   }
   SequenceBuilder builder(nullptr);
-  std::vector<PyObject *> sublists, subtuples, subdicts;
+  std::vector<PyObject*> sublists, subtuples, subdicts;
   for (const auto& sequence : sequences) {
     ScopedRef iterator(PyObject_GetIter(sequence));
     RETURN_IF_PYERROR();
@@ -559,7 +559,7 @@ Status SerializeDict(PyObject* context, std::vector<PyObject*> dicts,
         "This object exceeds the maximum recursion depth. It may contain itself "
         "recursively.");
   }
-  std::vector<PyObject *> key_tuples, key_dicts, val_lists, val_tuples, val_dicts,
dummy;
+  std::vector<PyObject*> key_tuples, key_dicts, val_lists, val_tuples, val_dicts, dummy;
   for (const auto& dict : dicts) {
     PyObject *key, *value;
     Py_ssize_t pos = 0;

http://git-wip-us.apache.org/repos/asf/arrow/blob/0e0da74c/cpp/src/arrow/util/logging.h
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/util/logging.h b/cpp/src/arrow/util/logging.h
index 998f7ed..b7e2cee 100644
--- a/cpp/src/arrow/util/logging.h
+++ b/cpp/src/arrow/util/logging.h
@@ -98,8 +98,7 @@ class NullLog {
 class CerrLog {
  public:
   CerrLog(int severity)  // NOLINT(runtime/explicit)
-      : severity_(severity),
-        has_logged_(false) {}
+      : severity_(severity), has_logged_(false) {}
 
   virtual ~CerrLog() {
     if (has_logged_) {

http://git-wip-us.apache.org/repos/asf/arrow/blob/0e0da74c/cpp/src/plasma/protocol.cc
----------------------------------------------------------------------
diff --git a/cpp/src/plasma/protocol.cc b/cpp/src/plasma/protocol.cc
index 77bc8b7..305e3d5 100644
--- a/cpp/src/plasma/protocol.cc
+++ b/cpp/src/plasma/protocol.cc
@@ -40,8 +40,8 @@ to_flatbuffer(flatbuffers::FlatBufferBuilder* fbb, const ObjectID* object_ids,
 Status PlasmaReceive(int sock, int64_t message_type, std::vector<uint8_t>* buffer)
{
   int64_t type;
   RETURN_NOT_OK(ReadMessage(sock, &type, buffer));
-  ARROW_CHECK(type == message_type) << "type = " << type
-                                    << ", message_type = " << message_type;
+  ARROW_CHECK(type == message_type)
+      << "type = " << type << ", message_type = " << message_type;
   return Status::OK();
 }
 


Mime
View raw message