PARQUET-643: Add const modifier to schema pointer reference

Author: Uwe L. Korn <uwelk@xhochy.com> Closes apache#128 from xhochy/parquet-643 and squashes the following commits: 6f18fca [Uwe L. Korn] PARQUET-643: Add const modifier to schema pointer reference in ParquetFileWriter Change-Id: I1e019444d6154785e062c195d9160e4dd8799a5a
wesm · Jun 27, 2016 · 8e98b5c · 8e98b5c
1 parent a8ad3a4
commit 8e98b5c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/cpp/src/parquet/file/writer-internal.cc b/cpp/src/parquet/file/writer-internal.cc
@@ -169,7 +169,7 @@ void RowGroupSerializer::Close() {
 // FileSerializer
 
 std::unique_ptr<ParquetFileWriter::Contents> FileSerializer::Open(
-    std::shared_ptr<OutputStream> sink, std::shared_ptr<GroupNode>& schema,
+    std::shared_ptr<OutputStream> sink, const std::shared_ptr<GroupNode>& schema,
     const std::shared_ptr<WriterProperties>& properties) {
   std::unique_ptr<ParquetFileWriter::Contents> result(
       new FileSerializer(sink, schema, properties));
@@ -249,7 +249,7 @@ void FileSerializer::WriteMetaData() {
 }
 
 FileSerializer::FileSerializer(std::shared_ptr<OutputStream> sink,
-    std::shared_ptr<GroupNode>& schema,
+    const std::shared_ptr<GroupNode>& schema,
     const std::shared_ptr<WriterProperties>& properties)
     : sink_(sink),
       allocator_(properties->allocator()),

diff --git a/cpp/src/parquet/file/writer-internal.h b/cpp/src/parquet/file/writer-internal.h
@@ -111,7 +111,8 @@ class RowGroupSerializer : public RowGroupWriter::Contents {
 class FileSerializer : public ParquetFileWriter::Contents {
  public:
   static std::unique_ptr<ParquetFileWriter::Contents> Open(
-      std::shared_ptr<OutputStream> sink, std::shared_ptr<schema::GroupNode>& schema,
+      std::shared_ptr<OutputStream> sink,
+      const std::shared_ptr<schema::GroupNode>& schema,
       const std::shared_ptr<WriterProperties>& properties = default_writer_properties());
 
   void Close() override;
@@ -128,7 +129,7 @@ class FileSerializer : public ParquetFileWriter::Contents {
 
  private:
   explicit FileSerializer(std::shared_ptr<OutputStream> sink,
-      std::shared_ptr<schema::GroupNode>& schema,
+      const std::shared_ptr<schema::GroupNode>& schema,
       const std::shared_ptr<WriterProperties>& properties);
 
   std::shared_ptr<OutputStream> sink_;

diff --git a/cpp/src/parquet/file/writer.cc b/cpp/src/parquet/file/writer.cc
@@ -54,7 +54,7 @@ ParquetFileWriter::~ParquetFileWriter() {
 }
 
 std::unique_ptr<ParquetFileWriter> ParquetFileWriter::Open(
-    std::shared_ptr<OutputStream> sink, std::shared_ptr<GroupNode>& schema,
+    std::shared_ptr<OutputStream> sink, const std::shared_ptr<GroupNode>& schema,
     const std::shared_ptr<WriterProperties>& properties) {
   auto contents = FileSerializer::Open(sink, schema, properties);
 

diff --git a/cpp/src/parquet/file/writer.h b/cpp/src/parquet/file/writer.h
@@ -105,7 +105,7 @@ class ParquetFileWriter {
   ~ParquetFileWriter();
 
   static std::unique_ptr<ParquetFileWriter> Open(std::shared_ptr<OutputStream> sink,
-      std::shared_ptr<schema::GroupNode>& schema,
+      const std::shared_ptr<schema::GroupNode>& schema,
       const std::shared_ptr<WriterProperties>& properties = default_writer_properties());
 
   void Open(std::unique_ptr<Contents> contents);