FIX-#6561: remove MODIN_OMNISCI_* env vars in favor of MODIN_HDK_* (

#6562)

Signed-off-by: Anatoly Myachev <[email protected]>

modin/config/envvars.py

@@ -297,14 +297,8 @@ class HdkFragmentSize(EnvironmentVariable, type=int):
     varname = "MODIN_HDK_FRAGMENT_SIZE"
 
 
-class OmnisciFragmentSize(EnvironmentVariable, type=int):
-    """How big a fragment in OmniSci should be when creating a table (in rows)."""
-
-    varname = "MODIN_OMNISCI_FRAGMENT_SIZE"
-
-
 class DoUseCalcite(EnvironmentVariable, type=bool):
-    """Whether to use Calcite for OmniSci queries execution."""
+    """Whether to use Calcite for HDK queries execution."""
 
     varname = "MODIN_USE_CALCITE"
     default = True
@@ -521,24 +515,6 @@ def get(cls) -> dict:
 
         Decode and merge specified command-line options with the default one.
 
-        Returns
-        -------
-        dict
-            Decoded and verified config value.
-        """
-        if cls == OmnisciLaunchParameters or (
-            OmnisciLaunchParameters.varname in os.environ
-            and HdkLaunchParameters.varname not in os.environ
-        ):
-            return OmnisciLaunchParameters._get()
-        else:
-            return HdkLaunchParameters._get()
-
-    @classmethod
-    def _get(cls) -> dict:
-        """
-        Get the resulted command-line options.
-
         Returns
         -------
         dict
@@ -585,17 +561,6 @@ def _get_default(cls) -> Any:
         return default
 
 
-class OmnisciLaunchParameters(HdkLaunchParameters, type=dict):
-    """
-    Additional command line options for the OmniSci engine.
-
-    Please visit OmniSci documentation for the description of available parameters:
-    https://docs.omnisci.com/installation-and-configuration/config-parameters#configuration-parameters-for-omniscidb
-    """
-
-    varname = "MODIN_OMNISCI_LAUNCH_PARAMETERS"
-
-
 class MinPartitionSize(EnvironmentVariable, type=int):
     """
     Minimum number of rows/columns in a single pandas partition split.

modin/config/test/test_envvars.py

@@ -78,19 +78,13 @@ def test_hdk_envvar():
         # This test is intended to check pyhdk internals. If pyhdk is not available, skip the version check test.
         pass
 
-    os.environ[
-        cfg.OmnisciLaunchParameters.varname
-    ] = "enable_union=2,enable_thrift_logs=3"
-    del cfg.OmnisciLaunchParameters._value
-    params = cfg.OmnisciLaunchParameters.get()
-    assert params["enable_union"] == 2
-    assert params["enable_thrift_logs"] == 3
-
+    os.environ[cfg.HdkLaunchParameters.varname] = "enable_union=2,enable_thrift_logs=3"
     params = cfg.HdkLaunchParameters.get()
     assert params["enable_union"] == 2
     assert params["enable_thrift_logs"] == 3
 
     os.environ[cfg.HdkLaunchParameters.varname] = "unsupported=X"
+    del cfg.HdkLaunchParameters._value
     params = cfg.HdkLaunchParameters.get()
     assert params["unsupported"] == "X"
     try:
@@ -111,13 +105,3 @@ def test_hdk_envvar():
     assert params["enable_union"] == 4
     assert params["enable_thrift_logs"] == 5
     assert params["enable_lazy_dict_materialization"] == 6
-
-    params = cfg.OmnisciLaunchParameters.get()
-    assert params["enable_union"] == 2
-    assert params["enable_thrift_logs"] == 3
-
-    del os.environ[cfg.OmnisciLaunchParameters.varname]
-    del cfg.OmnisciLaunchParameters._value
-    params = cfg.OmnisciLaunchParameters.get()
-    assert params["enable_union"] == 4
-    assert params["enable_thrift_logs"] == 5

modin/experimental/core/execution/native/implementations/hdk_on_native/hdk_worker.py

@@ -20,7 +20,7 @@
 from packaging import version
 from pyhdk.hdk import HDK, ExecutionResult, QueryNode, RelAlgExecutor
 
-from modin.config import HdkFragmentSize, HdkLaunchParameters, OmnisciFragmentSize
+from modin.config import HdkFragmentSize, HdkLaunchParameters
 from modin.utils import _inherit_docstrings
 
 from .base_worker import BaseDbWorker, DbTable
@@ -141,8 +141,6 @@ def compute_fragment_size(cls, table):
             Fragment size to use for import.
         """
         fragment_size = HdkFragmentSize.get()
-        if fragment_size is None:
-            fragment_size = OmnisciFragmentSize.get()
         if fragment_size is None:
             if cls._preferred_device == "CPU":
                 cpu_count = os.cpu_count()