add regular chars

oap-project · Aug 9, 2023 · 4720fc9 · 4720fc9
1 parent d26b6de
commit 4720fc9
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 15 deletions.
diff --git a/velox/type/Subfield.cpp b/velox/type/Subfield.cpp
@@ -18,8 +18,10 @@
 
 namespace facebook::velox::common {
 
-Subfield::Subfield(const std::string& path) {
-  Tokenizer tokenizer(path);
+Subfield::Subfield(
+    const std::string& path,
+    const std::optional<std::vector<char>>& separators) {
+  Tokenizer tokenizer(path, separators);
   VELOX_CHECK(tokenizer.hasNext(), "Column name is missing: {}", path);
 
   auto firstElement = tokenizer.next();

diff --git a/velox/type/Subfield.h b/velox/type/Subfield.h
@@ -191,7 +191,9 @@ class Subfield {
   };
 
  public:
-  explicit Subfield(const std::string& path);
+  explicit Subfield(
+      const std::string& path,
+      const std::optional<std::vector<char>>& separators);
 
   explicit Subfield(std::vector<std::unique_ptr<PathElement>>&& path);
 

diff --git a/velox/type/Tokenizer.cpp b/velox/type/Tokenizer.cpp
@@ -17,9 +17,15 @@
 
 namespace facebook::velox::common {
 
-Tokenizer::Tokenizer(const std::string& path) : path_(path) {
+Tokenizer::Tokenizer(
+    const std::string& path,
+    const std::optional<std::vector<char>>& separators)
+    : path_(path) {
   state = State::kNotReady;
   index_ = 0;
+  if (separators.has_value()) {
+    separators_ = separators.value();
+  }
 }
 
 bool Tokenizer::hasNext() {
@@ -54,17 +60,17 @@ std::unique_ptr<Subfield::PathElement> Tokenizer::computeNext() {
     return nullptr;
   }
 
-  if (tryMatch(DOT)) {
+  if (tryMatchSeparator(DOT)) {
     std::unique_ptr<Subfield::PathElement> token = matchPathSegment();
     firstSegment = false;
     return token;
   }
 
-  if (tryMatch(OPEN_BRACKET)) {
-    std::unique_ptr<Subfield::PathElement> token = tryMatch(QUOTE)
+  if (tryMatchSeparator(OPEN_BRACKET)) {
+    std::unique_ptr<Subfield::PathElement> token = tryMatchSeparator(QUOTE)
         ? matchQuotedSubscript()
-        : tryMatch(WILDCARD) ? matchWildcardSubscript()
-                             : matchUnquotedSubscript();
+        : tryMatchSeparator(WILDCARD) ? matchWildcardSubscript()
+                                      : matchUnquotedSubscript();
 
     match(CLOSE_BRACKET);
     firstSegment = false;
@@ -80,6 +86,10 @@ std::unique_ptr<Subfield::PathElement> Tokenizer::computeNext() {
   VELOX_UNREACHABLE();
 }
 
+bool Tokenizer::tryMatchSeparator(char expected) {
+  return isSeparator(expected) && tryMatch(expected);
+}
+
 void Tokenizer::match(char expected) {
   if (!tryMatch(expected)) {
     invalidSubfieldPath();
@@ -105,7 +115,9 @@ char Tokenizer::peekCharacter() {
 std::unique_ptr<Subfield::PathElement> Tokenizer::matchPathSegment() {
   // seek until we see a special character or whitespace
   int start = index_;
-  while (hasNextCharacter() && isUnquotedPathCharacter(peekCharacter())) {
+  while (hasNextCharacter() &&
+         (!isSeparator(peekCharacter()) &&
+          isUnquotedPathCharacter(peekCharacter()))) {
     nextCharacter();
   }
   int end = index_;
@@ -143,6 +155,11 @@ std::unique_ptr<Subfield::PathElement> Tokenizer::matchUnquotedSubscript() {
   return std::make_unique<Subfield::LongSubscript>(index);
 }
 
+bool Tokenizer::isSeparator(char c) {
+  return std::find(separators_.begin(), separators_.end(), c) !=
+      separators_.end();
+}
+
 bool Tokenizer::isUnquotedPathCharacter(char c) {
   return c == ':' || c == '$' || c == '-' || c == '/' || c == '@' || c == '|' ||
       c == '#' || isUnquotedSubscriptCharacter(c);

diff --git a/velox/type/Tokenizer.h b/velox/type/Tokenizer.h
@@ -35,7 +35,9 @@ class Tokenizer {
     kFailed,
   };
 
-  explicit Tokenizer(const std::string& path);
+  explicit Tokenizer(
+      const std::string& path,
+      const std::optional<std::vector<char>>& separators);
 
   bool hasNext();
 
@@ -51,6 +53,8 @@ class Tokenizer {
   const char UNICODE_CARET = '^';
 
   const std::string path_;
+  std::vector<char> separators_ =
+      {DOT, OPEN_BRACKET, QUOTE, WILDCARD, CLOSE_BRACKET};
   int index_;
   State state;
   bool firstSegment = true;
@@ -60,6 +64,8 @@ class Tokenizer {
 
   std::unique_ptr<Subfield::PathElement> computeNext();
 
+  bool tryMatchSeparator(char expected);
+
   void match(char expected);
 
   bool tryMatch(char expected);
@@ -74,6 +80,8 @@ class Tokenizer {
 
   bool tryToComputeNext();
 
+  bool isSeparator(char c);
+
   void invalidSubfieldPath();
 
   bool isUnquotedPathCharacter(char c);

diff --git a/velox/type/tests/SubfieldTest.cpp b/velox/type/tests/SubfieldTest.cpp
@@ -20,9 +20,10 @@
 using namespace facebook::velox::common;
 
 std::vector<std::unique_ptr<Subfield::PathElement>> tokenize(
-    const std::string& path) {
+    const std::string& path,
+    const std::vector<char>& regularChars = {}) {
   std::vector<std::unique_ptr<Subfield::PathElement>> elements;
-  Tokenizer tokenizer(path);
+  Tokenizer tokenizer(path, regularChars);
   while (tokenizer.hasNext()) {
     elements.push_back(tokenizer.next());
   }
@@ -47,8 +48,10 @@ TEST(SubfieldTest, invalidPaths) {
   assertInvalidSubfield("a[2].[3].", "Invalid subfield path: a[2].^[3].");
 }
 
-void testColumnName(const std::string& name) {
-  auto elements = tokenize(name);
+void testColumnName(
+    const std::string& name,
+    const std::vector<char>& regularChars = {}) {
+  auto elements = tokenize(name, regularChars);
   EXPECT_EQ(elements.size(), 1);
   EXPECT_EQ(*elements[0].get(), Subfield::NestedField(name));
 }
@@ -59,6 +62,8 @@ TEST(SubfieldTest, columnNamesWithSpecialCharacters) {
   testColumnName("a/b/c:12");
   testColumnName("@basis");
   testColumnName("@basis|city_id");
+  std::vector<char> regularChars = {'.'};
+  testColumnName("city.id", regularChars);
 }
 
 std::vector<std::unique_ptr<Subfield::PathElement>> createElements() {