ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation#4971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wesm wants to merge 2 commits into from
Closed

ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation #4971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2c117a
Factor out list nesting into helper function
wesm Jul 29, 2019
e1f19c0
Code review feedback
wesm Aug 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 1 addition & 44 deletions c_glib/parquet-glib/arrow-file-reader.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -231,15 +231,8 @@ gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
{
auto parquet_arrow_file_reader = gparquet_arrow_file_reader_get_raw(reader);

const auto n_columns =
parquet_arrow_file_reader->parquet_reader()->metadata()->num_columns();
std::vector<int> indices(n_columns);
for (int i = 0; i < n_columns; ++i) {
indices[i] = i;
}

std::shared_ptr<arrow::Schema> arrow_schema;
auto status = parquet_arrow_file_reader->GetSchema(indices, &arrow_schema);
auto status = parquet_arrow_file_reader->GetSchema(&arrow_schema);
if (garrow_error_check(error,
status,
"[parquet][arrow][file-reader][get-schema]")) {
Expand All@@ -249,42 +242,6 @@ gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
}
}

/**
* gparquet_arrow_file_reader_select_schema:
* @reader: A #GParquetArrowFileReader.
* @column_indexes: (array length=n_column_indexes):
* The array of column indexes to be selected.
* @n_column_indexes: The length of `column_indexes`.
* @error: (nullable): Return locatipcn for a #GError or %NULL.
*
* Returns: (transfer full) (nullable): A selected #GArrowSchema.
*
* Since: 0.12.0
*/
GArrowSchema *
gparquet_arrow_file_reader_select_schema(GParquetArrowFileReader *reader,
gint *column_indexes,
gsize n_column_indexes,
GError **error)
{
auto parquet_arrow_file_reader = gparquet_arrow_file_reader_get_raw(reader);

std::vector<int> indices(n_column_indexes);
for (gsize i = 0; i < n_column_indexes; ++i) {
indices[i] = column_indexes[i];
}

std::shared_ptr<arrow::Schema> arrow_schema;
auto status = parquet_arrow_file_reader->GetSchema(indices, &arrow_schema);
if (garrow_error_check(error,
status,
"[parquet][arrow][file-reader][select-schema]")) {
return garrow_schema_new_raw(&arrow_schema);
} else {
return NULL;
}
}

/**
* gparquet_arrow_file_reader_read_column_data:
* @reader: A #GParquetArrowFileReader.
Expand Down
5 changes: 0 additions & 5 deletions c_glib/parquet-glib/arrow-file-reader.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,6 @@ gparquet_arrow_file_reader_read_table(GParquetArrowFileReader *reader,
GArrowSchema *
gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
GError **error);
GArrowSchema *
gparquet_arrow_file_reader_select_schema(GParquetArrowFileReader *reader,
gint *column_indexes,
gsize n_column_indexes,
GError **error);

GARROW_AVAILABLE_IN_1_0
GArrowChunkedArray *
Expand Down
13 changes: 0 additions & 13 deletions c_glib/test/parquet/test-arrow-file-reader.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,19 +39,6 @@ def test_schema
SCHEMA
end

def test_select_schema
assert_equal(<<-SCHEMA.chomp, @reader.select_schema([0]).to_s)
a: string
SCHEMA
assert_equal(<<-SCHEMA.chomp, @reader.select_schema([1]).to_s)
b: int32
SCHEMA
assert_equal(<<-SCHEMA.chomp, @reader.select_schema([0, 1]).to_s)
a: string
b: int32
SCHEMA
end

def test_read_column
assert_equal([
Arrow::ChunkedArray.new([@a_array]),
Expand Down
52 changes: 34 additions & 18 deletions cpp/src/parquet/arrow/arrow-reader-writer-test.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@
#include "parquet/api/writer.h"

#include "parquet/arrow/reader.h"
#include "parquet/arrow/reader_internal.h"
#include "parquet/arrow/schema.h"
#include "parquet/arrow/test-util.h"
#include "parquet/arrow/writer.h"
Expand DownExpand Up@@ -597,12 +598,16 @@ class TestParquetIO : public ::testing::Test {
std::shared_ptr<::arrow::Schema> arrow_schema;
ArrowReaderProperties props;
ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
FileWriter writer(::arrow::default_memory_pool(), MakeWriter(schema), arrow_schema);
ASSERT_OK_NO_THROW(writer.NewRowGroup(values->length()));
ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*values));
ASSERT_OK_NO_THROW(writer.Close());
// writer.Close() should be idempotent
ASSERT_OK_NO_THROW(writer.Close());

std::unique_ptr<FileWriter> writer;
ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
MakeWriter(schema), arrow_schema,
default_arrow_writer_properties(), &writer));
ASSERT_OK_NO_THROW(writer->NewRowGroup(values->length()));
ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*values));
ASSERT_OK_NO_THROW(writer->Close());
// writer->Close() should be idempotent
ASSERT_OK_NO_THROW(writer->Close());
}

void ResetSink() { sink_ = CreateOutputStream(); }
Expand DownExpand Up@@ -789,13 +794,17 @@ TYPED_TEST(TestParquetIO, SingleColumnRequiredChunkedWrite) {
std::shared_ptr<::arrow::Schema> arrow_schema;
ArrowReaderProperties props;
ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
FileWriter writer(default_memory_pool(), this->MakeWriter(schema), arrow_schema);

std::unique_ptr<FileWriter> writer;
ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
this->MakeWriter(schema), arrow_schema,
default_arrow_writer_properties(), &writer));
for (int i = 0; i < 4; i++) {
ASSERT_OK_NO_THROW(writer.NewRowGroup(chunk_size));
ASSERT_OK_NO_THROW(writer->NewRowGroup(chunk_size));
std::shared_ptr<Array> sliced_array = values->Slice(i * chunk_size, chunk_size);
ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*sliced_array));
ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*sliced_array));
}
ASSERT_OK_NO_THROW(writer.Close());
ASSERT_OK_NO_THROW(writer->Close());

ASSERT_NO_FATAL_FAILURE(this->ReadAndCheckSingleColumnFile(*values));
}
Expand DownExpand Up@@ -859,14 +868,17 @@ TYPED_TEST(TestParquetIO, SingleColumnOptionalChunkedWrite) {
std::shared_ptr<::arrow::Schema> arrow_schema;
ArrowReaderProperties props;
ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
FileWriter writer(::arrow::default_memory_pool(), this->MakeWriter(schema),
arrow_schema);

std::unique_ptr<FileWriter> writer;
ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
this->MakeWriter(schema), arrow_schema,
default_arrow_writer_properties(), &writer));
for (int i = 0; i < 4; i++) {
ASSERT_OK_NO_THROW(writer.NewRowGroup(chunk_size));
ASSERT_OK_NO_THROW(writer->NewRowGroup(chunk_size));
std::shared_ptr<Array> sliced_array = values->Slice(i * chunk_size, chunk_size);
ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*sliced_array));
ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*sliced_array));
}
ASSERT_OK_NO_THROW(writer.Close());
ASSERT_OK_NO_THROW(writer->Close());

ASSERT_NO_FATAL_FAILURE(this->ReadAndCheckSingleColumnFile(*values));
}
Expand DownExpand Up@@ -2624,11 +2636,15 @@ TEST(TestArrowReaderAdHoc, DISABLED_LargeStringColumn) {
GroupNode::Make("schema", Repetition::REQUIRED, {schm->group_node()->field(0)}));

auto writer = ParquetFileWriter::Open(sink, schm_node);
FileWriter arrow_writer(default_memory_pool(), std::move(writer), table->schema());

std::unique_ptr<FileWriter> arrow_writer;
ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(), std::move(writer),
table->schema(), default_arrow_writer_properties(),
&arrow_writer));
for (int i : {0, 1}) {
ASSERT_OK_NO_THROW(arrow_writer.WriteTable(*table, table->num_rows())) << i;
ASSERT_OK_NO_THROW(arrow_writer->WriteTable(*table, table->num_rows())) << i;
}
ASSERT_OK_NO_THROW(arrow_writer.Close());
ASSERT_OK_NO_THROW(arrow_writer->Close());

std::shared_ptr<Buffer> tables_buffer;
ASSERT_OK_NO_THROW(sink->Finish(&tables_buffer));
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation#4971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wesm
wants to merge
2
commits into

from

 Closed


ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation
#4971
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e2c117a

Factor out list nesting into helper function


wesm Jul 29, 2019
e1f19c0

Code review feedback


wesm Aug 1, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


45 changes: 1 addition & 44 deletions
c_glib/parquet-glib/arrow-file-reader.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,15 +231,8 @@ gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
{
 auto parquet_arrow_file_reader = gparquet_arrow_file_reader_get_raw(reader);

 const auto n_columns =
 parquet_arrow_file_reader->parquet_reader()->metadata()->num_columns();
 std::vector<int> indices(n_columns);
 for (int i = 0; i < n_columns; ++i) {
 indices[i] = i;
 }

 std::shared_ptr<arrow::Schema> arrow_schema;
 auto status = parquet_arrow_file_reader->GetSchema(indices, &arrow_schema);
 auto status = parquet_arrow_file_reader->GetSchema(&arrow_schema);
 if (garrow_error_check(error,
 status,
 "[parquet][arrow][file-reader][get-schema]")) {
Expand All@@ -249,42 +242,6 @@ gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
 }
}

/**
 * gparquet_arrow_file_reader_select_schema:
 * @reader: A #GParquetArrowFileReader.
 * @column_indexes: (array length=n_column_indexes):
 * The array of column indexes to be selected.
 * @n_column_indexes: The length of `column_indexes`.
 * @error: (nullable): Return locatipcn for a #GError or %NULL.
 *
 * Returns: (transfer full) (nullable): A selected #GArrowSchema.
 *
 * Since: 0.12.0
 */
