ARROW-14072: [GLib][Parquet] Add gparquet_arrow_file_reader_get_n_rows()

Version macros are removed. We reuse Apache Arrow GLib's version macros for Apache Parquet GLib. Closes apache#11215 from kou/glib-parquet-reader-n-rows Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
ClibMouse · Sep 24, 2021 · 6a0513b · 6a0513b
1 parent 13c2782
commit 6a0513b
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 262 deletions.
diff --git a/c_glib/doc/parquet-glib/meson.build b/c_glib/doc/parquet-glib/meson.build
@@ -66,7 +66,7 @@ gnome.gtkdoc(package_id,
              gobject_typesfile: package_id + '.types',
              scan_args: [
                '--rebuild-types',
-               '--deprecated-guards=GPARQUET_DISABLE_DEPRECATED',
+               '--deprecated-guards=GARROW_DISABLE_DEPRECATED',
              ],
              mkdb_args: [
                '--output-format=xml',

diff --git a/c_glib/doc/parquet-glib/parquet-glib-docs.xml b/c_glib/doc/parquet-glib/parquet-glib-docs.xml
@@ -45,14 +45,6 @@
     </chapter>
   </part>
 
-  <part id="misc">
-    <title>Misc</title>
-    <chapter id="version">
-      <title>Version</title>
-      <xi:include href="xml/version.xml"></xi:include>
-    </chapter>
-  </part>
-
   <chapter id="object-tree">
     <title>Object Hierarchy</title>
     <xi:include href="xml/tree_index.sgml"/>
@@ -65,6 +57,10 @@
     <title>Index of deprecated API</title>
     <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-6-0-0" role="6.0.0">
+    <title>Index of new symbols in 6.0.0</title>
+    <xi:include href="xml/api-index-6.0.0.xml"><xi:fallback /></xi:include>
+  </index>
   <index id="api-index-1-0-0" role="1.0.0">
     <title>Index of new symbols in 1.0.0</title>
     <xi:include href="xml/api-index-1.0.0.xml"><xi:fallback /></xi:include>
@@ -73,10 +69,6 @@
     <title>Index of new symbols in 0.17.0</title>
     <xi:include href="xml/api-index-0.17.0.xml"><xi:fallback /></xi:include>
   </index>
-  <index id="api-index-0-16-0" role="0.16.0">
-    <title>Index of new symbols in 0.16.0</title>
-    <xi:include href="xml/api-index-0.16.0.xml"><xi:fallback /></xi:include>
-  </index>
   <index id="api-index-0-15-0" role="0.15.0">
     <title>Index of new symbols in 0.15.0</title>
     <xi:include href="xml/api-index-0.15.0.xml"><xi:fallback /></xi:include>

diff --git a/c_glib/parquet-glib/arrow-file-reader.cpp b/c_glib/parquet-glib/arrow-file-reader.cpp
@@ -351,6 +351,21 @@ gparquet_arrow_file_reader_get_n_row_groups(GParquetArrowFileReader *reader)
   return parquet_arrow_file_reader->num_row_groups();
 }
 
+/**
+ * gparquet_arrow_file_reader_get_n_rows:
+ * @reader: A #GParquetArrowFileReader.
+ *
+ * Returns: The number of rows.
+ *
+ * Since: 6.0.0
+ */
+gint64
+gparquet_arrow_file_reader_get_n_rows(GParquetArrowFileReader *reader)
+{
+  auto parquet_arrow_file_reader = gparquet_arrow_file_reader_get_raw(reader);
+  return parquet_arrow_file_reader->parquet_reader()->metadata()->num_rows();
+}
+
 /**
  * gparquet_arrow_file_reader_use_threads:
  * @reader: A #GParquetArrowFileReader.

diff --git a/c_glib/parquet-glib/arrow-file-reader.h b/c_glib/parquet-glib/arrow-file-reader.h
@@ -21,8 +21,6 @@
 
 #include <arrow-glib/arrow-glib.h>
 
-#include <parquet-glib/version.h>
-
 G_BEGIN_DECLS
 
 #define GPARQUET_TYPE_ARROW_FILE_READER (gparquet_arrow_file_reader_get_type())
@@ -47,7 +45,7 @@ GArrowTable *
 gparquet_arrow_file_reader_read_table(GParquetArrowFileReader *reader,
                                       GError **error);
 
-GPARQUET_AVAILABLE_IN_1_0
+GARROW_AVAILABLE_IN_1_0
 GArrowTable *
 gparquet_arrow_file_reader_read_row_group(GParquetArrowFileReader *reader,
                                           gint row_group_index,
@@ -67,6 +65,10 @@ gparquet_arrow_file_reader_read_column_data(GParquetArrowFileReader *reader,
 gint
 gparquet_arrow_file_reader_get_n_row_groups(GParquetArrowFileReader *reader);
 
+GARROW_AVAILABLE_IN_6_0
+gint64
+gparquet_arrow_file_reader_get_n_rows(GParquetArrowFileReader *reader);
+
 void
 gparquet_arrow_file_reader_set_use_threads(GParquetArrowFileReader *reader,
                                            gboolean use_threads);

diff --git a/c_glib/parquet-glib/arrow-file-writer.h b/c_glib/parquet-glib/arrow-file-writer.h
@@ -21,8 +21,6 @@
 
 #include <arrow-glib/arrow-glib.h>
 
-#include <parquet-glib/version.h>
-
 G_BEGIN_DECLS
 
 #define GPARQUET_TYPE_WRITER_PROPERTIES         \
@@ -37,55 +35,55 @@ struct _GParquetWriterPropertiesClass
   GObjectClass parent_class;
 };
 
-GPARQUET_AVAILABLE_IN_0_17
+GARROW_AVAILABLE_IN_0_17
 GParquetWriterProperties *gparquet_writer_properties_new(void);
-GPARQUET_AVAILABLE_IN_0_17
+GARROW_AVAILABLE_IN_0_17
 void
 gparquet_writer_properties_set_compression(GParquetWriterProperties *properties,
                                            GArrowCompressionType compression_type,
                                            const gchar *path);
-GPARQUET_AVAILABLE_IN_0_17
+GARROW_AVAILABLE_IN_0_17
 GArrowCompressionType
 gparquet_writer_properties_get_compression_path(GParquetWriterProperties *properties,
                                                 const gchar *path);
-GPARQUET_AVAILABLE_IN_0_17
+GARROW_AVAILABLE_IN_0_17
 void
 gparquet_writer_properties_enable_dictionary(GParquetWriterProperties *properties,
                                              const gchar *path);
-GPARQUET_AVAILABLE_IN_0_17
+GARROW_AVAILABLE_IN_0_17
 void
 gparquet_writer_properties_disable_dictionary(GParquetWriterProperties *properties,
                                               const gchar *path);
-GPARQUET_AVAILABLE_IN_0_17
+GARROW_AVAILABLE_IN_0_17
 gboolean
 gparquet_writer_properties_is_dictionary_enabled(GParquetWriterProperties *properties,
                                                  const gchar *path);
-GPARQUET_AVAILABLE_IN_0_17
+GARROW_AVAILABLE_IN_0_17
 void
 gparquet_writer_properties_set_dictionary_page_size_limit(GParquetWriterProperties *properties,
                                                           gint64 limit);
-GPARQUET_AVAILABLE_IN_0_17
+GARROW_AVAILABLE_IN_0_17
 gint64
 gparquet_writer_properties_get_dictionary_page_size_limit(GParquetWriterProperties *properties);
-GPARQUET_AVAILABLE_IN_0_17
+GARROW_AVAILABLE_IN_0_17
 void
 gparquet_writer_properties_set_batch_size(GParquetWriterProperties *properties,
                                           gint64 batch_size);
-GPARQUET_AVAILABLE_IN_0_17
+GARROW_AVAILABLE_IN_0_17
 gint64
 gparquet_writer_properties_get_batch_size(GParquetWriterProperties *properties);
-GPARQUET_AVAILABLE_IN_0_17
+GARROW_AVAILABLE_IN_0_17
 void
 gparquet_writer_properties_set_max_row_group_length(GParquetWriterProperties *properties,
                                                     gint64 length);
-GPARQUET_AVAILABLE_IN_0_17
+GARROW_AVAILABLE_IN_0_17
 gint64
 gparquet_writer_properties_get_max_row_group_length(GParquetWriterProperties *properties);
-GPARQUET_AVAILABLE_IN_0_17
+GARROW_AVAILABLE_IN_0_17
 void
 gparquet_writer_properties_set_data_page_size(GParquetWriterProperties *properties,
                                               gint64 data_page_size);
-GPARQUET_AVAILABLE_IN_0_17
+GARROW_AVAILABLE_IN_0_17
 gint64
 gparquet_writer_properties_get_data_page_size(GParquetWriterProperties *properties);
 

diff --git a/c_glib/parquet-glib/meson.build b/c_glib/parquet-glib/meson.build
@@ -36,16 +36,6 @@ cpp_headers = files(
   'parquet-glib.hpp',
 )
 
-version_h_conf = configuration_data()
-version_h_conf.set('GPARQUET_VERSION_MAJOR', version_major)
-version_h_conf.set('GPARQUET_VERSION_MINOR', version_minor)
-version_h_conf.set('GPARQUET_VERSION_MICRO', version_micro)
-version_h_conf.set('GPARQUET_VERSION_TAG', version_tag)
-version_h = configure_file(input: 'version.h.in',
-                           output: 'version.h',
-                           configuration: version_h_conf)
-c_headers += version_h
-
 headers = c_headers + cpp_headers
 install_headers(headers, subdir: project_name)
 

diff --git a/c_glib/parquet-glib/parquet-glib.h b/c_glib/parquet-glib/parquet-glib.h
@@ -19,7 +19,5 @@
 
 #pragma once
 
-#include <parquet-glib/version.h>
-
 #include <parquet-glib/arrow-file-reader.h>
 #include <parquet-glib/arrow-file-writer.h>