Skip to content

Remove references to now unused option use_legacy_container_builders. #1157

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
merged 1 commit into from
Jan 9, 2025
Merged

Remove references to now unused option use_legacy_container_builders. #1157

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
3 changes: 1 addition & 2 deletions eval/public/cel_options.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ cel::RuntimeOptions ConvertToRuntimeOptions(const InterpreterOptions& options) {
options.enable_empty_wrapper_null_unboxing,
options.enable_lazy_bind_initialization,
options.max_recursion_depth,
options.enable_recursive_tracing,
options.use_legacy_container_builders};
options.enable_recursive_tracing};
}

} // namespace google::api::expr::runtime
9 changes: 0 additions & 9 deletions eval/public/cel_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,15 +183,6 @@ struct InterpreterOptions {
// Unlike the stack machine implementation, supporting tracing can affect
// performance whether or not tracing is requested for a given evaluation.
bool enable_recursive_tracing = false;

// Use legacy containers for lists and maps when possible.
//
// For interoperating with legacy APIs, it can be more efficient to maintain
// the list/map representation as CelValues. Requires using an Arena,
// otherwise modern implementations are used.
//
// Default is true for the legacy options type.
bool use_legacy_container_builders = true;
};
// LINT.ThenChange(//depot/google3/runtime/runtime_options.h)

Expand Down
2 changes: 0 additions & 2 deletions runtime/optional_types_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ class OptionalTypesTest

TEST_P(OptionalTypesTest, RecursivePlan) {
RuntimeOptions opts;
opts.use_legacy_container_builders = false;
opts.enable_qualified_type_identifiers = true;
opts.max_recursion_depth = -1;
opts.short_circuiting = EnableShortCircuiting();
Expand Down Expand Up @@ -223,7 +222,6 @@ TEST_P(OptionalTypesTest, RecursivePlan) {

TEST_P(OptionalTypesTest, Defaults) {
RuntimeOptions opts;
opts.use_legacy_container_builders = false;
opts.enable_qualified_type_identifiers = true;
opts.short_circuiting = EnableShortCircuiting();
const EvaluateResultTestCase& test_case = GetTestCase();
Expand Down
4 changes: 0 additions & 4 deletions runtime/runtime_builder_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include "runtime/internal/runtime_impl.h"
#include "runtime/runtime_builder.h"
#include "runtime/runtime_options.h"
#include "runtime/type_registry.h"
#include "google/protobuf/descriptor.h"

namespace cel {
Expand Down Expand Up @@ -63,9 +62,6 @@ absl::StatusOr<RuntimeBuilder> CreateRuntimeBuilder(
auto& type_registry = runtime_impl->type_registry();
auto& function_registry = runtime_impl->function_registry();

type_registry.set_use_legacy_container_builders(
options.use_legacy_container_builders);

return RuntimeBuilder(type_registry, function_registry,
std::move(runtime_impl));
}
Expand Down
9 changes: 0 additions & 9 deletions runtime/runtime_options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,6 @@ struct RuntimeOptions {
// Unlike the stack machine implementation, supporting tracing can affect
// performance whether or not tracing is requested for a given evaluation.
bool enable_recursive_tracing = false;

// Use legacy containers for lists and maps when possible.
//
// For interoperating with legacy APIs, it can be more efficient to maintain
// the list/map representation as CelValues. Requires using an Arena,
// otherwise modern implementations are used.
//
// Default is false for the modern option type.
bool use_legacy_container_builders = false;
};
// LINT.ThenChange(//depot/google3/eval/public/cel_options.h)

Expand Down
1 change: 0 additions & 1 deletion runtime/type_registry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ class TypeRegistry {

// Returns the effective type provider.
const TypeProvider& GetComposedTypeProvider() const { return type_provider_; }
void set_use_legacy_container_builders(bool use_legacy_container_builders) {}

private:
friend const runtime_internal::RuntimeTypeProvider&
Expand Down