GArrowSchema *
gparquet_arrow_file_reader_select_schema(GParquetArrowFileReader *reader,
 gint *column_indexes,
 gsize n_column_indexes,
 GError **error)
{
 auto parquet_arrow_file_reader = gparquet_arrow_file_reader_get_raw(reader);

 std::vector<int> indices(n_column_indexes);
 for (gsize i = 0; i < n_column_indexes; ++i) {
 indices[i] = column_indexes[i];
 }

 std::shared_ptr<arrow::Schema> arrow_schema;
 auto status = parquet_arrow_file_reader->GetSchema(indices, &arrow_schema);
 if (garrow_error_check(error,
 status,
 "[parquet][arrow][file-reader][select-schema]")) {
 return garrow_schema_new_raw(&arrow_schema);
 } else {
 return NULL;
 }
}

/**
 * gparquet_arrow_file_reader_read_column_data:
 * @reader: A #GParquetArrowFileReader.
Expand Down

5 changes: 0 additions & 5 deletions
c_glib/parquet-glib/arrow-file-reader.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,6 @@ gparquet_arrow_file_reader_read_table(GParquetArrowFileReader *reader,
GArrowSchema *
gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
 GError **error);
GArrowSchema *
gparquet_arrow_file_reader_select_schema(GParquetArrowFileReader *reader,
 gint *column_indexes,
 gsize n_column_indexes,
 GError **error);

GARROW_AVAILABLE_IN_1_0
GArrowChunkedArray *
Expand Down

13 changes: 0 additions & 13 deletions
c_glib/test/parquet/test-arrow-file-reader.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,19 +39,6 @@ def test_schema
 SCHEMA
 end

 def test_select_schema
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([0]).to_s)
a: string
 SCHEMA
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([1]).to_s)
b: int32
 SCHEMA
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([0, 1]).to_s)
a: string
b: int32
 SCHEMA
 end

 def test_read_column
 assert_equal([
 Arrow::ChunkedArray.new([@a_array]),
Expand Down

52 changes: 34 additions & 18 deletions
cpp/src/parquet/arrow/arrow-reader-writer-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@
#include "parquet/api/writer.h"

#include "parquet/arrow/reader.h"
#include "parquet/arrow/reader_internal.h"
#include "parquet/arrow/schema.h"
#include "parquet/arrow/test-util.h"
#include "parquet/arrow/writer.h"
Expand DownExpand Up@@ -597,12 +598,16 @@ class TestParquetIO : public ::testing::Test {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(::arrow::default_memory_pool(), MakeWriter(schema), arrow_schema);
 ASSERT_OK_NO_THROW(writer.NewRowGroup(values->length()));
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*values));
 ASSERT_OK_NO_THROW(writer.Close());
 // writer.Close() should be idempotent
 ASSERT_OK_NO_THROW(writer.Close());

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(values->length()));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*values));
 ASSERT_OK_NO_THROW(writer->Close());
 // writer->Close() should be idempotent
 ASSERT_OK_NO_THROW(writer->Close());
 }

 void ResetSink() { sink_ = CreateOutputStream(); }
Expand DownExpand Up@@ -789,13 +794,17 @@ TYPED_TEST(TestParquetIO, SingleColumnRequiredChunkedWrite) {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(default_memory_pool(), this->MakeWriter(schema), arrow_schema);

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 this->MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 for (int i = 0; i < 4; i++) {
 ASSERT_OK_NO_THROW(writer.NewRowGroup(chunk_size));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(chunk_size));
 std::shared_ptr<Array> sliced_array = values->Slice(i * chunk_size, chunk_size);
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*sliced_array));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*sliced_array));
 }
 ASSERT_OK_NO_THROW(writer.Close());
 ASSERT_OK_NO_THROW(writer->Close());

 ASSERT_NO_FATAL_FAILURE(this->ReadAndCheckSingleColumnFile(*values));
}
Expand DownExpand Up@@ -859,14 +868,17 @@ TYPED_TEST(TestParquetIO, SingleColumnOptionalChunkedWrite) {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(::arrow::default_memory_pool(), this->MakeWriter(schema),
 arrow_schema);

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 this->MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 for (int i = 0; i < 4; i++) {
 ASSERT_OK_NO_THROW(writer.NewRowGroup(chunk_size));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(chunk_size));
 std::shared_ptr<Array> sliced_array = values->Slice(i * chunk_size, chunk_size);
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*sliced_array));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*sliced_array));
 }
 ASSERT_OK_NO_THROW(writer.Close());
 ASSERT_OK_NO_THROW(writer->Close());

 ASSERT_NO_FATAL_FAILURE(this->ReadAndCheckSingleColumnFile(*values));
}
Expand DownExpand Up@@ -2624,11 +2636,15 @@ TEST(TestArrowReaderAdHoc, DISABLED_LargeStringColumn) {
 GroupNode::Make("schema", Repetition::REQUIRED, {schm->group_node()->field(0)}));

 auto writer = ParquetFileWriter::Open(sink, schm_node);
 FileWriter arrow_writer(default_memory_pool(), std::move(writer), table->schema());

 std::unique_ptr<FileWriter> arrow_writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(), std::move(writer),
 table->schema(), default_arrow_writer_properties(),
 &arrow_writer));
 for (int i : {0, 1}) {
 ASSERT_OK_NO_THROW(arrow_writer.WriteTable(*table, table->num_rows())) << i;
 ASSERT_OK_NO_THROW(arrow_writer->WriteTable(*table, table->num_rows())) << i;
 }
 ASSERT_OK_NO_THROW(arrow_writer.Close());
 ASSERT_OK_NO_THROW(arrow_writer->Close());

 std::shared_ptr<Buffer> tables_buffer;
 ASSERT_OK_NO_THROW(sink->Finish(&tables_buffer));
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation#4971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wesm
wants to merge
2
commits into

from

 Closed


ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation
#4971
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e2c117a

Factor out list nesting into helper function


wesm Jul 29, 2019
e1f19c0

Code review feedback


wesm Aug 1, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


45 changes: 1 addition & 44 deletions
c_glib/parquet-glib/arrow-file-reader.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,15 +231,8 @@ gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
{
 auto parquet_arrow_file_reader = gparquet_arrow_file_reader_get_raw(reader);

 const auto n_columns =
 parquet_arrow_file_reader->parquet_reader()->metadata()->num_columns();
 std::vector<int> indices(n_columns);
 for (int i = 0; i < n_columns; ++i) {
 indices[i] = i;
 }

 std::shared_ptr<arrow::Schema> arrow_schema;
 auto status = parquet_arrow_file_reader->GetSchema(indices, &arrow_schema);
 auto status = parquet_arrow_file_reader->GetSchema(&arrow_schema);
 if (garrow_error_check(error,
 status,
 "[parquet][arrow][file-reader][get-schema]")) {
Expand All@@ -249,42 +242,6 @@ gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
 }
}

/**
 * gparquet_arrow_file_reader_select_schema:
 * @reader: A #GParquetArrowFileReader.
 * @column_indexes: (array length=n_column_indexes):
 * The array of column indexes to be selected.
 * @n_column_indexes: The length of `column_indexes`.
 * @error: (nullable): Return locatipcn for a #GError or %NULL.
 *
 * Returns: (transfer full) (nullable): A selected #GArrowSchema.
 *
 * Since: 0.12.0
 */
