add import for re2.BUILD remove tfx_bsl sql_util dependencies

Author: andrewfulton9

WORKSPACE

@@ -100,6 +100,16 @@ http_archive(
     url = "https://github.com/abseil/abseil-cpp/archive/%s.tar.gz" % COM_GOOGLE_ABSL_COMMIT,
 )
 
+
+# re2 required for google tests
+http_archive(
+    name = "com_googlesource_code_re2",
+    #    build_file = "//third_party:re2.BUILD",
+    sha256 = "b90430b2a9240df4459108b3e291be80ae92c68a47bc06ef2dc419c5724de061",
+    strip_prefix = "re2-a276a8c738735a0fe45a6ee590fe2df69bcf4502",
+    urls = ["https://github.com/google/re2/archive/a276a8c738735a0fe45a6ee590fe2df69bcf4502.tar.gz"],
+)
+
 # Will be loaded by workspace.bzl from head
 # TFMD_COMMIT = "404805761e614561cceedc429e67c357c62be26d"  # 1.17.1
 

tensorflow_data_validation/anomalies/BUILD

@@ -435,7 +435,6 @@ cc_library(
         ":status_util",
         "//tensorflow_data_validation/anomalies/proto:custom_validation_config_proto_cc_pb2",
         "@com_github_tensorflow_metadata//tensorflow_metadata/proto/v0:metadata_v0_proto_cc_pb2",
-        "@com_github_tfx_bsl//tfx_bsl/cc/statistics:sql_util",
         "@com_google_absl//absl/base:log_severity",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/log",

tensorflow_data_validation/anomalies/custom_validation.cc

@@ -22,7 +22,6 @@ limitations under the License.
 #include "tensorflow_data_validation/anomalies/path.h"
 #include "tensorflow_data_validation/anomalies/schema_util.h"
 #include "tensorflow_data_validation/anomalies/status_util.h"
-#include "tfx_bsl/cc/statistics/sql_util.h"
 #include "tensorflow_metadata/proto/v0/anomalies.pb.h"
 #include "tensorflow_metadata/proto/v0/path.pb.h"
 #include "tensorflow_metadata/proto/v0/statistics.pb.h"
@@ -193,24 +192,6 @@ absl::Status CustomValidateStatistics(
     TFDV_RETURN_IF_ERROR(GetFeatureStatistics(
         named_test_statistics, feature_validation.dataset_name(),
         feature_validation.feature_path(), &test_statistics));
-    for (const auto& validation : feature_validation.validations()) {
-      if (InCurrentEnvironment(validation, environment)) {
-        absl::StatusOr<bool> query_result =
-            tfx_bsl::statistics::EvaluatePredicate(test_statistics,
-                                                   validation.sql_expression());
-        if (!query_result.ok()) {
-          return absl::InternalError(absl::StrCat(
-              "Attempt to run query '", validation.sql_expression(),
-              "' failed with error: ", query_result.status().ToString()));
-        } else if (!query_result.value()) {
-          // If the sql_expression evaluates to False, there is an anomaly.
-          TFDV_RETURN_IF_ERROR(UpdateAnomalyResults(
-              feature_validation.feature_path(),
-              feature_validation.dataset_name(), absl::nullopt, absl::nullopt,
-              validation, result));
-        }
-      }
-    }
   }
   if (validations.feature_pair_validations_size() > 0) {
     if (base_statistics == nullptr) {
@@ -231,28 +212,6 @@ absl::Status CustomValidateStatistics(
       TFDV_RETURN_IF_ERROR(GetFeatureStatistics(
           named_base_statistics, feature_pair_validation.base_dataset_name(),
           feature_pair_validation.feature_base_path(), &base_statistics));
-      for (const auto& validation : feature_pair_validation.validations()) {
-        if (InCurrentEnvironment(validation, environment)) {
-          absl::StatusOr<bool> query_result =
-              tfx_bsl::statistics::EvaluatePredicate(
-                  base_statistics, test_statistics,
-                  validation.sql_expression());
-          if (!query_result.ok()) {
-            return absl::InternalError(absl::StrCat(
-                "Attempt to run query: ", validation.sql_expression(),
-                " failed with the following error: ",
-                query_result.status().ToString()));
-          } else if (!query_result.value()) {
-            // If the sql_expression evaluates to False, there is an anomaly.
-            TFDV_RETURN_IF_ERROR(UpdateAnomalyResults(
-                feature_pair_validation.feature_test_path(),
-                feature_pair_validation.dataset_name(),
-                feature_pair_validation.base_dataset_name(),
-                feature_pair_validation.feature_base_path(), validation,
-                result));
-          }
-        }
-      }
     }
   }
   return absl::OkStatus();

tensorflow_data_validation/workspace.bzl

@@ -14,6 +14,6 @@ def tf_data_validation_workspace():
 
     git_repository(
         name = "com_github_tfx_bsl",
-        branch = "master",
-        remote = "https://github.com/tensorflow/tfx-bsl",
+        branch = "m1_build",
+        remote = "https://github.com/andrewfulton9/tfx-bsl",
     )