Skip to content

[native] ArrowFlight connector missing ColumnHandle operator<() #24914

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

Merged
BryanCutler merged 1 commit into from
May 2, 2025
Merged

[native] ArrowFlight connector missing ColumnHandle operator<() #24914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions ...se-arrow-flight/src/test/java/com/facebook/plugin/arrow/TestArrowFlightNativeQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,12 @@ public void testSign()
assertQuery("SELECT sign(shippriority) from orders");
}

@Test
public void testQueryWithColumnHandleOrdering()
{
assertQuery("SELECT * FROM nation WHERE (name <= 'B' OR 'G' <= name) AND (nationkey BETWEEN 1 AND 10)");
}

public static Map<String, String> getNativeWorkerSystemProperties()
{
return ImmutableMap.<String, String>builder()
Expand Down
23 changes: 23 additions & 0 deletions ...xecution/presto_cpp/presto_protocol/connector/arrow_flight/presto_protocol_arrow_flight.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,38 @@ void to_json(json& j, const ArrowTransactionHandle& p);
void from_json(const json& j, ArrowTransactionHandle& p);

} // namespace facebook::presto::protocol::arrow_flight
/*
Copy link
Copy Markdown
Contributor

@aditi-pandit aditi-pandit Apr 22, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BryanCutler Its strange this copyright message is inserted here again... It needs to be in the header only. Please can you fix it if possible.

Copy link
Copy Markdown
Contributor Author

@BryanCutler BryanCutler Apr 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The special file ArrowColumnHandle.hpp.inc has a copyright header and when the protocol is generated it puts the entire file into presto_protocol_arrow_flight.h. It's the same thing for the Hive connector and all the *.inc files.
I thought it was a bit strange too, but it seems like the *.inc files need a header, so it's just the side effect.

Copy link
Copy Markdown
Contributor

@aditi-pandit aditi-pandit Apr 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should fix this in the scripting. Please create an issue for it.

Copy link
Copy Markdown
Contributor Author

@BryanCutler BryanCutler May 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created issue for this at #25082

* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

// ArrowColumnHandle is special since it needs an implementation of
// operator<().

namespace facebook::presto::protocol::arrow_flight {
struct ArrowColumnHandle : public ColumnHandle {
String columnName = {};
Type columnType = {};

ArrowColumnHandle() noexcept;

bool operator<(const ColumnHandle& o) const override {
return columnName < dynamic_cast<const ArrowColumnHandle&>(o).columnName;
}
};

void to_json(json& j, const ArrowColumnHandle& p);
void from_json(const json& j, ArrowColumnHandle& p);

} // namespace facebook::presto::protocol::arrow_flight
namespace facebook::presto::protocol::arrow_flight {
struct ArrowSplit : public ConnectorSplit {
Expand Down
33 changes: 33 additions & 0 deletions ...ution/presto_cpp/presto_protocol/connector/arrow_flight/special/ArrowColumnHandle.hpp.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

// ArrowColumnHandle is special since it needs an implementation of
// operator<().

namespace facebook::presto::protocol::arrow_flight {
struct ArrowColumnHandle : public ColumnHandle {
String columnName = {};
Type columnType = {};

ArrowColumnHandle() noexcept;

bool operator<(const ColumnHandle& o) const override {
return columnName < dynamic_cast<const ArrowColumnHandle&>(o).columnName;
}
};

void to_json(json& j, const ArrowColumnHandle& p);
void from_json(const json& j, ArrowColumnHandle& p);

} // namespace facebook::presto::protocol::arrow_flight
2 changes: 1 addition & 1 deletion presto-native-execution/presto_cpp/presto_protocol/core/presto_protocol-json-hpp.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ namespace facebook::presto::protocol {
{{/fields}}
{{#comparable}}
virtual bool operator<(const {{&class_name}}& /* o */) const {
throw std::runtime_error("missing operator<() in {class_name} subclass");
throw std::runtime_error("missing operator<() in {{class_name}} subclass");
Copy link
Copy Markdown
Contributor Author

@BryanCutler BryanCutler Apr 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was causing the error message to display as missing operator<() in {class_name} subclass. The double braces are needed to correct it when generating the protocol.

}
{{/comparable}}
};
Expand Down
2 changes: 1 addition & 1 deletion presto-native-execution/presto_cpp/presto_protocol/core/presto_protocol_core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ void from_json(const json& j, std::shared_ptr<ConnectorIndexHandle>& p);
namespace facebook::presto::protocol {
struct ColumnHandle : public JsonEncodedSubclass {
virtual bool operator<(const ColumnHandle& /* o */) const {
throw std::runtime_error("missing operator<() in {class_name} subclass");
throw std::runtime_error("missing operator<() in ColumnHandle subclass");
}
};
void to_json(json& j, const std::shared_ptr<ColumnHandle>& p);
Expand Down
Loading