GArrowSchema *
gparquet_arrow_file_reader_select_schema(GParquetArrowFileReader *reader,
 gint *column_indexes,
 gsize n_column_indexes,
 GError **error)
{
 auto parquet_arrow_file_reader = gparquet_arrow_file_reader_get_raw(reader);

 std::vector<int> indices(n_column_indexes);
 for (gsize i = 0; i < n_column_indexes; ++i) {
 indices[i] = column_indexes[i];
 }

 std::shared_ptr<arrow::Schema> arrow_schema;
 auto status = parquet_arrow_file_reader->GetSchema(indices, &arrow_schema);
 if (garrow_error_check(error,
 status,
 "[parquet][arrow][file-reader][select-schema]")) {
 return garrow_schema_new_raw(&arrow_schema);
 } else {
 return NULL;
 }
}

/**
 * gparquet_arrow_file_reader_read_column_data:
 * @reader: A #GParquetArrowFileReader.
Expand Down

5 changes: 0 additions & 5 deletions
c_glib/parquet-glib/arrow-file-reader.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,6 @@ gparquet_arrow_file_reader_read_table(GParquetArrowFileReader *reader,
GArrowSchema *
gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
 GError **error);
GArrowSchema *
gparquet_arrow_file_reader_select_schema(GParquetArrowFileReader *reader,
 gint *column_indexes,
 gsize n_column_indexes,
 GError **error);

GARROW_AVAILABLE_IN_1_0
GArrowChunkedArray *
Expand Down

13 changes: 0 additions & 13 deletions
c_glib/test/parquet/test-arrow-file-reader.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,19 +39,6 @@ def test_schema
 SCHEMA
 end

 def test_select_schema
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([0]).to_s)
a: string
 SCHEMA
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([1]).to_s)
b: int32
 SCHEMA
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([0, 1]).to_s)
a: string
b: int32
 SCHEMA
 end

 def test_read_column
 assert_equal([
 Arrow::ChunkedArray.new([@a_array]),
Expand Down

52 changes: 34 additions & 18 deletions
cpp/src/parquet/arrow/arrow-reader-writer-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@
#include "parquet/api/writer.h"

#include "parquet/arrow/reader.h"
#include "parquet/arrow/reader_internal.h"
#include "parquet/arrow/schema.h"
#include "parquet/arrow/test-util.h"
#include "parquet/arrow/writer.h"
Expand DownExpand Up@@ -597,12 +598,16 @@ class TestParquetIO : public ::testing::Test {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(::arrow::default_memory_pool(), MakeWriter(schema), arrow_schema);
 ASSERT_OK_NO_THROW(writer.NewRowGroup(values->length()));
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*values));
 ASSERT_OK_NO_THROW(writer.Close());
 // writer.Close() should be idempotent
 ASSERT_OK_NO_THROW(writer.Close());

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(values->length()));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*values));
 ASSERT_OK_NO_THROW(writer->Close());
 // writer->Close() should be idempotent
 ASSERT_OK_NO_THROW(writer->Close());
 }

 void ResetSink() { sink_ = CreateOutputStream(); }
Expand DownExpand Up@@ -789,13 +794,17 @@ TYPED_TEST(TestParquetIO, SingleColumnRequiredChunkedWrite) {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(default_memory_pool(), this->MakeWriter(schema), arrow_schema);

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 this->MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 for (int i = 0; i < 4; i++) {
 ASSERT_OK_NO_THROW(writer.NewRowGroup(chunk_size));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(chunk_size));
 std::shared_ptr<Array> sliced_array = values->Slice(i * chunk_size, chunk_size);
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*sliced_array));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*sliced_array));
 }
 ASSERT_OK_NO_THROW(writer.Close());
 ASSERT_OK_NO_THROW(writer->Close());

 ASSERT_NO_FATAL_FAILURE(this->ReadAndCheckSingleColumnFile(*values));
}
Expand DownExpand Up@@ -859,14 +868,17 @@ TYPED_TEST(TestParquetIO, SingleColumnOptionalChunkedWrite) {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(::arrow::default_memory_pool(), this->MakeWriter(schema),
 arrow_schema);

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 this->MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 for (int i = 0; i < 4; i++) {
 ASSERT_OK_NO_THROW(writer.NewRowGroup(chunk_size));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(chunk_size));
 std::shared_ptr<Array> sliced_array = values->Slice(i * chunk_size, chunk_size);
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*sliced_array));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*sliced_array));
 }
 ASSERT_OK_NO_THROW(writer.Close());
 ASSERT_OK_NO_THROW(writer->Close());

 ASSERT_NO_FATAL_FAILURE(this->ReadAndCheckSingleColumnFile(*values));
}
Expand DownExpand Up@@ -2624,11 +2636,15 @@ TEST(TestArrowReaderAdHoc, DISABLED_LargeStringColumn) {
 GroupNode::Make("schema", Repetition::REQUIRED, {schm->group_node()->field(0)}));

 auto writer = ParquetFileWriter::Open(sink, schm_node);
 FileWriter arrow_writer(default_memory_pool(), std::move(writer), table->schema());

 std::unique_ptr<FileWriter> arrow_writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(), std::move(writer),
 table->schema(), default_arrow_writer_properties(),
 &arrow_writer));
 for (int i : {0, 1}) {
 ASSERT_OK_NO_THROW(arrow_writer.WriteTable(*table, table->num_rows())) << i;
 ASSERT_OK_NO_THROW(arrow_writer->WriteTable(*table, table->num_rows())) << i;
 }
 ASSERT_OK_NO_THROW(arrow_writer.Close());
 ASSERT_OK_NO_THROW(arrow_writer->Close());

 std::shared_ptr<Buffer> tables_buffer;
 ASSERT_OK_NO_THROW(sink->Finish(&tables_buffer));
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation#4971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wesm
wants to merge
2
commits into

from

 Closed


ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation
#4971
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e2c117a

Factor out list nesting into helper function


wesm Jul 29, 2019
e1f19c0

Code review feedback


wesm Aug 1, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


45 changes: 1 addition & 44 deletions
c_glib/parquet-glib/arrow-file-reader.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,15 +231,8 @@ gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
{
 auto parquet_arrow_file_reader = gparquet_arrow_file_reader_get_raw(reader);

 const auto n_columns =
 parquet_arrow_file_reader->parquet_reader()->metadata()->num_columns();
 std::vector<int> indices(n_columns);
 for (int i = 0; i < n_columns; ++i) {
 indices[i] = i;
 }

 std::shared_ptr<arrow::Schema> arrow_schema;
 auto status = parquet_arrow_file_reader->GetSchema(indices, &arrow_schema);
 auto status = parquet_arrow_file_reader->GetSchema(&arrow_schema);
 if (garrow_error_check(error,
 status,
 "[parquet][arrow][file-reader][get-schema]")) {
Expand All@@ -249,42 +242,6 @@ gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
 }
}

/**
 * gparquet_arrow_file_reader_select_schema:
 * @reader: A #GParquetArrowFileReader.
 * @column_indexes: (array length=n_column_indexes):
 * The array of column indexes to be selected.
 * @n_column_indexes: The length of `column_indexes`.
 * @error: (nullable): Return locatipcn for a #GError or %NULL.
 *
 * Returns: (transfer full) (nullable): A selected #GArrowSchema.
 *
 * Since: 0.12.0
 */
