Add ENABLE_SQL build flag.

Signed-off-by: ienkovich <[email protected]>

Author: ienkovich

CMakeLists.txt

@@ -137,6 +137,7 @@ include_directories(${SQLite3_INCLUDE_DIRS})
 
 option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 option(ENABLE_PYTHON "Build Python libraries" ON)
+option(ENABLE_SQL "Enable SQL support" ON)
 
 if(BUILD_SHARED_LIBS)
   add_definitions("-DENABLE_SHARED_LIBS")
@@ -487,7 +488,9 @@ add_custom_target(hdk_python_clean
 )
 
 add_dependencies(clean-all hdk_python_clean)
-add_dependencies(clean-all calcite_java_clean)
+if (ENABLE_SQL)
+  add_dependencies(clean-all calcite_java_clean)
+endif()
 
 
 option(ENABLE_TESTS "Build unit tests" ON)

omniscidb/CMakeLists.txt

@@ -138,6 +138,8 @@ if(BUILD_SHARED_LIBS)
   add_definitions("-DENABLE_SHARED_LIBS")
 endif()
 
+option(ENABLE_SQL "Enable SQL support" ON)
+
 # Required for macOS with Boost 1.71.0+
 # See https://gitlab.kitware.com/cmake/cmake/issues/19714
 if(APPLE)

omniscidb/Calcite/CMakeLists.txt

@@ -1,67 +1,76 @@
-find_package(JNI REQUIRED)
-include_directories(${JNI_INCLUDE_DIRS})
-
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-## mvn process for java code
-find_program(MVN_EXECUTABLE NAMES mvn)
-if(NOT MVN_EXECUTABLE)
-  message(FATAL_ERROR "mvn not found. Install Apache Maven.")
-endif()
-file(GLOB_RECURSE JAVA_POM RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} java/**/pom.xml)
-file(GLOB_RECURSE JAVA_FTL RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} java/calcite/src/main/codegen/includes/*.ftl)
-file(GLOB_RECURSE JAVA_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} java/**/*.java)
-list(FILTER JAVA_SOURCES EXCLUDE REGEX ".*/gen/.*")
-list(FILTER JAVA_SOURCES EXCLUDE REGEX ".*/generated-sources/.*")
+if(ENABLE_SQL)
+  find_package(JNI REQUIRED)
+  include_directories(${JNI_INCLUDE_DIRS})
 
-set(OMNISCI_JAR_RELEASE_VERSION "${MAPD_VERSION_MAJOR}.${MAPD_VERSION_MINOR}.${MAPD_VERSION_PATCH}")
-if("${MAPD_VERSION_EXTRA}" STREQUAL "dev")
-  set (OMNISCI_JAR_RELEASE_VERSION "${OMNISCI_JAR_RELEASE_VERSION}-SNAPSHOT")
-endif()
+  # # mvn process for java code
+  find_program(MVN_EXECUTABLE NAMES mvn)
 
-if (WIN32)
-  # "call" is needed on windows because "mvn" command is a batch script and without
-  # "call" execution is transferred to it and is never returned back to this script.
-  set(MVN_PATH_COMMAND call)
+  if(NOT MVN_EXECUTABLE)
+    message(FATAL_ERROR "mvn not found. Install Apache Maven.")
+  endif()
 
-  file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/bin" WIN_BIN_PATH)
-  # The following call to cmd is required to ignore errors if directory already exitst
-  set(MKDIR_COMMAND cmd /c "mkdir ${WIN_BIN_PATH} || (exit 0)")
-else()
-  set(MVN_PATH_COMMAND "MVNPATH=${CMAKE_CURRENT_SOURCE_DIR}/java")
-  set(MKDIR_COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin)
-endif()
+  file(GLOB_RECURSE JAVA_POM RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} java/**/pom.xml)
+  file(GLOB_RECURSE JAVA_FTL RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} java/calcite/src/main/codegen/includes/*.ftl)
+  file(GLOB_RECURSE JAVA_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} java/**/*.java)
+  list(FILTER JAVA_SOURCES EXCLUDE REGEX ".*/gen/.*")
+  list(FILTER JAVA_SOURCES EXCLUDE REGEX ".*/generated-sources/.*")
+
+  set(OMNISCI_JAR_RELEASE_VERSION "${MAPD_VERSION_MAJOR}.${MAPD_VERSION_MINOR}.${MAPD_VERSION_PATCH}")
+
+  if("${MAPD_VERSION_EXTRA}" STREQUAL "dev")
+    set(OMNISCI_JAR_RELEASE_VERSION "${OMNISCI_JAR_RELEASE_VERSION}-SNAPSHOT")
+  endif()
 
