From e83a21db155e06bf65fa88787e24cd4f933c0943 Mon Sep 17 00:00:00 2001 From: Colin Dellow Date: Thu, 5 Jul 2018 21:49:28 -0400 Subject: [PATCH] remove match/regexp support These are only enabled if we implement `xFindFunction`, which we don't --- parquet/parquet.cc | 4 ---- parquet/parquet_filter.cc | 6 ------ parquet/parquet_filter.h | 2 -- 3 files changed, 12 deletions(-) diff --git a/parquet/parquet.cc b/parquet/parquet.cc index 6b4786c..9d5857e 100644 --- a/parquet/parquet.cc +++ b/parquet/parquet.cc @@ -461,14 +461,10 @@ ConstraintOperator constraintOperatorFromSqlite(int op) { return LessThan; case SQLITE_INDEX_CONSTRAINT_GE: return GreaterThanOrEqual; - case SQLITE_INDEX_CONSTRAINT_MATCH: - return Match; case SQLITE_INDEX_CONSTRAINT_LIKE: return Like; case SQLITE_INDEX_CONSTRAINT_GLOB: return Glob; - case SQLITE_INDEX_CONSTRAINT_REGEXP: - return Regexp; case SQLITE_INDEX_CONSTRAINT_NE: return NotEqual; case SQLITE_INDEX_CONSTRAINT_ISNOT: diff --git a/parquet/parquet_filter.cc b/parquet/parquet_filter.cc index 7095b65..4220dc2 100644 --- a/parquet/parquet_filter.cc +++ b/parquet/parquet_filter.cc @@ -61,18 +61,12 @@ std::string Constraint::describe() const { case GreaterThanOrEqual: rv.append(">="); break; - case Match: - rv.append("MATCH"); - break; case Like: rv.append("LIKE"); break; case Glob: rv.append("GLOB"); break; - case Regexp: - rv.append("REGEXP"); - break; case NotEqual: rv.append("<>"); break; diff --git a/parquet/parquet_filter.h b/parquet/parquet_filter.h index d9f336e..fd95dbb 100644 --- a/parquet/parquet_filter.h +++ b/parquet/parquet_filter.h @@ -11,10 +11,8 @@ enum ConstraintOperator { LessThanOrEqual, LessThan, GreaterThanOrEqual, - Match, Like, Glob, - Regexp, NotEqual, IsNot, IsNotNull,