GArrowSchema *
gparquet_arrow_file_reader_select_schema(GParquetArrowFileReader *reader,
 gint *column_indexes,
 gsize n_column_indexes,
 GError **error)
{
 auto parquet_arrow_file_reader = gparquet_arrow_file_reader_get_raw(reader);

 std::vector<int> indices(n_column_indexes);
 for (gsize i = 0; i < n_column_indexes; ++i) {
 indices[i] = column_indexes[i];
 }

 std::shared_ptr<arrow::Schema> arrow_schema;
 auto status = parquet_arrow_file_reader->GetSchema(indices, &arrow_schema);
 if (garrow_error_check(error,
 status,
 "[parquet][arrow][file-reader][select-schema]")) {
 return garrow_schema_new_raw(&arrow_schema);
 } else {
 return NULL;
 }
}

/**
 * gparquet_arrow_file_reader_read_column_data:
 * @reader: A #GParquetArrowFileReader.
Expand Down

5 changes: 0 additions & 5 deletions
c_glib/parquet-glib/arrow-file-reader.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,6 @@ gparquet_arrow_file_reader_read_table(GParquetArrowFileReader *reader,
GArrowSchema *
gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
 GError **error);
GArrowSchema *
gparquet_arrow_file_reader_select_schema(GParquetArrowFileReader *reader,
 gint *column_indexes,
 gsize n_column_indexes,
 GError **error);

GARROW_AVAILABLE_IN_1_0
GArrowChunkedArray *
Expand Down

13 changes: 0 additions & 13 deletions
c_glib/test/parquet/test-arrow-file-reader.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,19 +39,6 @@ def test_schema
 SCHEMA
 end

 def test_select_schema
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([0]).to_s)
a: string
 SCHEMA
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([1]).to_s)
b: int32
 SCHEMA
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([0, 1]).to_s)
a: string
b: int32
 SCHEMA
 end

 def test_read_column
 assert_equal([
 Arrow::ChunkedArray.new([@a_array]),
Expand Down

52 changes: 34 additions & 18 deletions
cpp/src/parquet/arrow/arrow-reader-writer-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@
#include "parquet/api/writer.h"

#include "parquet/arrow/reader.h"
#include "parquet/arrow/reader_internal.h"
#include "parquet/arrow/schema.h"
#include "parquet/arrow/test-util.h"
#include "parquet/arrow/writer.h"
Expand DownExpand Up@@ -597,12 +598,16 @@ class TestParquetIO : public ::testing::Test {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(::arrow::default_memory_pool(), MakeWriter(schema), arrow_schema);
 ASSERT_OK_NO_THROW(writer.NewRowGroup(values->length()));
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*values));
 ASSERT_OK_NO_THROW(writer.Close());
 // writer.Close() should be idempotent
 ASSERT_OK_NO_THROW(writer.Close());

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(values->length()));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*values));
 ASSERT_OK_NO_THROW(writer->Close());
 // writer->Close() should be idempotent
 ASSERT_OK_NO_THROW(writer->Close());
 }

 void ResetSink() { sink_ = CreateOutputStream(); }
Expand DownExpand Up@@ -789,13 +794,17 @@ TYPED_TEST(TestParquetIO, SingleColumnRequiredChunkedWrite) {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(default_memory_pool(), this->MakeWriter(schema), arrow_schema);

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 this->MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 for (int i = 0; i < 4; i++) {
 ASSERT_OK_NO_THROW(writer.NewRowGroup(chunk_size));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(chunk_size));
 std::shared_ptr<Array> sliced_array = values->Slice(i * chunk_size, chunk_size);
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*sliced_array));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*sliced_array));
 }
 ASSERT_OK_NO_THROW(writer.Close());
 ASSERT_OK_NO_THROW(writer->Close());

 ASSERT_NO_FATAL_FAILURE(this->ReadAndCheckSingleColumnFile(*values));
}
Expand DownExpand Up@@ -859,14 +868,17 @@ TYPED_TEST(TestParquetIO, SingleColumnOptionalChunkedWrite) {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(::arrow::default_memory_pool(), this->MakeWriter(schema),
 arrow_schema);

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 this->MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 for (int i = 0; i < 4; i++) {
 ASSERT_OK_NO_THROW(writer.NewRowGroup(chunk_size));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(chunk_size));
 std::shared_ptr<Array> sliced_array = values->Slice(i * chunk_size, chunk_size);
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*sliced_array));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*sliced_array));
 }
 ASSERT_OK_NO_THROW(writer.Close());
 ASSERT_OK_NO_THROW(writer->Close());

 ASSERT_NO_FATAL_FAILURE(this->ReadAndCheckSingleColumnFile(*values));
}
Expand DownExpand Up@@ -2624,11 +2636,15 @@ TEST(TestArrowReaderAdHoc, DISABLED_LargeStringColumn) {
 GroupNode::Make("schema", Repetition::REQUIRED, {schm->group_node()->field(0)}));

 auto writer = ParquetFileWriter::Open(sink, schm_node);
 FileWriter arrow_writer(default_memory_pool(), std::move(writer), table->schema());

 std::unique_ptr<FileWriter> arrow_writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(), std::move(writer),
 table->schema(), default_arrow_writer_properties(),
 &arrow_writer));
 for (int i : {0, 1}) {
 ASSERT_OK_NO_THROW(arrow_writer.WriteTable(*table, table->num_rows())) << i;
 ASSERT_OK_NO_THROW(arrow_writer->WriteTable(*table, table->num_rows())) << i;
 }
 ASSERT_OK_NO_THROW(arrow_writer.Close());
 ASSERT_OK_NO_THROW(arrow_writer->Close());

 std::shared_ptr<Buffer> tables_buffer;
 ASSERT_OK_NO_THROW(sink->Finish(&tables_buffer));
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation#4971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wesm
wants to merge
2
commits into

from

 Closed


ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation
#4971
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e2c117a

Factor out list nesting into helper function


wesm Jul 29, 2019
e1f19c0

Code review feedback


wesm Aug 1, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


45 changes: 1 addition & 44 deletions
c_glib/parquet-glib/arrow-file-reader.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,15 +231,8 @@ gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
{
 auto parquet_arrow_file_reader = gparquet_arrow_file_reader_get_raw(reader);

 const auto n_columns =
 parquet_arrow_file_reader->parquet_reader()->metadata()->num_columns();
 std::vector<int> indices(n_columns);
 for (int i = 0; i < n_columns; ++i) {
 indices[i] = i;
 }

 std::shared_ptr<arrow::Schema> arrow_schema;
 auto status = parquet_arrow_file_reader->GetSchema(indices, &arrow_schema);
 auto status = parquet_arrow_file_reader->GetSchema(&arrow_schema);
 if (garrow_error_check(error,
 status,
 "[parquet][arrow][file-reader][get-schema]")) {
Expand All@@ -249,42 +242,6 @@ gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
 }
}

/**
 * gparquet_arrow_file_reader_select_schema:
 * @reader: A #GParquetArrowFileReader.
 * @column_indexes: (array length=n_column_indexes):
 * The array of column indexes to be selected.
 * @n_column_indexes: The length of `column_indexes`.
 * @error: (nullable): Return locatipcn for a #GError or %NULL.
 *
 * Returns: (transfer full) (nullable): A selected #GArrowSchema.
 *
 * Since: 0.12.0
 */