-add_custom_command(
-  OUTPUT
+  if(WIN32)
+    # "call" is needed on windows because "mvn" command is a batch script and without
+    # "call" execution is transferred to it and is never returned back to this script.
+    set(MVN_PATH_COMMAND call)
+
+    file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/bin" WIN_BIN_PATH)
+
+    # The following call to cmd is required to ignore errors if directory already exitst
+    set(MKDIR_COMMAND cmd /c "mkdir ${WIN_BIN_PATH} || (exit 0)")
+  else()
+    set(MVN_PATH_COMMAND "MVNPATH=${CMAKE_CURRENT_SOURCE_DIR}/java")
+    set(MKDIR_COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin)
+  endif()
+
+  add_custom_command(
+    OUTPUT
     ${CMAKE_BINARY_DIR}/bin/calcite-1.0-SNAPSHOT-jar-with-dependencies.jar
     COMMAND ${MVN_PATH_COMMAND} ${MVN_EXECUTABLE} -l ${CMAKE_BINARY_DIR}/mvn_build.log -e clean install -Dmaven.compiler.showDeprecation=true -Dmaven.compiler.showWarnings=true -Domnisci.release.version="${OMNISCI_JAR_RELEASE_VERSION}" -Djava.net.preferIPv4Stack=true -Dmaven.wagon.http.retryHandler.count=3 -DMAPD_LOG_DIR="${CMAKE_BINARY_DIR}"
     COMMAND ${MKDIR_COMMAND}
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/java/calcite/target/calcite-1.0-SNAPSHOT-jar-with-dependencies.jar ${CMAKE_BINARY_DIR}/bin
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/java
-  DEPENDS
+    DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/java/calcite/src/main/codegen/config.fmpp
     ${CMAKE_CURRENT_SOURCE_DIR}/java/pom.xml
     ${JAVA_POM}
     ${JAVA_SOURCES}
     ${JAVA_FTL}
   )
-add_custom_target(calcite_java_lib ALL DEPENDS
-  ${CMAKE_BINARY_DIR}/bin/calcite-1.0-SNAPSHOT-jar-with-dependencies.jar)
-add_custom_target(calcite_java_clean
-  COMMAND ${MVN_PATH_COMMAND} ${MVN_EXECUTABLE} -q clean -Domnisci.release.version="${OMNISCI_JAR_RELEASE_VERSION}"
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/java
+  add_custom_target(calcite_java_lib ALL DEPENDS
+    ${CMAKE_BINARY_DIR}/bin/calcite-1.0-SNAPSHOT-jar-with-dependencies.jar)
+  add_custom_target(calcite_java_clean
+    COMMAND ${MVN_PATH_COMMAND} ${MVN_EXECUTABLE} -q clean -Domnisci.release.version="${OMNISCI_JAR_RELEASE_VERSION}"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/java
   )
 
-add_custom_target(maven_populate_cache
-  COMMAND ${MVN_PATH_COMMAND} ${MVN_EXECUTABLE} -q verify -Domnisci.release.version="${OMNISCI_JAR_RELEASE_VERSION}"
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/java
+  add_custom_target(maven_populate_cache
+    COMMAND ${MVN_PATH_COMMAND} ${MVN_EXECUTABLE} -q verify -Domnisci.release.version="${OMNISCI_JAR_RELEASE_VERSION}"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/java
   )
 
-add_library(Calcite CalciteAdapter.cpp CalciteJNI.cpp SchemaJson.cpp)
+  add_library(Calcite CalciteAdapter.cpp CalciteJNI.cpp SchemaJson.cpp)
 
-add_dependencies(Calcite calcite_java_lib)
+  add_dependencies(Calcite calcite_java_lib)
 
-target_link_libraries(Calcite PRIVATE IR OSDependent Shared ${JAVA_JVM_LIBRARY})
+  target_link_libraries(Calcite PRIVATE IR OSDependent Shared ${JAVA_JVM_LIBRARY})
 
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/calcite/target/calcite-1.0-SNAPSHOT-jar-with-dependencies.jar DESTINATION bin COMPONENT "jar")
+  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/calcite/target/calcite-1.0-SNAPSHOT-jar-with-dependencies.jar DESTINATION bin COMPONENT "jar")
+else()
+  add_library(Calcite CalciteStub.cpp SchemaJson.cpp)
+  target_link_libraries(Calcite PRIVATE IR OSDependent Shared)
+endif()

omniscidb/Calcite/CalciteStub.cpp

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2023 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "CalciteJNI.h"
+
+CalciteMgr::~CalciteMgr() {}
+
+CalciteMgr* CalciteMgr::get(const std::string& udf_filename,
+                            const std::string& log_dir,
+                            size_t calcite_max_mem_mb) {
+  std::call_once(instance_init_flag_, [=] {
+    instance_ = std::unique_ptr<CalciteMgr>(
+        new CalciteMgr(udf_filename, calcite_max_mem_mb, log_dir));
+  });
+  return instance_.get();
+}
+
+std::string CalciteMgr::process(const std::string&,
+                                const std::string& sql_string,
+                                SchemaProvider*,
+                                Config*,
+                                const std::vector<FilterPushDownInfo>&,
+                                const bool,
+                                const bool,
+                                const bool) {
+  static const std::string ra_prefix = "execute calcite";
+  // For RA JSON queries simply remove the prefix and return.
+  if (sql_string.substr(0, ra_prefix.size()) == ra_prefix) {
+    return sql_string.substr(ra_prefix.size());
+  }
+  throw std::runtime_error("This HDK build doesn't include SQL support.");
+}
+
+std::string CalciteMgr::getExtensionFunctionWhitelist() {
+  return "[]";
+}
+
+std::string CalciteMgr::getUserDefinedFunctionWhitelist() {
+  return "[]";
+}
+
+std::string CalciteMgr::getRuntimeExtensionFunctionWhitelist() {
+  return "[]";
+}
+
+void CalciteMgr::setRuntimeExtensionFunctions(const std::vector<ExtensionFunction>&,
+                                              bool) {}
+
+CalciteMgr::CalciteMgr(const std::string&, size_t, const std::string&) {}
+
+std::once_flag CalciteMgr::instance_init_flag_;
+std::unique_ptr<CalciteMgr> CalciteMgr::instance_;