SteNicholas commented on code in PR #534:
URL: https://github.com/apache/paimon-cpp/pull/534#discussion_r4512422665


##########
src/paimon/core/table/source/query_auth_table_read.cpp:
##########
@@ -0,0 +1,491 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+#include "paimon/core/table/source/query_auth_table_read.h"
+
+#include <cstdint>
+#include <utility>
+
+#include "arrow/api.h"
+#include "arrow/c/abi.h"
+#include "arrow/c/bridge.h"
+#include "arrow/compute/cast.h"
+#include "fmt/format.h"
+#include "paimon/common/reader/concat_batch_reader.h"
+#include "paimon/common/reader/predicate_batch_reader.h"
+#include "paimon/common/utils/arrow/mem_utils.h"
+#include "paimon/common/utils/arrow/status_utils.h"
+#include "paimon/common/utils/checked_cast.h"
+#include "paimon/common/utils/object_utils.h"
+#include "paimon/common/utils/scope_guard.h"
+#include "paimon/core/casting/casting_utils.h"
+#include "paimon/core/table/source/query_auth_split.h"
+#include "paimon/defs.h"
+#include "paimon/predicate/predicate.h"
+#include "paimon/predicate/predicate_builder.h"
+#include "paimon/predicate/predicate_utils.h"
+#include "paimon/status.h"
+
+namespace paimon {
+namespace {
+
+/// The column as a mask or a predicate reads it: dictionary-decoded, and cast 
to a string when it
+/// is a large string.
+Result<std::shared_ptr<arrow::Array>> DecodeDictionaryAndLargeString(
+    const std::shared_ptr<arrow::Array>& column, arrow::MemoryPool* pool) {
+    PAIMON_ASSIGN_OR_RAISE(std::shared_ptr<arrow::Array> decoded,
+                           CastingUtils::DecodeDictionary(column, pool));
+    if (decoded->type_id() == arrow::Type::LARGE_STRING) {
+        return CastingUtils::Cast(decoded, arrow::utf8(), 
arrow::compute::CastOptions::Safe(),
+                                  pool);
+    }
+    return decoded;
+}
+
+/// The type `DecodeDictionaryAndLargeString()` gives a column of `type`.
+std::shared_ptr<arrow::DataType> DecodedType(const 
std::shared_ptr<arrow::DataType>& type) {
+    std::shared_ptr<arrow::DataType> value_type = type;
+    if (value_type->id() == arrow::Type::DICTIONARY) {
+        value_type = checked_cast<const 
arrow::DictionaryType&>(*value_type).value_type();
+    }
+    if (value_type->id() == arrow::Type::LARGE_STRING) {
+        return arrow::utf8();
+    }
+    return value_type;
+}
+
+/// Hands out only the rows the row filter keeps. 
`PredicateBatchReader::NextBatchWithBitmap()`
+/// only clears the bits of the rows it drops and leaves their values in the 
Arrow array, so every
+/// batch is compacted through `NextBatch()`.
+class RowFilterBoundaryReader : public BatchReader {
+ public:
+    explicit RowFilterBoundaryReader(std::unique_ptr<PredicateBatchReader> 
reader)
+        : reader_(std::move(reader)) {}
+
+    Result<ReadBatch> NextBatch() override {
+        return reader_->NextBatch();
+    }
+
+    Result<ReadBatchWithBitmap> NextBatchWithBitmap() override {
+        return BatchReader::NextBatchWithBitmap();
+    }
+
+    std::shared_ptr<Metrics> GetReaderMetrics() const override {
+        return reader_->GetReaderMetrics();
+    }
+
+    void Close() override {
+        reader_->Close();
+    }
+
+ private:
+    std::unique_ptr<PredicateBatchReader> reader_;
+};
+
+}  // namespace
+
+QueryAuthBatchReader::QueryAuthBatchReader(
+    std::unique_ptr<BatchReader> reader,
+    std::map<std::string, std::shared_ptr<MaskTransform>> masks,
+    std::set<std::string> dropped_fields, std::set<std::string> decoded_fields,
+    std::shared_ptr<arrow::MemoryPool> arrow_pool)
+    : reader_(std::move(reader)),
+      masks_(std::move(masks)),
+      dropped_fields_(std::move(dropped_fields)),
+      decoded_fields_(std::move(decoded_fields)),
+      arrow_pool_(std::move(arrow_pool)) {
+    decode_inputs_ = decoded_fields_;
+    for (const auto& [target, mask] : masks_) {
+        for (const std::string& input : mask->InputFields()) {
+            decode_inputs_.insert(input);
+        }
+    }
+}
+
+Result<std::shared_ptr<arrow::StructArray>> QueryAuthBatchReader::DecodeInputs(
+    const std::shared_ptr<arrow::StructArray>& batch) const {
+    arrow::FieldVector fields = batch->struct_type()->fields();
+    arrow::ArrayVector children = batch->fields();
+    bool decoded_any = false;
+    for (size_t i = 0; i < fields.size(); ++i) {
+        if (decode_inputs_.count(fields[i]->name()) == 0) {
+            continue;
+        }
+        Result<std::shared_ptr<arrow::Array>> result =
+            DecodeDictionaryAndLargeString(children[i], arrow_pool_.get());
+        if (!result.ok()) {
+            return result.status().WithMessage(
+                fmt::format("Query auth read cannot decode column '{}': {}", 
fields[i]->name(),
+                            result.status().message()));
+        }
+        std::shared_ptr<arrow::Array> decoded = std::move(result).value();
+        if (decoded != children[i]) {
+            fields[i] = fields[i]->WithType(decoded->type());
+            children[i] = std::move(decoded);
+            decoded_any = true;
+        }
+    }
+    if (!decoded_any) {
+        return batch;
+    }
+    PAIMON_ASSIGN_OR_RAISE_FROM_ARROW(std::shared_ptr<arrow::StructArray> 
decoded_batch,
+                                      arrow::StructArray::Make(children, 
fields));
+    return decoded_batch;
+}
+
+Result<BatchReader::ReadBatch> QueryAuthBatchReader::NextBatch() {
+    PAIMON_ASSIGN_OR_RAISE(BatchReader::ReadBatch batch, reader_->NextBatch());
+    if (BatchReader::IsEofBatch(batch)) {
+        return batch;
+    }
+    auto& [c_array, c_schema] = batch;
+    PAIMON_ASSIGN_OR_RAISE_FROM_ARROW(std::shared_ptr<arrow::Array> array,
+                                      arrow::ImportArray(c_array.get(), 
c_schema.get()));
+    if (array->type_id() != arrow::Type::STRUCT) {
+        return Status::Invalid("a query-auth read requires struct batches");
+    }
+    auto struct_array = checked_pointer_cast<arrow::StructArray>(array);
+    if (struct_array->null_count() != 0) {
+        return Status::Invalid("a query-auth read does not support null rows 
in a batch");
+    }
+    const auto& struct_type = *struct_array->struct_type();
+    std::shared_ptr<arrow::StructArray> decoded = struct_array;
+    if (!decode_inputs_.empty()) {
+        PAIMON_ASSIGN_OR_RAISE(decoded, DecodeInputs(struct_array));
+    }
+    arrow::FieldVector fields;
+    arrow::ArrayVector children;
+    for (int32_t i = 0; i < struct_type.num_fields(); ++i) {
+        const std::shared_ptr<arrow::Field>& field = struct_type.field(i);
+        if (dropped_fields_.count(field->name()) > 0) {
+            continue;
+        }
+        auto mask = masks_.find(field->name());
+        if (mask == masks_.end()) {
+            const arrow::StructArray& source =
+                decoded_fields_.count(field->name()) > 0 ? *decoded : 
*struct_array;
+            fields.push_back(source.struct_type()->field(i));
+            children.push_back(source.field(i));
+            continue;
+        }
+        const std::shared_ptr<arrow::DataType> target_type = 
DecodedType(field->type());
+        Result<std::shared_ptr<arrow::Array>> result =
+            mask->second->Evaluate(*decoded, target_type, arrow_pool_.get());
+        if (!result.ok()) {
+            return result.status().WithMessage(
+                fmt::format("Query auth mask {} of column '{}' failed: {}", 
mask->second->Name(),
+                            field->name(), result.status().message()));
+        }
+        std::shared_ptr<arrow::Array> masked = std::move(result).value();
+        if (masked->length() != struct_array->length()) {
+            return Status::Invalid(fmt::format("the mask of column '{}' 
produced {} rows for {}",
+                                               field->name(), masked->length(),
+                                               struct_array->length()));
+        }
+        if (!masked->type()->Equals(*target_type)) {
+            return Status::Invalid(fmt::format("the mask of column '{}' 
produced {} for {}",
+                                               field->name(), 
masked->type()->ToString(),
+                                               target_type->ToString()));
+        }
+        // A mask may null a column that holds no nulls.
+        fields.push_back(field->WithType(target_type)->WithNullable(true));
+        children.push_back(std::move(masked));
+    }
+    PAIMON_ASSIGN_OR_RAISE_FROM_ARROW(std::shared_ptr<arrow::StructArray> 
output,
+                                      arrow::StructArray::Make(children, 
fields));
+    PAIMON_RETURN_NOT_OK_FROM_ARROW(arrow::ExportArray(*output, c_array.get(), 
c_schema.get()));
+    // The masked buffers come from `arrow_pool_`, which must outlive the 
batch, not this reader.
+    PAIMON_RETURN_NOT_OK(AddArrowArrayLifetime(c_array.get(), c_schema.get(), 
arrow_pool_));
+    return batch;
+}
+
+Result<std::unique_ptr<TableRead>> QueryAuthTableRead::Create(
+    const std::shared_ptr<ReadContext>& context, const 
std::shared_ptr<TableSchema>& table_schema,
+    const std::shared_ptr<arrow::MemoryPool>& arrow_pool, InnerReadFactory 
create_inner) {
+    if (context->HasVectorOrFullTextSearch() || 
context->EnablePreciseFileIndexEvaluate()) {
+        return Status::NotImplemented(
+            "Search is not supported on a query-auth table: the index ranks 
raw values, which a "
+            "column mask invalidates.");
+    }
+    if (context->HasReadSchema()) {
+        return Status::NotImplemented(
+            "An explicit read schema is not supported on a query-auth table: 
the rules apply to "
+            "whole columns; use SetReadFieldNames() or SetReadFieldIds() 
instead.");
+    }
+    if (context->GetRealtimeContext() != nullptr) {
+        return Status::NotImplemented("Real-time reads are not supported on a 
query-auth table.");
+    }
+    std::optional<std::vector<std::string>> output_fields;
+    if (!context->GetReadFieldIds().empty()) {
+        std::vector<std::string> names;
+        for (int32_t id : context->GetReadFieldIds()) {
+            Result<DataField> field = table_schema->GetField(id);
+            if (!field.ok()) {
+                return Status::NotImplemented(fmt::format(
+                    "Field {} is not a column of the table schema, which is 
all a query-auth read "
+                    "can authorize.",
+                    id));
+            }
+            names.push_back(field.value().Name());
+        }
+        output_fields = std::move(names);
+    } else if (!context->GetReadFieldNames().empty()) {
+        output_fields = context->GetReadFieldNames();
+    }
+    std::set<std::string> predicate_fields;
+    if (context->GetPredicate() != nullptr) {
+        PAIMON_RETURN_NOT_OK(
+            PredicateUtils::GetAllNames(context->GetPredicate(), 
&predicate_fields));
+    }
+    std::vector<std::string> requested = 
output_fields.value_or(std::vector<std::string>());
+    requested.insert(requested.end(), predicate_fields.begin(), 
predicate_fields.end());
+    for (const std::string& name : requested) {
+        if (!table_schema->GetField(name).ok()) {
+            return Status::NotImplemented(fmt::format(
+                "Column '{}' is not a column of the table schema, which is all 
a query-auth read "
+                "can authorize.",
+                name));
+        }
+    }
+    std::unique_ptr<QueryAuthTableRead> read(new QueryAuthTableRead(
+        context, table_schema, arrow_pool, std::move(create_inner), 
std::move(output_fields)));
+    // Built now, so a read the table cannot serve fails here rather than at 
the first split.
+    PAIMON_RETURN_NOT_OK(read->GetOrCreateInnerRead({}).status());
+    return std::unique_ptr<TableRead>(std::move(read));
+}
+
+QueryAuthTableRead::QueryAuthTableRead(const std::shared_ptr<ReadContext>& 
context,
+                                       const std::shared_ptr<TableSchema>& 
table_schema,
+                                       const 
std::shared_ptr<arrow::MemoryPool>& arrow_pool,
+                                       InnerReadFactory create_inner,
+                                       std::optional<std::vector<std::string>> 
output_fields)
+    : context_(context),
+      table_schema_(table_schema),
+      arrow_pool_(arrow_pool),
+      create_inner_(std::move(create_inner)),
+      output_fields_(std::move(output_fields)) {}
+
+Result<std::shared_ptr<Predicate>> QueryAuthTableRead::PostMaskFilter(
+    const TableQueryAuthResult& rules) const {
+    const std::shared_ptr<Predicate>& predicate = context_->GetPredicate();
+    if (predicate == nullptr || context_->EnablePredicateFilter()) {
+        return predicate;
+    }
+    // As Java `ReadTransform`: the scan did not prune by the conjuncts on 
masked columns, so the
+    // read evaluates them even when the caller evaluates the rest of its 
predicate itself.
+    const std::set<std::string> masked_fields = rules.MaskedFields();
+    std::vector<std::shared_ptr<Predicate>> masked_conjuncts;
+    for (const std::shared_ptr<Predicate>& conjunct : 
PredicateUtils::SplitAnd(predicate)) {
+        PAIMON_ASSIGN_OR_RAISE(bool masked,
+                               PredicateUtils::ContainAnyField(conjunct, 
masked_fields));
+        if (masked) {
+            masked_conjuncts.push_back(conjunct);
+        }
+    }
+    if (masked_conjuncts.empty()) {
+        return std::shared_ptr<Predicate>();
+    }
+    return PredicateBuilder::And(masked_conjuncts);
+}
+
+Result<TableRead*> QueryAuthTableRead::GetOrCreateInnerRead(
+    const std::vector<std::string>& extra_fields) {
+    auto iter = inner_reads_.find(extra_fields);
+    if (iter != inner_reads_.end()) {
+        return iter->second.get();
+    }
+    std::vector<std::string> read_field_names = context_->GetReadFieldNames();
+    std::vector<int32_t> read_field_ids = context_->GetReadFieldIds();
+    if (!read_field_ids.empty()) {
+        for (const std::string& name : extra_fields) {
+            PAIMON_ASSIGN_OR_RAISE(DataField field, 
table_schema_->GetField(name));
+            read_field_ids.push_back(field.Id());
+        }
+    } else if (!read_field_names.empty()) {
+        read_field_names.insert(read_field_names.end(), extra_fields.begin(), 
extra_fields.end());
+    }
+    // Without the predicate: file statistics and indexes hold raw values.
+    auto inner_context = std::make_unique<ReadContext>(
+        context_->GetPath(), context_->GetBranch(), read_field_names, 
read_field_ids,
+        /*predicate=*/nullptr, /*vector_search=*/nullptr, 
/*full_text_search=*/nullptr,
+        /*enable_precise_file_index_evaluate=*/false, 
/*enable_predicate_filter=*/false,
+        context_->EnablePrefetch(), context_->EnableLateMaterializing(),
+        context_->GetPrefetchBatchCount(), 
context_->GetPrefetchMaxParallelNum(),
+        context_->EnableMultiThreadRowToBatch(), 
context_->GetRowToBatchThreadNumber(),
+        context_->GetSpecificTableSchema(), context_->GetMemoryPool(), 
context_->GetExecutor(),
+        context_->GetSpecificFileSystem(), 
context_->GetFileSystemSchemeToIdentifierMap(),
+        /*realtime_context=*/nullptr, context_->GetOptions(), 
context_->ReadAheadCacheEnabled(),
+        context_->GetCacheConfig(), context_->GetCache(), 
context_->GetFormatTable(),
+        context_->GetWarmupLevel(), context_->GetCatalog(), 
context_->GetIdentifier());
+    PAIMON_ASSIGN_OR_RAISE(std::unique_ptr<TableRead> read,
+                           create_inner_(std::move(inner_context)));
+    TableRead* raw_read = read.get();
+    inner_reads_.emplace(extra_fields, std::move(read));
+    return raw_read;
+}
+
+Status QueryAuthTableRead::ValidateSplit(const QueryAuthSplit& split,
+                                         const std::set<std::string>& 
filter_fields) const {
+    if (!split.GetScope()) {
+        return Status::Invalid(
+            "The split does not record which columns its query auth rules were 
authorized for, "
+            "as a split Java planned does not; refusing to read it. Plan the 
scan with "
+            "paimon-cpp.");
+    }
+    const QueryAuthScope& scope = split.GetScope().value();
+    const TableQueryAuthResult& rules = *split.GetAuthResult();
+    const std::vector<DataField>& fields = table_schema_->Fields();
+    // The field ids are checked first, so a renamed column is reported as 
such rather than as a
+    // missing one.
+    PAIMON_RETURN_NOT_OK(rules.ValidateFieldIds(scope.rule_field_ids, fields));
+    PAIMON_RETURN_NOT_OK(rules.ValidateAgainstSchema(fields));
+    // The columns the rules read themselves are the catalog's own and need no 
authorization.
+    for (const DataField& field : fields) {
+        const bool read = filter_fields.count(field.Name()) > 0 || 
!output_fields_ ||
+                          ObjectUtils::Contains(output_fields_.value(), 
field.Name());
+        if (!read) {
+            continue;
+        }
+        auto authorized = scope.authorized_field_ids.find(field.Name());
+        if (authorized == scope.authorized_field_ids.end()) {
+            return Status::Invalid(
+                fmt::format("Column '{}' is read, but the scan did not ask the 
catalog to "
+                            "authorize it: name it in 
ScanContextBuilder::SetReadFieldNames().",
+                            field.Name()));
+        }
+        if (authorized->second != field.Id()) {
+            return Status::Invalid(fmt::format(
+                "Column '{}' is read as field {}, but the scan authorized 
field {} under that "
+                "name: the schema changed since the plan. Plan the scan 
again.",
+                field.Name(), field.Id(), authorized->second));
+        }
+    }
+    return Status::OK();
+}
+
+Result<std::unique_ptr<BatchReader>> QueryAuthTableRead::CreateReader(
+    const std::shared_ptr<Split>& split) {
+    auto auth_split = std::dynamic_pointer_cast<QueryAuthSplit>(split);
+    if (auth_split == nullptr || auth_split->GetAuthResult() == nullptr) {
+        return Status::Invalid(fmt::format(
+            "A split of a table with '{}=true' must be planned by a scan of 
the table through its "
+            "catalog, which attaches the row filters and column masks it is 
read with.",
+            Options::QUERY_AUTH_ENABLED));
+    }
+    const TableQueryAuthResult& rules = *auth_split->GetAuthResult();
+    PAIMON_ASSIGN_OR_RAISE(std::shared_ptr<Predicate> filter, 
PostMaskFilter(rules));
+    std::set<std::string> filter_fields;
+    if (filter != nullptr) {
+        PAIMON_RETURN_NOT_OK(PredicateUtils::GetAllNames(filter, 
&filter_fields));
+    }
+    Status valid = ValidateSplit(*auth_split, filter_fields);
+    if (!valid.ok()) {
+        return valid.WithMessage(fmt::format("Query auth read of {} (schema 
{}): {}",
+                                             context_->GetPath(), 
table_schema_->Id(),
+                                             valid.message()));
+    }
+
+    if (rules.RejectsAllRows()) {
+        return 
std::unique_ptr<BatchReader>(std::make_unique<ConcatBatchReader>(
+            std::vector<std::unique_ptr<BatchReader>>(), arrow_pool_));
+    }
+
+    // The columns read only for the rules or for the predicate, dropped from 
the output.
+    std::vector<std::string> extra_fields;
+    if (output_fields_) {
+        std::set<std::string> output(output_fields_->begin(), 
output_fields_->end());
+        std::vector<std::string> visible = output_fields_.value();
+        for (const std::string& field : filter_fields) {
+            if (output.count(field) == 0) {
+                visible.push_back(field);
+            }
+        }
+        std::set<std::string> required = rules.RequiredFields(visible);
+        required.insert(filter_fields.begin(), filter_fields.end());
+        for (const DataField& field : table_schema_->Fields()) {
+            if (required.count(field.Name()) > 0 && output.count(field.Name()) 
== 0) {
+                extra_fields.push_back(field.Name());
+            }
+        }
+    }
+    PAIMON_ASSIGN_OR_RAISE(TableRead * inner, 
GetOrCreateInnerRead(extra_fields));
+    PAIMON_ASSIGN_OR_RAISE(std::unique_ptr<BatchReader> reader,
+                           inner->CreateReader(auth_split->GetSplit()));
+    // Wrapping it can fail, and `PredicateBatchReader::Create()` keeps the 
reader it refuses.
+    ScopeGuard close_guard([&reader]() {
+        if (reader) {
+            reader->Close();
+        }
+    });
+
+    // The row filter sees the raw values, the predicate of the read the 
masked ones. Each reads
+    // its columns decoded, which `PredicateBatchReader` requires.
+    const std::map<std::string, std::shared_ptr<MaskTransform>> no_masks;
+    if (rules.RowFilter() != nullptr) {
+        reader = std::make_unique<QueryAuthBatchReader>(std::move(reader), 
no_masks,
+                                                        
/*dropped_fields=*/std::set<std::string>(),
+                                                        
rules.RowFilterFields(), arrow_pool_);

Review Comment:
   Fixed in 6d629cc3. Under a row filter, `QueryAuthBatchReader` now gets the 
table's logical struct type and runs 
`ArrowUtils::FlattenUnresolvableDictionaries()` with 
`preserve_layout_recoverable_dictionaries=false` before the filter. Every 
column holding a dictionary at any depth is cast to its logical type, so no 
top-level column or nested child is output dictionary-encoded, and B's values 
cannot stay behind in `ArrowArray::dictionary`. Without a row filter no rows 
are dropped, so columns are still output as the file reader returned them.
   
   `QueryAuthTableReadTest.TestRowFilterRemovesRowsFromTheBatchWithBitmap` 
builds a dictionary-encoded `email` column whose dictionary holds B's address. 
It uses that column at top level and inside a struct, a list and a map, filters 
to tenant A, and checks through both `CreateReader()` overloads that no 
`ArrowArray` in the output has a dictionary and that only A's rows remain. 
`TableTest.TestQueryAuthFiltersDictionaryEncodedParquetColumns` now expects the 
Parquet `phone` column decoded under a row filter and still dictionary-encoded 
with no rules. The behavior is described in `catalog.rst`.
   



##########
src/paimon/core/table/table.cpp:
##########
@@ -640,10 +643,65 @@ class TableScanImpl {
     }
 };
 
+/// Returns `options` with `query-auth.enabled` turned on when the current 
settings of `branch`
+/// enable it: the options of the schema the catalog holds for that branch, as 
Java loads the table
+/// of the branch it reads, or, when the caller hands in a cached schema, 
those of the latest schema
+/// of the branch under `path`, so a stale cache cannot skip the rules.
+Result<std::map<std::string, std::string>> ResolveQueryAuthReadOptions(
+    const std::shared_ptr<Catalog>& catalog, const std::optional<Identifier>& 
identifier,
+    const std::map<std::string, std::string>& options, const std::string& 
branch,
+    const std::shared_ptr<FileSystem>& file_system, const std::string& path,
+    bool has_specific_table_schema) {
+    bool enabled = false;
+    if (catalog != nullptr) {
+        
PAIMON_RETURN_NOT_OK(BranchManager::CheckCatalogAddressableBranch(branch));
+        if (!identifier) {
+            return Status::Invalid("a catalog read requires a table 
identifier");
+        }
+        if 
(!CatalogUtils::IsSystemDatabase(identifier.value().GetDatabaseName())) {
+            PAIMON_ASSIGN_OR_RAISE(Identifier table_identifier,
+                                   
CatalogUtils::BranchIdentifier(identifier.value(), branch));
+            PAIMON_ASSIGN_OR_RAISE(std::shared_ptr<Schema> schema,
+                                   catalog->LoadTableSchema(table_identifier));

Review Comment:
   Fixed in 6d629cc3. When the catalog's schema leaves `query-auth.enabled` 
off, `TableScan::Create()` and `TableRead::Create()` now require the path to be 
the location the catalog keeps the identifier and branch at, through 
`CatalogUtils::CheckPathIsTableLocation()`. For a system table path, its table 
path is checked. If the paths differ, both fail with `Invalid` before planning 
or reading, so A's disabled setting is never taken for B's files. A 
`QueryAuthCatalog` returns the schema and location from one 
`LoadTableSchemaAndLocation()` call (one `GetTable` response for REST), so the 
two cannot come from different generations of a recreated table. A catalog 
without that interface is checked through `GetTableLocation()`. An identifier 
in the `sys` database is now only accepted with a global system table path, so 
it cannot skip a data table's policy either.
   
   `TableTest.TestCatalogDisablesQueryAuthOnlyForTheTableAtItsLocation` creates 
A and B without the option. Using both a query-auth catalog and a plain 
catalog, it checks that scans and reads of B's path and of `B$files` with A's 
identifier are refused, without any auth request, while A's own path still 
works. `RestCatalogTest.ReadThroughTheCatalogAppliesItsQueryAuth` checks that a 
`sys` identifier is refused for a data table path and its `$files`.
   



##########
src/paimon/core/table/table.cpp:
##########
@@ -720,13 +778,21 @@ Result<std::unique_ptr<TableScan>> 
TableScan::Create(std::unique_ptr<ScanContext
     if (shared_context->GetRealtimeContext()) {
         
PAIMON_RETURN_NOT_OK(RealtimeUtils::ValidateBranch(tmp_options.GetBranch()));
     }
+    std::map<std::string, std::string> read_options;
+    PAIMON_ASSIGN_OR_RAISE(
+        read_options,
+        ResolveQueryAuthReadOptions(shared_context->GetCatalog(), 
shared_context->GetIdentifier(),
+                                    shared_context->GetOptions(),
+                                    
BranchManager::NormalizeBranch(tmp_options.GetBranch()),

Review Comment:
   Fixed in 6d629cc3. The effective branch is now resolved once from the system 
table path along with the identifier, the `branch` option and `WithBranch()`:
   
   - `ScanContextBuilder::Finish()` and `ReadContextBuilder::Finish()` resolve 
the branch `tbl$branch_dev$files` names before requesting the table's file 
system, carry it into the identifier (`t$branch_dev`, or `t$branch_dev$files`) 
and refuse conflicting branches before the catalog is asked for anything.
   - `ResolveQueryAuthReadOptions()` resolves the path's branch the way 
`SystemTableLoader::LoadFromPath()` does and loads the catalog schema of that 
branch, so the policy check and the system table load always use the same 
branch.
   
   `TableTest.TestQueryAuthSystemTablesValidateTheBranchRead` uses a catalog 
that enables query auth only for branch `restricted`, whose on-disk schema 
lacks the option. It checks that `$branch_restricted$` plus `files`, 
`manifests`, `binlog`, `audit_log` and `ro` are refused for both scans and 
reads, that the catalog was asked for `bar$branch_restricted`, and that 
`$files` on main still works. 
`ScanContextTest`/`ReadContextTest.TestSystemTablePathResolvesBranchBeforeCatalogRequest`
 check the identifier the credentials are requested for, the conflict errors 
and that a refused branch makes no catalog request.
   



##########
src/paimon/core/table/source/query_auth_table_scan.cpp:
##########
@@ -0,0 +1,409 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+#include "paimon/core/table/source/query_auth_table_scan.h"
+
+#include <algorithm>
+#include <chrono>
+#include <map>
+#include <optional>
+#include <utility>
+#include <vector>
+
+#include "arrow/c/abi.h"
+#include "arrow/c/bridge.h"
+#include "fmt/format.h"
+#include "paimon/common/utils/arrow/status_utils.h"
+#include "paimon/common/utils/object_utils.h"
+#include "paimon/common/utils/path_util.h"
+#include "paimon/common/utils/string_utils.h"
+#include "paimon/core/catalog/catalog_utils.h"
+#include "paimon/core/catalog/query_auth_catalog.h"
+#include "paimon/core/schema/schema_manager.h"
+#include "paimon/core/table/source/plan_impl.h"
+#include "paimon/core/table/source/query_auth_split.h"
+#include "paimon/core/utils/branch_manager.h"
+#include "paimon/defs.h"
+#include "paimon/predicate/predicate.h"
+#include "paimon/predicate/predicate_builder.h"
+#include "paimon/predicate/predicate_utils.h"
+#include "paimon/schema/schema.h"
+#include "paimon/status.h"
+
+namespace paimon {
+namespace {
+
+std::set<std::string> Intersect(const std::set<std::string>& left,
+                                const std::set<std::string>& right) {
+    std::set<std::string> result;
+    for (const std::string& value : left) {
+        if (right.count(value) > 0) {
+            result.insert(value);
+        }
+    }
+    return result;
+}
+
+Status CheckNoMaskedPartitionFilter(const std::set<std::string>& 
partition_filter_fields,
+                                    const std::set<std::string>& 
masked_fields) {
+    const std::set<std::string> masked = Intersect(partition_filter_fields, 
masked_fields);
+    if (!masked.empty()) {
+        return Status::NotImplemented(fmt::format(
+            "A partition filter cannot be enforced on masked partition key 
'{}': it is matched "
+            "against the raw partition value. Filter on the column through the 
predicate instead.",
+            *masked.begin()));
+    }
+    return Status::OK();
+}
+
+const DataField* FindField(const std::vector<DataField>& fields, const 
std::string& name) {
+    auto iter = std::find_if(fields.begin(), fields.end(),
+                             [&](const DataField& field) { return field.Name() 
== name; });
+    return iter != fields.end() ? &*iter : nullptr;
+}
+
+std::string FieldIdOrAbsent(const DataField* field) {
+    return field != nullptr ? std::to_string(field->Id()) : 
std::string("absent");
+}
+
+bool SameLocation(const Path& left, const Path& right) {
+    auto scheme = [](const Path& path) {
+        std::string lower = StringUtils::ToLowerCase(path.scheme);
+        return lower.empty() ? std::string("file") : lower;
+    };
+    return scheme(left) == scheme(right) && left.authority == right.authority 
&&
+           left.path == right.path;
+}
+
+/// Fails unless `path` is where the catalog keeps `identifier`, so the rules 
the catalog serves
+/// for one table are never applied to the files of another.
+Status CheckPathIsTableLocation(const Catalog& catalog, const Identifier& 
identifier,
+                                const std::string& path) {
+    Result<std::string> location = catalog.GetTableLocation(identifier);
+    if (!location.ok()) {
+        return location.status().WithMessage(fmt::format(
+            "Cannot check that {} is the location of table {}, whose query 
auth rules the scan "
+            "applies: {}",
+            path, identifier.GetFullName(), location.status().message()));
+    }
+    PAIMON_ASSIGN_OR_RAISE(Path expected, PathUtil::ToPath(location.value()));
+    PAIMON_ASSIGN_OR_RAISE(Path actual, PathUtil::ToPath(path));
+    if (!SameLocation(expected, actual)) {
+        return Status::Invalid(fmt::format(
+            "The scan reads {}, but the catalog keeps table {}, whose query 
auth rules it would "
+            "apply, at {}. Scan the location the catalog returns for the 
table.",
+            path, identifier.GetFullName(), location.value()));
+    }
+    return Status::OK();
+}
+
+}  // namespace
+
+Result<std::unique_ptr<TableScan>> QueryAuthTableScan::Create(
+    const std::shared_ptr<ScanContext>& context, const 
std::shared_ptr<TableSchema>& table_schema,
+    const std::shared_ptr<FileSystem>& file_system, const std::string& branch,
+    InnerScanFactory create_inner) {
+    if (context->GetCatalog() == nullptr || !context->GetIdentifier()) {
+        return Status::NotImplemented(fmt::format(
+            "Cannot read a table with '{}=true' without the catalog that 
serves its row filters "
+            "and column masks: build the scan with 
ScanContextBuilder::WithCatalog().",
+            Options::QUERY_AUTH_ENABLED));
+    }
+    const QueryAuthCatalog* auth_catalog = 
AsQueryAuthCatalog(context->GetCatalog());
+    if (auth_catalog == nullptr) {
+        return Status::NotImplemented(fmt::format(
+            "Cannot read a table with '{}=true': its catalog does not support 
the query auth "
+            "interface.",
+            Options::QUERY_AUTH_ENABLED));
+    }
+    if (context->GetGlobalIndexResult() != nullptr) {
+        return Status::NotImplemented(
+            "Search is not supported on a query-auth table: the index ranks 
raw values, which a "
+            "column mask invalidates.");
+    }
+    if (context->GetRealtimeContext() != nullptr) {
+        return Status::NotImplemented("Real-time reads are not supported on a 
query-auth table.");
+    }
+    // The rules are asked for the branch planned, even when only the options 
name it.
+    PAIMON_ASSIGN_OR_RAISE(std::string resolved_branch,
+                           
BranchManager::ResolveBranch(context->GetIdentifier(),
+                                                        context->GetOptions(), 
branch, "scan"));
+    PAIMON_ASSIGN_OR_RAISE(
+        Identifier auth_identifier,
+        
CatalogUtils::ResolvedBranchIdentifier(context->GetIdentifier().value(), 
resolved_branch));
+    PAIMON_RETURN_NOT_OK(
+        CheckPathIsTableLocation(*context->GetCatalog(), auth_identifier, 
context->GetPath()));
+    std::set<std::string> user_filter_fields;
+    std::set<std::string> partition_filter_fields;
+    const std::shared_ptr<ScanFilter>& scan_filter = context->GetScanFilters();
+    if (scan_filter != nullptr) {
+        if (scan_filter->GetPredicate() != nullptr) {
+            PAIMON_RETURN_NOT_OK(
+                PredicateUtils::GetAllNames(scan_filter->GetPredicate(), 
&user_filter_fields));
+        }
+        for (const auto& partition : scan_filter->GetPartitionFilters()) {
+            for (const auto& [key, value] : partition) {
+                partition_filter_fields.insert(key);
+            }
+        }
+    }
+    // As in Java, the operands of the filters are authorized along with the 
projected columns.
+    const std::optional<std::vector<std::string>>& read_field_names = 
context->GetReadFieldNames();
+    std::vector<std::string> requested = 
read_field_names.value_or(std::vector<std::string>());
+    requested.insert(requested.end(), user_filter_fields.begin(), 
user_filter_fields.end());
+    requested.insert(requested.end(), partition_filter_fields.begin(),
+                     partition_filter_fields.end());
+    std::vector<std::string> columns;
+    std::set<std::string> seen;
+    for (const std::string& name : requested) {
+        if (!table_schema->GetField(name).ok()) {
+            return Status::NotImplemented(fmt::format(
+                "Column '{}' is not a column of the table schema, which is all 
a query-auth scan "
+                "can authorize.",
+                name));
+        }
+        if (seen.insert(name).second) {
+            columns.push_back(name);
+        }
+    }
+    std::optional<std::vector<std::string>> authorization_columns;
+    if (read_field_names) {
+        authorization_columns = std::move(columns);
+    }
+    return std::unique_ptr<TableScan>(new QueryAuthTableScan(
+        context, auth_catalog, std::move(auth_identifier), table_schema, 
file_system,
+        resolved_branch, std::move(create_inner), 
std::move(authorization_columns),
+        std::move(user_filter_fields), std::move(partition_filter_fields)));
+}
+
+QueryAuthTableScan::QueryAuthTableScan(
+    const std::shared_ptr<ScanContext>& context, const QueryAuthCatalog* 
auth_catalog,
+    Identifier auth_identifier, const std::shared_ptr<TableSchema>& 
table_schema,
+    const std::shared_ptr<FileSystem>& file_system, const std::string& branch,
+    InnerScanFactory create_inner, std::optional<std::vector<std::string>> 
authorization_columns,
+    std::set<std::string> user_filter_fields, std::set<std::string> 
partition_filter_fields)
+    : context_(context),
+      auth_catalog_(auth_catalog),
+      auth_identifier_(std::move(auth_identifier)),
+      table_schema_(table_schema),
+      file_system_(file_system),
+      branch_(branch),
+      create_inner_(std::move(create_inner)),
+      authorization_columns_(std::move(authorization_columns)),
+      user_filter_fields_(std::move(user_filter_fields)),
+      partition_filter_fields_(std::move(partition_filter_fields)) {}
+
+std::shared_ptr<Metrics> QueryAuthTableScan::GetMetrics() const {
+    return inner_ != nullptr ? inner_->GetMetrics() : TableScan::GetMetrics();
+}
+
+Status QueryAuthTableScan::AddErrorContext(const Status& status) const {
+    return status.WithMessage(fmt::format("Query auth of {} (branch {}, schema 
{}): {}",
+                                          auth_identifier_.ToString(), 
branch_, table_schema_->Id(),
+                                          status.message()));
+}
+
+Status QueryAuthTableScan::ValidateAgainstCurrentSchemas(const 
TableQueryAuthResult& rules) const {
+    SchemaManager schema_manager(file_system_, context_->GetPath(), branch_);
+    PAIMON_ASSIGN_OR_RAISE(std::optional<std::shared_ptr<TableSchema>> latest,
+                           schema_manager.Latest());
+    const std::shared_ptr<TableSchema>& latest_schema = latest ? 
latest.value() : table_schema_;
+    const std::vector<DataField>& planned_fields = table_schema_->Fields();
+    const std::vector<DataField>& latest_fields = latest_schema->Fields();
+    // The catalog authorizes the columns by their names in the latest schema, 
so each must still
+    // be the field the scan plans under that name, whether or not the rules 
mention it.
+    std::vector<std::string> columns;
+    if (authorization_columns_) {
+        columns = authorization_columns_.value();
+    } else {
+        for (const DataField& field : planned_fields) {
+            columns.push_back(field.Name());
+        }
+    }
+    auto validate_columns = [&](const std::vector<DataField>& fields, int64_t 
schema_id,
+                                const char* source) -> Status {
+        for (const std::string& column : columns) {
+            const DataField* planned = FindField(planned_fields, column);
+            const DataField* current = FindField(fields, column);
+            if (planned == nullptr || current == nullptr || planned->Id() != 
current->Id()) {
+                return Status::Invalid(fmt::format(
+                    "Column '{}' is field {} in schema {} the scan plans with, 
but field {} in {} "
+                    "{}, under which the catalog authorized it. Create the 
scan again.",
+                    column, FieldIdOrAbsent(planned), table_schema_->Id(), 
FieldIdOrAbsent(current),
+                    source, schema_id));
+            }
+        }
+        return Status::OK();
+    };
+    PAIMON_RETURN_NOT_OK(validate_columns(latest_fields, latest_schema->Id(), 
"the latest schema"));
+    PAIMON_RETURN_NOT_OK(rules.ValidateAgainstSchema(latest_fields));
+    
PAIMON_RETURN_NOT_OK(rules.ValidateFieldIds(rules.BindFieldIds(latest_fields), 
planned_fields));
+    // A rule column the planned schema does not hold would leave every split 
unreadable.
+    PAIMON_RETURN_NOT_OK(
+        rules.ValidateFieldIds(rules.BindFieldIds(planned_fields), 
planned_fields));
+
+    // The catalog can advance its schema before publishing it under the table 
path. It
+    // authorizes current names, so binding those names only to local field 
ids could expose an
+    // old column that the catalog has dropped and replaced with another of 
the same name.
+    PAIMON_ASSIGN_OR_RAISE(std::shared_ptr<Schema> catalog_schema,
+                           
context_->GetCatalog()->LoadTableSchema(auth_identifier_));
+    auto catalog_data_schema = 
std::dynamic_pointer_cast<DataSchema>(catalog_schema);
+    if (catalog_data_schema == nullptr) {
+        return Status::Invalid("Query auth requires a data table schema from 
the catalog.");
+    }
+    PAIMON_ASSIGN_OR_RAISE(std::unique_ptr<::ArrowSchema> c_schema,
+                           catalog_data_schema->GetArrowSchema());
+    PAIMON_ASSIGN_OR_RAISE_FROM_ARROW(std::shared_ptr<arrow::Schema> 
arrow_schema,
+                                      arrow::ImportSchema(c_schema.get()));
+    PAIMON_ASSIGN_OR_RAISE(std::vector<DataField> catalog_fields,
+                           
DataField::ConvertArrowSchemaToDataFields(arrow_schema));
+    PAIMON_RETURN_NOT_OK(
+        validate_columns(catalog_fields, catalog_data_schema->Id(), "catalog 
schema"));
+    PAIMON_RETURN_NOT_OK(rules.ValidateAgainstSchema(catalog_fields));
+    return rules.ValidateFieldIds(rules.BindFieldIds(catalog_fields), 
planned_fields);
+}
+
+Result<std::shared_ptr<TableQueryAuthResult>> 
QueryAuthTableScan::LoadAndValidateRules() const {
+    const auto start = std::chrono::steady_clock::now();
+    Result<std::shared_ptr<TableQueryAuthResult>> rules =
+        auth_catalog_->AuthTableQuery(auth_identifier_, 
authorization_columns_);

Review Comment:
   Fixed in 6d629cc3. On every `CreatePlan()`, after fetching the rules, the 
scan reloads the catalog schema and location from one response through 
`QueryAuthCatalog::LoadTableSchemaAndLocation()`. If the identifier is no 
longer bound to the path being scanned, the plan fails with `Invalid` before 
any split is returned. The same catalog schema is still used to check that the 
selected and rule columns keep their field ids. The splits are now bound as 
well: `QueryAuthScope` records the authorized table location and branch with 
the field ids and is serialized with the split. `QueryAuthTableRead` refuses a 
split authorized for another location or branch, even with matching schemas and 
data file names, including on a worker without the catalog.
   
   `TableTest.TestQueryAuthScanReadsOnlyTheLocationOfTheAuthorizedTable` 
rebinds the identifier to another table between `TableScan::Create()` and the 
first `CreatePlan()` and checks that the plan is refused. 
`TableTest.TestQueryAuthReadRejectsSplitsAuthorizedForAnotherTable` and 
`...AnotherBranch` check the read-side binding through serialized splits. 
`sys.partitions` uses the same one-response location 
(`RestCatalogTest.GlobalPartitionsProtectsQueryAuthPartitionValues`).
   



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to