GArrowSchema *
gparquet_arrow_file_reader_select_schema(GParquetArrowFileReader *reader,
 gint *column_indexes,
 gsize n_column_indexes,
 GError **error)
{
 auto parquet_arrow_file_reader = gparquet_arrow_file_reader_get_raw(reader);

 std::vector<int> indices(n_column_indexes);
 for (gsize i = 0; i < n_column_indexes; ++i) {
 indices[i] = column_indexes[i];
 }

 std::shared_ptr<arrow::Schema> arrow_schema;
 auto status = parquet_arrow_file_reader->GetSchema(indices, &arrow_schema);
 if (garrow_error_check(error,
 status,
 "[parquet][arrow][file-reader][select-schema]")) {
 return garrow_schema_new_raw(&arrow_schema);
 } else {
 return NULL;
 }
}

/**
 * gparquet_arrow_file_reader_read_column_data:
 * @reader: A #GParquetArrowFileReader.
Expand Down

5 changes: 0 additions & 5 deletions
c_glib/parquet-glib/arrow-file-reader.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,6 @@ gparquet_arrow_file_reader_read_table(GParquetArrowFileReader *reader,
GArrowSchema *
gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
 GError **error);
GArrowSchema *
gparquet_arrow_file_reader_select_schema(GParquetArrowFileReader *reader,
 gint *column_indexes,
 gsize n_column_indexes,
 GError **error);

GARROW_AVAILABLE_IN_1_0
GArrowChunkedArray *
Expand Down

13 changes: 0 additions & 13 deletions
c_glib/test/parquet/test-arrow-file-reader.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,19 +39,6 @@ def test_schema
 SCHEMA
 end

 def test_select_schema
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([0]).to_s)
a: string
 SCHEMA
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([1]).to_s)
b: int32
 SCHEMA
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([0, 1]).to_s)
a: string
b: int32
 SCHEMA
 end

 def test_read_column
 assert_equal([
 Arrow::ChunkedArray.new([@a_array]),
Expand Down

52 changes: 34 additions & 18 deletions
cpp/src/parquet/arrow/arrow-reader-writer-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@
#include "parquet/api/writer.h"

#include "parquet/arrow/reader.h"
#include "parquet/arrow/reader_internal.h"
#include "parquet/arrow/schema.h"
#include "parquet/arrow/test-util.h"
#include "parquet/arrow/writer.h"
Expand DownExpand Up@@ -597,12 +598,16 @@ class TestParquetIO : public ::testing::Test {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(::arrow::default_memory_pool(), MakeWriter(schema), arrow_schema);
 ASSERT_OK_NO_THROW(writer.NewRowGroup(values->length()));
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*values));
 ASSERT_OK_NO_THROW(writer.Close());
 // writer.Close() should be idempotent
 ASSERT_OK_NO_THROW(writer.Close());

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(values->length()));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*values));
 ASSERT_OK_NO_THROW(writer->Close());
 // writer->Close() should be idempotent
 ASSERT_OK_NO_THROW(writer->Close());
 }

 void ResetSink() { sink_ = CreateOutputStream(); }
Expand DownExpand Up@@ -789,13 +794,17 @@ TYPED_TEST(TestParquetIO, SingleColumnRequiredChunkedWrite) {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(default_memory_pool(), this->MakeWriter(schema), arrow_schema);

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 this->MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 for (int i = 0; i < 4; i++) {
 ASSERT_OK_NO_THROW(writer.NewRowGroup(chunk_size));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(chunk_size));
 std::shared_ptr<Array> sliced_array = values->Slice(i * chunk_size, chunk_size);
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*sliced_array));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*sliced_array));
 }
 ASSERT_OK_NO_THROW(writer.Close());
 ASSERT_OK_NO_THROW(writer->Close());

 ASSERT_NO_FATAL_FAILURE(this->ReadAndCheckSingleColumnFile(*values));
}
Expand DownExpand Up@@ -859,14 +868,17 @@ TYPED_TEST(TestParquetIO, SingleColumnOptionalChunkedWrite) {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(::arrow::default_memory_pool(), this->MakeWriter(schema),
 arrow_schema);

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 this->MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 for (int i = 0; i < 4; i++) {
 ASSERT_OK_NO_THROW(writer.NewRowGroup(chunk_size));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(chunk_size));
 std::shared_ptr<Array> sliced_array = values->Slice(i * chunk_size, chunk_size);
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*sliced_array));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*sliced_array));
 }
 ASSERT_OK_NO_THROW(writer.Close());
 ASSERT_OK_NO_THROW(writer->Close());

 ASSERT_NO_FATAL_FAILURE(this->ReadAndCheckSingleColumnFile(*values));
}
Expand DownExpand Up@@ -2624,11 +2636,15 @@ TEST(TestArrowReaderAdHoc, DISABLED_LargeStringColumn) {
 GroupNode::Make("schema", Repetition::REQUIRED, {schm->group_node()->field(0)}));

 auto writer = ParquetFileWriter::Open(sink, schm_node);
 FileWriter arrow_writer(default_memory_pool(), std::move(writer), table->schema());

 std::unique_ptr<FileWriter> arrow_writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(), std::move(writer),
 table->schema(), default_arrow_writer_properties(),
 &arrow_writer));
 for (int i : {0, 1}) {
 ASSERT_OK_NO_THROW(arrow_writer.WriteTable(*table, table->num_rows())) << i;
 ASSERT_OK_NO_THROW(arrow_writer->WriteTable(*table, table->num_rows())) << i;
 }
 ASSERT_OK_NO_THROW(arrow_writer.Close());
 ASSERT_OK_NO_THROW(arrow_writer->Close());

 std::shared_ptr<Buffer> tables_buffer;
 ASSERT_OK_NO_THROW(sink->Finish(&tables_buffer));
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation#4971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wesm
wants to merge
2
commits into

from

 Closed


ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation
#4971
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e2c117a

Factor out list nesting into helper function


wesm Jul 29, 2019
e1f19c0

Code review feedback


wesm Aug 1, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


45 changes: 1 addition & 44 deletions
c_glib/parquet-glib/arrow-file-reader.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,15 +231,8 @@ gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
{
 auto parquet_arrow_file_reader = gparquet_arrow_file_reader_get_raw(reader);

 const auto n_columns =
 parquet_arrow_file_reader->parquet_reader()->metadata()->num_columns();
 std::vector<int> indices(n_columns);
 for (int i = 0; i < n_columns; ++i) {
 indices[i] = i;
 }

 std::shared_ptr<arrow::Schema> arrow_schema;
 auto status = parquet_arrow_file_reader->GetSchema(indices, &arrow_schema);
 auto status = parquet_arrow_file_reader->GetSchema(&arrow_schema);
 if (garrow_error_check(error,
 status,
 "[parquet][arrow][file-reader][get-schema]")) {
Expand All@@ -249,42 +242,6 @@ gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
 }
}

/**
 * gparquet_arrow_file_reader_select_schema:
 * @reader: A #GParquetArrowFileReader.
 * @column_indexes: (array length=n_column_indexes):
 * The array of column indexes to be selected.
 * @n_column_indexes: The length of `column_indexes`.
 * @error: (nullable): Return locatipcn for a #GError or %NULL.
 *
 * Returns: (transfer full) (nullable): A selected #GArrowSchema.
 *
 * Since: 0.12.0
 */
