Refactor spark window function folder (#348)

oap-project · Jul 4, 2023 · 78e96ff · 78e96ff
1 parent 43697df
commit 78e96ff
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 75 deletions.
diff --git a/velox/functions/sparksql/CMakeLists.txt b/velox/functions/sparksql/CMakeLists.txt
@@ -51,7 +51,6 @@ add_subdirectory(window)
 
 if(${VELOX_ENABLE_AGGREGATES})
   add_subdirectory(aggregates)
-  add_subdirectory(windows)
 endif()
 
 if(${VELOX_BUILD_TESTING})

diff --git a/velox/functions/sparksql/window/CMakeLists.txt b/velox/functions/sparksql/window/CMakeLists.txt
@@ -11,7 +11,8 @@
 # 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.
-add_library(velox_functions_spark_window WindowFunctionsRegistration.cpp)
+add_library(velox_functions_spark_window RowNumber.cpp
+                                         WindowFunctionsRegistration.cpp)
 
 target_link_libraries(velox_functions_spark_window velox_buffer velox_exec
                       velox_functions_window Folly::folly)

diff --git a/.../functions/sparksql/windows/RowNumber.cpp → ...x/functions/sparksql/window/RowNumber.cpp b/.../functions/sparksql/windows/RowNumber.cpp → ...x/functions/sparksql/window/RowNumber.cpp
@@ -19,7 +19,7 @@
 #include "velox/expression/FunctionSignature.h"
 #include "velox/vector/FlatVector.h"
 
-namespace facebook::velox::functions::sparksql::windows {
+namespace facebook::velox::functions::window::sparksql {
 
 namespace {
 
@@ -73,4 +73,4 @@ void registerRowNumber(const std::string& name) {
         return std::make_unique<RowNumberFunction>();
       });
 }
-} // namespace facebook::velox::functions::sparksql::windows
+} // namespace facebook::velox::functions::window::sparksql
diff --git a/velox/functions/sparksql/windows/RowNumber.h → velox/functions/sparksql/window/RowNumber.h b/velox/functions/sparksql/windows/RowNumber.h → velox/functions/sparksql/window/RowNumber.h
@@ -17,6 +17,6 @@
 
 #include <string>
 
-namespace facebook::velox::functions::sparksql::windows {
+namespace facebook::velox::functions::window::sparksql {
 void registerRowNumber(const std::string& prefix);
-} // namespace facebook::velox::functions::sparksql::windows
+} // namespace facebook::velox::functions::window::sparksql
diff --git a/velox/functions/sparksql/window/WindowFunctionsRegistration.cpp b/velox/functions/sparksql/window/WindowFunctionsRegistration.cpp
@@ -15,11 +15,13 @@
  */
 #include "velox/functions/sparksql/window/WindowFunctionsRegistration.h"
 #include "velox/functions/lib/window/NthValue.h"
+#include "velox/functions/sparksql/window/RowNumber.h"
 
 namespace facebook::velox::functions::window::sparksql {
 
 void registerWindowFunctions(const std::string& prefix) {
   functions::window::registerIntegerNthValue(prefix + "nth_value");
+  registerRowNumber(prefix + "row_number");
 }
 
 } // namespace facebook::velox::functions::window::sparksql
diff --git a/velox/functions/sparksql/windows/CMakeLists.txt b/velox/functions/sparksql/windows/CMakeLists.txt
diff --git a/velox/functions/sparksql/windows/Register.cpp b/velox/functions/sparksql/windows/Register.cpp
diff --git a/velox/functions/sparksql/windows/Register.h b/velox/functions/sparksql/windows/Register.h