You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ks...@apache.org on 2019/02/21 10:08:51 UTC
[arrow] branch master updated: ARROW-3981: [C++] Rename json.h
This is an automated email from the ASF dual-hosted git repository.
kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new a977250 ARROW-3981: [C++] Rename json.h
a977250 is described below
commit a977250fbd542ddddb9d4d5b3b1956721a0c09c4
Author: Antoine Pitrou <an...@python.org>
AuthorDate: Thu Feb 21 11:08:22 2019 +0100
ARROW-3981: [C++] Rename json.h
As it's only meant for integration testing, rename it to json-integration.h.
Author: Antoine Pitrou <an...@python.org>
Closes #3716 from pitrou/ARROW-3981-rename-json-h and squashes the following commits:
1ea70bf5 <Antoine Pitrou> ARROW-3981: Rename json.h
---
cpp/src/arrow/CMakeLists.txt | 2 +-
cpp/src/arrow/flight/test-integration-client.cc | 2 +-
cpp/src/arrow/flight/test-integration-server.cc | 2 +-
cpp/src/arrow/ipc/api.h | 2 +-
cpp/src/arrow/ipc/json-integration-test.cc | 2 +-
cpp/src/arrow/ipc/{json.cc => json-integration.cc} | 2 +-
cpp/src/arrow/ipc/{json.h => json-integration.h} | 5 +----
cpp/src/arrow/ipc/json-test.cc | 2 +-
8 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
index 39c342b..24777c3 100644
--- a/cpp/src/arrow/CMakeLists.txt
+++ b/cpp/src/arrow/CMakeLists.txt
@@ -209,7 +209,7 @@ if(ARROW_IPC)
set(ARROW_IPC_SRCS
ipc/dictionary.cc
ipc/feather.cc
- ipc/json.cc
+ ipc/json-integration.cc
ipc/json-internal.cc
ipc/json-simple.cc
ipc/message.cc
diff --git a/cpp/src/arrow/flight/test-integration-client.cc b/cpp/src/arrow/flight/test-integration-client.cc
index 89ae88c..b3fbb1b 100644
--- a/cpp/src/arrow/flight/test-integration-client.cc
+++ b/cpp/src/arrow/flight/test-integration-client.cc
@@ -28,7 +28,7 @@
#include <gflags/gflags.h>
#include "arrow/io/test-common.h"
-#include "arrow/ipc/json.h"
+#include "arrow/ipc/json-integration.h"
#include "arrow/ipc/writer.h"
#include "arrow/record_batch.h"
#include "arrow/table.h"
diff --git a/cpp/src/arrow/flight/test-integration-server.cc b/cpp/src/arrow/flight/test-integration-server.cc
index 0381e90..77f57e9 100644
--- a/cpp/src/arrow/flight/test-integration-server.cc
+++ b/cpp/src/arrow/flight/test-integration-server.cc
@@ -25,7 +25,7 @@
#include <gflags/gflags.h>
#include "arrow/io/test-common.h"
-#include "arrow/ipc/json.h"
+#include "arrow/ipc/json-integration.h"
#include "arrow/record_batch.h"
#include "arrow/table.h"
#include "arrow/util/logging.h"
diff --git a/cpp/src/arrow/ipc/api.h b/cpp/src/arrow/ipc/api.h
index 5cc6407..1895c31 100644
--- a/cpp/src/arrow/ipc/api.h
+++ b/cpp/src/arrow/ipc/api.h
@@ -20,7 +20,7 @@
#include "arrow/ipc/dictionary.h"
#include "arrow/ipc/feather.h"
-#include "arrow/ipc/json.h"
+#include "arrow/ipc/json-simple.h"
#include "arrow/ipc/message.h"
#include "arrow/ipc/reader.h"
#include "arrow/ipc/writer.h"
diff --git a/cpp/src/arrow/ipc/json-integration-test.cc b/cpp/src/arrow/ipc/json-integration-test.cc
index e3c27fa..a735b6c 100644
--- a/cpp/src/arrow/ipc/json-integration-test.cc
+++ b/cpp/src/arrow/ipc/json-integration-test.cc
@@ -30,7 +30,7 @@
#include <boost/filesystem.hpp> // NOLINT
#include "arrow/io/file.h"
-#include "arrow/ipc/json.h"
+#include "arrow/ipc/json-integration.h"
#include "arrow/ipc/reader.h"
#include "arrow/ipc/writer.h"
#include "arrow/pretty_print.h"
diff --git a/cpp/src/arrow/ipc/json.cc b/cpp/src/arrow/ipc/json-integration.cc
similarity index 99%
rename from cpp/src/arrow/ipc/json.cc
rename to cpp/src/arrow/ipc/json-integration.cc
index 56fe31c..839890c 100644
--- a/cpp/src/arrow/ipc/json.cc
+++ b/cpp/src/arrow/ipc/json-integration.cc
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-#include "arrow/ipc/json.h"
+#include "arrow/ipc/json-integration.h"
#include <cstddef>
#include <memory>
diff --git a/cpp/src/arrow/ipc/json.h b/cpp/src/arrow/ipc/json-integration.h
similarity index 98%
rename from cpp/src/arrow/ipc/json.h
rename to cpp/src/arrow/ipc/json-integration.h
index aeed707..0256532 100644
--- a/cpp/src/arrow/ipc/json.h
+++ b/cpp/src/arrow/ipc/json-integration.h
@@ -17,8 +17,7 @@
// Implement Arrow JSON serialization format
-#ifndef ARROW_IPC_JSON_H
-#define ARROW_IPC_JSON_H
+#pragma once
#include <memory>
#include <string>
@@ -132,5 +131,3 @@ class ARROW_EXPORT JsonReader {
} // namespace internal
} // namespace ipc
} // namespace arrow
-
-#endif // ARROW_IPC_JSON_H
diff --git a/cpp/src/arrow/ipc/json-test.cc b/cpp/src/arrow/ipc/json-test.cc
index e13c39c..72504d4 100644
--- a/cpp/src/arrow/ipc/json-test.cc
+++ b/cpp/src/arrow/ipc/json-test.cc
@@ -27,8 +27,8 @@
#include "arrow/array.h"
#include "arrow/buffer.h"
#include "arrow/builder.h"
+#include "arrow/ipc/json-integration.h"
#include "arrow/ipc/json-internal.h"
-#include "arrow/ipc/json.h"
#include "arrow/ipc/test-common.h"
#include "arrow/memory_pool.h"
#include "arrow/record_batch.h"