GArrowSchema *
gparquet_arrow_file_reader_select_schema(GParquetArrowFileReader *reader,
 gint *column_indexes,
 gsize n_column_indexes,
 GError **error)
{
 auto parquet_arrow_file_reader = gparquet_arrow_file_reader_get_raw(reader);

 std::vector<int> indices(n_column_indexes);
 for (gsize i = 0; i < n_column_indexes; ++i) {
 indices[i] = column_indexes[i];
 }

 std::shared_ptr<arrow::Schema> arrow_schema;
 auto status = parquet_arrow_file_reader->GetSchema(indices, &arrow_schema);
 if (garrow_error_check(error,
 status,
 "[parquet][arrow][file-reader][select-schema]")) {
 return garrow_schema_new_raw(&arrow_schema);
 } else {
 return NULL;
 }
}

/**
 * gparquet_arrow_file_reader_read_column_data:
 * @reader: A #GParquetArrowFileReader.
Expand Down

5 changes: 0 additions & 5 deletions
c_glib/parquet-glib/arrow-file-reader.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,6 @@ gparquet_arrow_file_reader_read_table(GParquetArrowFileReader *reader,
GArrowSchema *
gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
 GError **error);
GArrowSchema *
gparquet_arrow_file_reader_select_schema(GParquetArrowFileReader *reader,
 gint *column_indexes,
 gsize n_column_indexes,
 GError **error);

GARROW_AVAILABLE_IN_1_0
GArrowChunkedArray *
Expand Down

13 changes: 0 additions & 13 deletions
c_glib/test/parquet/test-arrow-file-reader.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,19 +39,6 @@ def test_schema
 SCHEMA
 end

 def test_select_schema
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([0]).to_s)
a: string
 SCHEMA
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([1]).to_s)
b: int32
 SCHEMA
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([0, 1]).to_s)
a: string
b: int32
 SCHEMA
 end

 def test_read_column
 assert_equal([
 Arrow::ChunkedArray.new([@a_array]),
Expand Down

52 changes: 34 additions & 18 deletions
cpp/src/parquet/arrow/arrow-reader-writer-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@
#include "parquet/api/writer.h"

#include "parquet/arrow/reader.h"
#include "parquet/arrow/reader_internal.h"
#include "parquet/arrow/schema.h"
#include "parquet/arrow/test-util.h"
#include "parquet/arrow/writer.h"
Expand DownExpand Up@@ -597,12 +598,16 @@ class TestParquetIO : public ::testing::Test {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(::arrow::default_memory_pool(), MakeWriter(schema), arrow_schema);
 ASSERT_OK_NO_THROW(writer.NewRowGroup(values->length()));
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*values));
 ASSERT_OK_NO_THROW(writer.Close());
 // writer.Close() should be idempotent
 ASSERT_OK_NO_THROW(writer.Close());

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(values->length()));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*values));
 ASSERT_OK_NO_THROW(writer->Close());
 // writer->Close() should be idempotent
 ASSERT_OK_NO_THROW(writer->Close());
 }

 void ResetSink() { sink_ = CreateOutputStream(); }
Expand DownExpand Up@@ -789,13 +794,17 @@ TYPED_TEST(TestParquetIO, SingleColumnRequiredChunkedWrite) {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(default_memory_pool(), this->MakeWriter(schema), arrow_schema);

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 this->MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 for (int i = 0; i < 4; i++) {
 ASSERT_OK_NO_THROW(writer.NewRowGroup(chunk_size));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(chunk_size));
 std::shared_ptr<Array> sliced_array = values->Slice(i * chunk_size, chunk_size);
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*sliced_array));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*sliced_array));
 }
 ASSERT_OK_NO_THROW(writer.Close());
 ASSERT_OK_NO_THROW(writer->Close());

 ASSERT_NO_FATAL_FAILURE(this->ReadAndCheckSingleColumnFile(*values));
}
Expand DownExpand Up@@ -859,14 +868,17 @@ TYPED_TEST(TestParquetIO, SingleColumnOptionalChunkedWrite) {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(::arrow::default_memory_pool(), this->MakeWriter(schema),
 arrow_schema);

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 this->MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 for (int i = 0; i < 4; i++) {
 ASSERT_OK_NO_THROW(writer.NewRowGroup(chunk_size));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(chunk_size));
 std::shared_ptr<Array> sliced_array = values->Slice(i * chunk_size, chunk_size);
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*sliced_array));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*sliced_array));
 }
 ASSERT_OK_NO_THROW(writer.Close());
 ASSERT_OK_NO_THROW(writer->Close());

 ASSERT_NO_FATAL_FAILURE(this->ReadAndCheckSingleColumnFile(*values));
}
Expand DownExpand Up@@ -2624,11 +2636,15 @@ TEST(TestArrowReaderAdHoc, DISABLED_LargeStringColumn) {
 GroupNode::Make("schema", Repetition::REQUIRED, {schm->group_node()->field(0)}));

 auto writer = ParquetFileWriter::Open(sink, schm_node);
 FileWriter arrow_writer(default_memory_pool(), std::move(writer), table->schema());

 std::unique_ptr<FileWriter> arrow_writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(), std::move(writer),
 table->schema(), default_arrow_writer_properties(),
 &arrow_writer));
 for (int i : {0, 1}) {
 ASSERT_OK_NO_THROW(arrow_writer.WriteTable(*table, table->num_rows())) << i;
 ASSERT_OK_NO_THROW(arrow_writer->WriteTable(*table, table->num_rows())) << i;
 }
 ASSERT_OK_NO_THROW(arrow_writer.Close());
 ASSERT_OK_NO_THROW(arrow_writer->Close());

 std::shared_ptr<Buffer> tables_buffer;
 ASSERT_OK_NO_THROW(sink->Finish(&tables_buffer));
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation#4971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wesm
wants to merge
2
commits into

from

 Closed


ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation
#4971
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e2c117a

Factor out list nesting into helper function


wesm Jul 29, 2019
e1f19c0

Code review feedback


wesm Aug 1, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


45 changes: 1 addition & 44 deletions
c_glib/parquet-glib/arrow-file-reader.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,15 +231,8 @@ gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
{
 auto parquet_arrow_file_reader = gparquet_arrow_file_reader_get_raw(reader);

 const auto n_columns =
 parquet_arrow_file_reader->parquet_reader()->metadata()->num_columns();
 std::vector<int> indices(n_columns);
 for (int i = 0; i < n_columns; ++i) {
 indices[i] = i;
 }

 std::shared_ptr<arrow::Schema> arrow_schema;
 auto status = parquet_arrow_file_reader->GetSchema(indices, &arrow_schema);
 auto status = parquet_arrow_file_reader->GetSchema(&arrow_schema);
 if (garrow_error_check(error,
 status,
 "[parquet][arrow][file-reader][get-schema]")) {
Expand All@@ -249,42 +242,6 @@ gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
 }
}

/**
 * gparquet_arrow_file_reader_select_schema:
 * @reader: A #GParquetArrowFileReader.
 * @column_indexes: (array length=n_column_indexes):
 * The array of column indexes to be selected.
 * @n_column_indexes: The length of `column_indexes`.
 * @error: (nullable): Return locatipcn for a #GError or %NULL.
 *
 * Returns: (transfer full) (nullable): A selected #GArrowSchema.
 *
 * Since: 0.12.0
 */
