OSS export.

PiperOrigin-RevId: 354438896

Author: kyessenov

base/BUILD

@@ -10,3 +10,17 @@ cc_library(
         "status_macros.h",
     ],
 )
+
+cc_library(
+    name = "unilib",
+    srcs = [
+        "unilib.cc",
+    ],
+    hdrs = [
+        "unilib.h",
+    ],
+    deps = [
+        "@com_github_google_flatbuffers//:flatbuffers",
+        "@com_google_absl//absl/strings",
+    ],
+)

base/unilib.cc

@@ -0,0 +1,19 @@
+#include "base/unilib.h"
+
+#include "flatbuffers/util.h"
+
+namespace UniLib {
+
+// Detects whether a string is valid UTF-8.
+bool IsStructurallyValid(absl::string_view str) {
+  const char *s = &str[0];
+  const char *const sEnd = s + str.length();
+  while (s < sEnd) {
+    if (flatbuffers::FromUTF8(&s) < 0) {
+      return false;
+    }
+  }
+  return true;
+}
+
+}  // namespace UniLib

base/unilib.h

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * 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.
+ */
+
+#ifndef THIRD_PARTY_CEL_CPP_BASE_UNILIB_H_
+#define THIRD_PARTY_CEL_CPP_BASE_UNILIB_H_
+
+#include "absl/strings/string_view.h"
+
+namespace UniLib {
+
+// Detects whether a string is valid UTF-8.
+bool IsStructurallyValid(absl::string_view str);
+
+}  // namespace UniLib
+
+#endif  // THIRD_PARTY_CEL_CPP_BASE_UNILIB_H_

common/type.cc

@@ -72,7 +72,7 @@ UnrecognizedType::UnrecognizedType(absl::string_view full_name)
     : string_rep_(absl::StrCat("type(\"", full_name, "\")")),
       hash_code_(internal::Hash(full_name)) {
   assert(google::protobuf::DescriptorPool::generated_pool()->FindMessageTypeByName(
-             std.data()::string(full_name)) == nullptr);
+             full_name.data()) == nullptr);
 }
 
 absl::string_view UnrecognizedType::full_name() const {

eval/compiler/BUILD

@@ -229,6 +229,7 @@ cc_test(
     srcs = ["resolver_test.cc"],
     deps = [
         ":resolver",
+        "//base:status_macros",
         "//eval/public:cel_function",
         "//eval/public:cel_function_registry",
         "//eval/public:cel_type_registry",

eval/compiler/flat_expr_builder.cc

@@ -256,7 +256,7 @@ class FlatExprVisitor : public AstVisitor {
       // - id: 'google.type.Expr'
       // - id: 'google.type', field: 'Expr'
       // - id: 'google', field: 'type', field: 'Expr'
-      for (int i = 0; i < namespace_stack_.size(); i++) {
+      for (size_t i = 0; i < namespace_stack_.size(); i++) {
         auto ns = namespace_stack_[i];
         namespace_stack_[i] = {
             ns.first, absl::StrCat(select_expr->field(), ".", ns.second)};

eval/compiler/resolver.cc

@@ -97,7 +97,7 @@ absl::optional<CelValue> Resolver::FindConstant(absl::string_view name,
     // Conditionally resolve fully qualified names as type values if the option
     // to do so is configured in the expression builder. If the type name is
     // not qualified, then it too may be returned as a constant value.
-    if (resolve_qualified_type_identifiers_ || !absl::StrContains(name, '.')) {
+    if (resolve_qualified_type_identifiers_ || !absl::StrContains(name, ".")) {
       auto type_value = type_registry_->FindType(name);
       if (type_value.has_value()) {
         return type_value.value();

eval/compiler/resolver_test.cc

@@ -9,6 +9,7 @@
 #include "eval/public/cel_function_registry.h"
 #include "eval/public/cel_type_registry.h"
 #include "eval/testutil/test_message.pb.h"
+#include "base/status_macros.h"
 
 namespace google {
 namespace api {

eval/public/BUILD

@@ -473,8 +473,8 @@ cc_test(
         ":cel_type_registry",
         "//eval/testutil:test_message_cc_proto",
         "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto",
         "@com_google_googletest//:gtest_main",
+        "@com_google_protobuf//:protobuf",
     ],
 )
 

eval/public/cel_type_registry_test.cc

@@ -1,6 +1,6 @@
 #include "eval/public/cel_type_registry.h"
 
-#include "google/api/expr/v1alpha1/syntax.pb.h"
+#include "google/protobuf/any.pb.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "absl/container/flat_hash_map.h"
@@ -45,9 +45,9 @@ TEST(CelTypeRegistryTest, TestRegisterTypeName) {
 
 TEST(CelTypeRegistryTest, TestFindDescriptorFound) {
   CelTypeRegistry registry;
-  auto desc = registry.FindDescriptor("google.api.expr.Expr");
+  auto desc = registry.FindDescriptor("google.protobuf.Any");
   ASSERT_TRUE(desc != nullptr);
-  EXPECT_THAT(desc->full_name(), Eq("google.api.expr.Expr"));
+  EXPECT_THAT(desc->full_name(), Eq("google.protobuf.Any"));
 }
 
 TEST(CelTypeRegistryTest, TestFindDescriptorNotFound) {
@@ -66,10 +66,10 @@ TEST(CelTypeRegistryTest, TestFindTypeCoreTypeFound) {
 
 TEST(CelTypeRegistryTest, TestFindTypeProtobufTypeFound) {
   CelTypeRegistry registry;
-  auto type = registry.FindType("google.api.expr.Expr");
+  auto type = registry.FindType("google.protobuf.Any");
   ASSERT_TRUE(type.has_value());
   EXPECT_TRUE(type.value().IsCelType());
-  EXPECT_THAT(type.value().CelTypeOrDie().value(), Eq("google.api.expr.Expr"));
+  EXPECT_THAT(type.value().CelTypeOrDie().value(), Eq("google.protobuf.Any"));
 }
 
 TEST(CelTypeRegistryTest, TestFindTypeNotRegisteredTypeNotFound) {