Skip to content

Commit

Permalink
format code
Browse files Browse the repository at this point in the history
  • Loading branch information
kevincmchen committed Jul 9, 2024
1 parent 18cdbf0 commit c796f5d
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions velox/dwio/parquet/reader/ParquetReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,12 @@ class ReaderBase {
uint32_t& schemaIdx,
uint32_t& columnIdx,
const TypePtr& requestedSchema) const;

TypePtr convertType(
const thrift::SchemaElement& schemaElement,
const TypePtr& requestedSchema) const;
const std::shared_ptr<const Type>& getChildRequestedSchema(

const TypePtr& getChildRequestedSchema(
const TypePtr& requestedSchema,
std::string& name) const;

Expand All @@ -127,7 +129,6 @@ class ReaderBase {
// Map from row group index to pre-created loading BufferedInput.
std::unordered_map<uint32_t, std::shared_ptr<dwio::common::BufferedInput>>
inputs_;

};

ReaderBase::ReaderBase(
Expand Down Expand Up @@ -537,11 +538,10 @@ std::unique_ptr<ParquetTypeWithId> ReaderBase::getParquetColumnInfo(
}

const TypePtr& ReaderBase::getChildRequestedSchema(
const TypePtr & requestedSchema,
const TypePtr& requestedSchema,
std::string& name) const {
if (!requestedSchema
&& requestedSchema->isRow()
&& requestedSchema->asRow().containsChild(name)) {
if (!requestedSchema && requestedSchema->isRow() &&
requestedSchema->asRow().containsChild(name)) {
return requestedSchema->asRow().findChild(name);
} else {
return requestedSchema;
Expand Down Expand Up @@ -682,9 +682,8 @@ TypePtr ReaderBase::convertType(
return DOUBLE();
case thrift::Type::type::BYTE_ARRAY:
case thrift::Type::type::FIXED_LEN_BYTE_ARRAY: {
if (requestedSchema != nullptr
&& requestedSchema->isRow()
&& requestedSchema->asRow().containsChild(schemaElement.name)) {
if (requestedSchema != nullptr && requestedSchema->isRow() &&
requestedSchema->asRow().containsChild(schemaElement.name)) {
const std::shared_ptr<const Type>& requestedType =
requestedSchema->asRow().findChild(schemaElement.name);
if (requestedType->isVarchar()) {
Expand Down

0 comments on commit c796f5d

Please sign in to comment.