GArrowSchema *
gparquet_arrow_file_reader_select_schema(GParquetArrowFileReader *reader,
 gint *column_indexes,
 gsize n_column_indexes,
 GError **error)
{
 auto parquet_arrow_file_reader = gparquet_arrow_file_reader_get_raw(reader);

 std::vector<int> indices(n_column_indexes);
 for (gsize i = 0; i < n_column_indexes; ++i) {
 indices[i] = column_indexes[i];
 }

 std::shared_ptr<arrow::Schema> arrow_schema;
 auto status = parquet_arrow_file_reader->GetSchema(indices, &arrow_schema);
 if (garrow_error_check(error,
 status,
 "[parquet][arrow][file-reader][select-schema]")) {
 return garrow_schema_new_raw(&arrow_schema);
 } else {
 return NULL;
 }
}

/**
 * gparquet_arrow_file_reader_read_column_data:
 * @reader: A #GParquetArrowFileReader.
Expand Down

5 changes: 0 additions & 5 deletions
c_glib/parquet-glib/arrow-file-reader.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,6 @@ gparquet_arrow_file_reader_read_table(GParquetArrowFileReader *reader,
GArrowSchema *
gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
 GError **error);
GArrowSchema *
gparquet_arrow_file_reader_select_schema(GParquetArrowFileReader *reader,
 gint *column_indexes,
 gsize n_column_indexes,
 GError **error);

GARROW_AVAILABLE_IN_1_0
GArrowChunkedArray *
Expand Down

13 changes: 0 additions & 13 deletions
c_glib/test/parquet/test-arrow-file-reader.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,19 +39,6 @@ def test_schema
 SCHEMA
 end

 def test_select_schema
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([0]).to_s)
a: string
 SCHEMA
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([1]).to_s)
b: int32
 SCHEMA
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([0, 1]).to_s)
a: string
b: int32
 SCHEMA
 end

 def test_read_column
 assert_equal([
 Arrow::ChunkedArray.new([@a_array]),
Expand Down

52 changes: 34 additions & 18 deletions
cpp/src/parquet/arrow/arrow-reader-writer-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@
#include "parquet/api/writer.h"

#include "parquet/arrow/reader.h"
#include "parquet/arrow/reader_internal.h"
#include "parquet/arrow/schema.h"
#include "parquet/arrow/test-util.h"
#include "parquet/arrow/writer.h"
Expand DownExpand Up@@ -597,12 +598,16 @@ class TestParquetIO : public ::testing::Test {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(::arrow::default_memory_pool(), MakeWriter(schema), arrow_schema);
 ASSERT_OK_NO_THROW(writer.NewRowGroup(values->length()));
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*values));
 ASSERT_OK_NO_THROW(writer.Close());
 // writer.Close() should be idempotent
 ASSERT_OK_NO_THROW(writer.Close());

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(values->length()));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*values));
 ASSERT_OK_NO_THROW(writer->Close());
 // writer->Close() should be idempotent
 ASSERT_OK_NO_THROW(writer->Close());
 }

 void ResetSink() { sink_ = CreateOutputStream(); }
Expand DownExpand Up@@ -789,13 +794,17 @@ TYPED_TEST(TestParquetIO, SingleColumnRequiredChunkedWrite) {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(default_memory_pool(), this->MakeWriter(schema), arrow_schema);

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 this->MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 for (int i = 0; i < 4; i++) {
 ASSERT_OK_NO_THROW(writer.NewRowGroup(chunk_size));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(chunk_size));
 std::shared_ptr<Array> sliced_array = values->Slice(i * chunk_size, chunk_size);
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*sliced_array));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*sliced_array));
 }
 ASSERT_OK_NO_THROW(writer.Close());
 ASSERT_OK_NO_THROW(writer->Close());

 ASSERT_NO_FATAL_FAILURE(this->ReadAndCheckSingleColumnFile(*values));
}
Expand DownExpand Up@@ -859,14 +868,17 @@ TYPED_TEST(TestParquetIO, SingleColumnOptionalChunkedWrite) {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(::arrow::default_memory_pool(), this->MakeWriter(schema),
 arrow_schema);

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 this->MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 for (int i = 0; i < 4; i++) {
 ASSERT_OK_NO_THROW(writer.NewRowGroup(chunk_size));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(chunk_size));
 std::shared_ptr<Array> sliced_array = values->Slice(i * chunk_size, chunk_size);
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*sliced_array));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*sliced_array));
 }
 ASSERT_OK_NO_THROW(writer.Close());
 ASSERT_OK_NO_THROW(writer->Close());

 ASSERT_NO_FATAL_FAILURE(this->ReadAndCheckSingleColumnFile(*values));
}
Expand DownExpand Up@@ -2624,11 +2636,15 @@ TEST(TestArrowReaderAdHoc, DISABLED_LargeStringColumn) {
 GroupNode::Make("schema", Repetition::REQUIRED, {schm->group_node()->field(0)}));

 auto writer = ParquetFileWriter::Open(sink, schm_node);
 FileWriter arrow_writer(default_memory_pool(), std::move(writer), table->schema());

 std::unique_ptr<FileWriter> arrow_writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(), std::move(writer),
 table->schema(), default_arrow_writer_properties(),
 &arrow_writer));
 for (int i : {0, 1}) {
 ASSERT_OK_NO_THROW(arrow_writer.WriteTable(*table, table->num_rows())) << i;
 ASSERT_OK_NO_THROW(arrow_writer->WriteTable(*table, table->num_rows())) << i;
 }
 ASSERT_OK_NO_THROW(arrow_writer.Close());
 ASSERT_OK_NO_THROW(arrow_writer->Close());

 std::shared_ptr<Buffer> tables_buffer;
 ASSERT_OK_NO_THROW(sink->Finish(&tables_buffer));
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation#4971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wesm
wants to merge
2
commits into

from

 Closed


ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation
#4971
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e2c117a

Factor out list nesting into helper function


wesm Jul 29, 2019
e1f19c0

Code review feedback


wesm Aug 1, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


45 changes: 1 addition & 44 deletions
c_glib/parquet-glib/arrow-file-reader.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -231,15 +231,8 @@ gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
{
 auto parquet_arrow_file_reader = gparquet_arrow_file_reader_get_raw(reader);

 const auto n_columns =
 parquet_arrow_file_reader->parquet_reader()->metadata()->num_columns();
 std::vector<int> indices(n_columns);
 for (int i = 0; i < n_columns; ++i) {
 indices[i] = i;
 }

 std::shared_ptr<arrow::Schema> arrow_schema;
 auto status = parquet_arrow_file_reader->GetSchema(indices, &arrow_schema);
 auto status = parquet_arrow_file_reader->GetSchema(&arrow_schema);
 if (garrow_error_check(error,
 status,
 "[parquet][arrow][file-reader][get-schema]")) {
Expand All@@ -249,42 +242,6 @@ gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
 }
}

/**
 * gparquet_arrow_file_reader_select_schema:
 * @reader: A #GParquetArrowFileReader.
 * @column_indexes: (array length=n_column_indexes):
 * The array of column indexes to be selected.
 * @n_column_indexes: The length of `column_indexes`.
 * @error: (nullable): Return locatipcn for a #GError or %NULL.
 *
 * Returns: (transfer full) (nullable): A selected #GArrowSchema.
 *
 * Since: 0.12.0
 */
