Skip to content

Commit 62b100c

Browse files
refactor(predicate): move predicate_utils.h to public include (#181)
Move predicate_utils.h from src/paimon/common/predicate/ to include/paimon/predicate/ to expose it as a public API header. Changes: - Relocate predicate_utils.h to include/paimon/predicate/ - Update all include paths across the codebase - Remove fmt/format.h dependency from header - Replace fmt::format with string concatenation in error msg Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 8924152 commit 62b100c

File tree

11 files changed

+12
-13
lines changed

11 files changed

+12
-13
lines changed

src/paimon/common/predicate/predicate_utils.h renamed to include/paimon/predicate/predicate_utils.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <string>
2525
#include <vector>
2626

27-
#include "fmt/format.h"
2827
#include "paimon/predicate/function.h"
2928
#include "paimon/predicate/function_visitor.h"
3029
#include "paimon/predicate/leaf_predicate.h"
@@ -114,8 +113,8 @@ class PAIMON_EXPORT PredicateUtils {
114113
return visitor->VisitLike(predicate->Literals()[0]);
115114
}
116115
default:
117-
return Status::Invalid(fmt::format("invalid {} function in leaf predicate",
118-
predicate->GetFunction().ToString()));
116+
return Status::Invalid("invalid " + predicate->GetFunction().ToString() +
117+
" function in leaf predicate");
119118
}
120119
}
121120

src/paimon/common/predicate/predicate_utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include "paimon/common/predicate/predicate_utils.h"
17+
#include "paimon/predicate/predicate_utils.h"
1818

1919
#include <utility>
2020

src/paimon/common/predicate/predicate_utils_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include "paimon/common/predicate/predicate_utils.h"
17+
#include "paimon/predicate/predicate_utils.h"
1818

1919
#include <utility>
2020

src/paimon/core/global_index/global_index_evaluator_impl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#include "paimon/core/global_index/global_index_evaluator_impl.h"
1818

1919
#include "fmt/format.h"
20-
#include "paimon/common/predicate/predicate_utils.h"
2120
#include "paimon/global_index/bitmap_global_index_result.h"
2221
#include "paimon/predicate/leaf_predicate.h"
22+
#include "paimon/predicate/predicate_utils.h"
2323

2424
namespace paimon {
2525
Result<std::optional<std::shared_ptr<GlobalIndexResult>>> GlobalIndexEvaluatorImpl::Evaluate(

src/paimon/core/io/file_index_evaluator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "arrow/type.h"
2727
#include "fmt/format.h"
2828
#include "fmt/ranges.h"
29-
#include "paimon/common/predicate/predicate_utils.h"
3029
#include "paimon/common/utils/arrow/status_utils.h"
3130
#include "paimon/common/utils/date_time_utils.h"
3231
#include "paimon/common/utils/field_type_utils.h"
@@ -42,6 +41,7 @@
4241
#include "paimon/predicate/leaf_predicate.h"
4342
#include "paimon/predicate/literal.h"
4443
#include "paimon/predicate/predicate.h"
44+
#include "paimon/predicate/predicate_utils.h"
4545
#include "paimon/status.h"
4646

4747
namespace paimon {

src/paimon/core/operation/append_only_file_store_scan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include "arrow/type.h"
2929
#include "fmt/format.h"
3030
#include "paimon/common/predicate/predicate_filter.h"
31-
#include "paimon/common/predicate/predicate_utils.h"
3231
#include "paimon/common/types/data_field.h"
3332
#include "paimon/core/core_options.h"
3433
#include "paimon/core/io/data_file_meta.h"
@@ -40,6 +39,7 @@
4039
#include "paimon/core/stats/simple_stats_evolutions.h"
4140
#include "paimon/core/utils/field_mapping.h"
4241
#include "paimon/file_index/file_index_result.h"
42+
#include "paimon/predicate/predicate_utils.h"
4343
#include "paimon/status.h"
4444

4545
namespace paimon {

src/paimon/core/operation/file_store_scan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "paimon/common/data/binary_array.h"
3030
#include "paimon/common/executor/future.h"
3131
#include "paimon/common/predicate/literal_converter.h"
32-
#include "paimon/common/predicate/predicate_utils.h"
3332
#include "paimon/common/types/data_field.h"
3433
#include "paimon/common/utils/field_type_utils.h"
3534
#include "paimon/core/io/data_file_meta.h"
@@ -48,6 +47,7 @@
4847
#include "paimon/predicate/literal.h"
4948
#include "paimon/predicate/predicate.h"
5049
#include "paimon/predicate/predicate_builder.h"
50+
#include "paimon/predicate/predicate_utils.h"
5151
#include "paimon/scan_context.h"
5252

5353
namespace paimon {

src/paimon/core/operation/key_value_file_store_scan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "paimon/common/data/binary_array.h"
2828
#include "paimon/common/data/binary_row.h"
2929
#include "paimon/common/predicate/predicate_filter.h"
30-
#include "paimon/common/predicate/predicate_utils.h"
3130
#include "paimon/common/utils/object_utils.h"
3231
#include "paimon/core/core_options.h"
3332
#include "paimon/core/io/data_file_meta.h"
@@ -37,6 +36,7 @@
3736
#include "paimon/core/stats/simple_stats_evolution.h"
3837
#include "paimon/core/stats/simple_stats_evolutions.h"
3938
#include "paimon/predicate/predicate.h"
39+
#include "paimon/predicate/predicate_utils.h"
4040

4141
namespace arrow {
4242
class Schema;

src/paimon/core/operation/merge_file_split_read.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "arrow/c/abi.h"
2828
#include "arrow/c/bridge.h"
2929
#include "arrow/type.h"
30-
#include "paimon/common/predicate/predicate_utils.h"
3130
#include "paimon/common/reader/complete_row_kind_batch_reader.h"
3231
#include "paimon/common/reader/concat_batch_reader.h"
3332
#include "paimon/common/table/special_fields.h"
@@ -64,6 +63,7 @@
6463
#include "paimon/core/utils/file_store_path_factory.h"
6564
#include "paimon/core/utils/primary_key_table_utils.h"
6665
#include "paimon/memory/memory_pool.h"
66+
#include "paimon/predicate/predicate_utils.h"
6767
#include "paimon/reader/file_batch_reader.h"
6868
#include "paimon/table/source/data_split.h"
6969
#include "paimon/utils/roaring_bitmap32.h"

src/paimon/core/utils/field_mapping.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
#include "fmt/format.h"
2626
#include "paimon/common/predicate/compound_predicate_impl.h"
2727
#include "paimon/common/predicate/leaf_predicate_impl.h"
28-
#include "paimon/common/predicate/predicate_utils.h"
2928
#include "paimon/common/utils/field_type_utils.h"
3029
#include "paimon/common/utils/object_utils.h"
3130
#include "paimon/core/casting/cast_executor_factory.h"
3231
#include "paimon/core/casting/casting_utils.h"
3332
#include "paimon/defs.h"
3433
#include "paimon/predicate/literal.h"
3534
#include "paimon/predicate/predicate_builder.h"
35+
#include "paimon/predicate/predicate_utils.h"
3636
#include "paimon/status.h"
3737

3838
namespace paimon {

0 commit comments

Comments
 (0)