GArrowSchema *
gparquet_arrow_file_reader_select_schema(GParquetArrowFileReader *reader,
 gint *column_indexes,
 gsize n_column_indexes,
 GError **error)
{
 auto parquet_arrow_file_reader = gparquet_arrow_file_reader_get_raw(reader);

 std::vector<int> indices(n_column_indexes);
 for (gsize i = 0; i < n_column_indexes; ++i) {
 indices[i] = column_indexes[i];
 }

 std::shared_ptr<arrow::Schema> arrow_schema;
 auto status = parquet_arrow_file_reader->GetSchema(indices, &arrow_schema);
 if (garrow_error_check(error,
 status,
 "[parquet][arrow][file-reader][select-schema]")) {
 return garrow_schema_new_raw(&arrow_schema);
 } else {
 return NULL;
 }
}

/**
 * gparquet_arrow_file_reader_read_column_data:
 * @reader: A #GParquetArrowFileReader.
Expand Down

5 changes: 0 additions & 5 deletions
c_glib/parquet-glib/arrow-file-reader.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,11 +48,6 @@ gparquet_arrow_file_reader_read_table(GParquetArrowFileReader *reader,
GArrowSchema *
gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader,
 GError **error);
GArrowSchema *
gparquet_arrow_file_reader_select_schema(GParquetArrowFileReader *reader,
 gint *column_indexes,
 gsize n_column_indexes,
 GError **error);

GARROW_AVAILABLE_IN_1_0
GArrowChunkedArray *
Expand Down

13 changes: 0 additions & 13 deletions
c_glib/test/parquet/test-arrow-file-reader.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,19 +39,6 @@ def test_schema
 SCHEMA
 end

 def test_select_schema
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([0]).to_s)
a: string
 SCHEMA
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([1]).to_s)
b: int32
 SCHEMA
 assert_equal(<<-SCHEMA.chomp, @reader.select_schema([0, 1]).to_s)
a: string
b: int32
 SCHEMA
 end

 def test_read_column
 assert_equal([
 Arrow::ChunkedArray.new([@a_array]),
Expand Down

52 changes: 34 additions & 18 deletions
cpp/src/parquet/arrow/arrow-reader-writer-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,7 @@
#include "parquet/api/writer.h"

#include "parquet/arrow/reader.h"
#include "parquet/arrow/reader_internal.h"
#include "parquet/arrow/schema.h"
#include "parquet/arrow/test-util.h"
#include "parquet/arrow/writer.h"
Expand DownExpand Up@@ -597,12 +598,16 @@ class TestParquetIO : public ::testing::Test {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(::arrow::default_memory_pool(), MakeWriter(schema), arrow_schema);
 ASSERT_OK_NO_THROW(writer.NewRowGroup(values->length()));
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*values));
 ASSERT_OK_NO_THROW(writer.Close());
 // writer.Close() should be idempotent
 ASSERT_OK_NO_THROW(writer.Close());

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(values->length()));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*values));
 ASSERT_OK_NO_THROW(writer->Close());
 // writer->Close() should be idempotent
 ASSERT_OK_NO_THROW(writer->Close());
 }

 void ResetSink() { sink_ = CreateOutputStream(); }
Expand DownExpand Up@@ -789,13 +794,17 @@ TYPED_TEST(TestParquetIO, SingleColumnRequiredChunkedWrite) {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(default_memory_pool(), this->MakeWriter(schema), arrow_schema);

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 this->MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 for (int i = 0; i < 4; i++) {
 ASSERT_OK_NO_THROW(writer.NewRowGroup(chunk_size));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(chunk_size));
 std::shared_ptr<Array> sliced_array = values->Slice(i * chunk_size, chunk_size);
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*sliced_array));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*sliced_array));
 }
 ASSERT_OK_NO_THROW(writer.Close());
 ASSERT_OK_NO_THROW(writer->Close());

 ASSERT_NO_FATAL_FAILURE(this->ReadAndCheckSingleColumnFile(*values));
}
Expand DownExpand Up@@ -859,14 +868,17 @@ TYPED_TEST(TestParquetIO, SingleColumnOptionalChunkedWrite) {
 std::shared_ptr<::arrow::Schema> arrow_schema;
 ArrowReaderProperties props;
 ASSERT_OK_NO_THROW(FromParquetSchema(&descriptor, props, &arrow_schema));
 FileWriter writer(::arrow::default_memory_pool(), this->MakeWriter(schema),
 arrow_schema);

 std::unique_ptr<FileWriter> writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(),
 this->MakeWriter(schema), arrow_schema,
 default_arrow_writer_properties(), &writer));
 for (int i = 0; i < 4; i++) {
 ASSERT_OK_NO_THROW(writer.NewRowGroup(chunk_size));
 ASSERT_OK_NO_THROW(writer->NewRowGroup(chunk_size));
 std::shared_ptr<Array> sliced_array = values->Slice(i * chunk_size, chunk_size);
 ASSERT_OK_NO_THROW(writer.WriteColumnChunk(*sliced_array));
 ASSERT_OK_NO_THROW(writer->WriteColumnChunk(*sliced_array));
 }
 ASSERT_OK_NO_THROW(writer.Close());
 ASSERT_OK_NO_THROW(writer->Close());

 ASSERT_NO_FATAL_FAILURE(this->ReadAndCheckSingleColumnFile(*values));
}
Expand DownExpand Up@@ -2624,11 +2636,15 @@ TEST(TestArrowReaderAdHoc, DISABLED_LargeStringColumn) {
 GroupNode::Make("schema", Repetition::REQUIRED, {schm->group_node()->field(0)}));

 auto writer = ParquetFileWriter::Open(sink, schm_node);
 FileWriter arrow_writer(default_memory_pool(), std::move(writer), table->schema());

 std::unique_ptr<FileWriter> arrow_writer;
 ASSERT_OK_NO_THROW(FileWriter::Make(::arrow::default_memory_pool(), std::move(writer),
 table->schema(), default_arrow_writer_properties(),
 &arrow_writer));
 for (int i : {0, 1}) {
 ASSERT_OK_NO_THROW(arrow_writer.WriteTable(*table, table->num_rows())) << i;
 ASSERT_OK_NO_THROW(arrow_writer->WriteTable(*table, table->num_rows())) << i;
 }
 ASSERT_OK_NO_THROW(arrow_writer.Close());
 ASSERT_OK_NO_THROW(arrow_writer->Close());

 std::shared_ptr<Buffer> tables_buffer;
 ASSERT_OK_NO_THROW(sink->Finish(&tables_buffer));
Expand Down
Loading