fixup

Author: HyukjinKwon

python/pyspark/sql/classic/dataframe.py

@@ -1807,6 +1807,27 @@ def pandas_api(
         )
         return PandasOnSparkDataFrame(internal)
 
+    def mapInPandas(
+        self,
+        func: "PandasMapIterFunction",
+        schema: Union[StructType, str],
+        barrier: bool = False,
+        profile: Optional[ResourceProfile] = None,
+    ) -> "DataFrame":
+        return super(PandasMapOpsMixin, self).mapInPandas(func, schema, barrier, profile)
+
+    def mapInArrow(
+        self,
+        func: "ArrowMapIterFunction",
+        schema: Union[StructType, str],
+        barrier: bool = False,
+        profile: Optional[ResourceProfile] = None,
+    ) -> "DataFrame":
+        return super(PandasMapOpsMixin, self).mapInArrow(func, schema, barrier, profile)
+
+    def toPandas(self) -> "PandasDataFrameLike":
+        return super(PandasConversionMixin, self).toPandas()
+
 
 def _to_scala_map(sc: "SparkContext", jm: Dict) -> "JavaObject":
     """

python/pyspark/sql/utils.py

@@ -310,7 +310,7 @@ def dispatch_df_method(f: FuncT) -> FuncT:
 
     @functools.wraps(f)
     def wrapped(*args: Any, **kwargs: Any) -> Any:
-        if is_remote():
+        if is_remote() and "PYSPARK_NO_NAMESPACE_SHARE" not in os.environ:
             from pyspark.sql.connect.dataframe import DataFrame as ConnectDataFrame
 
             if isinstance(args[0], ConnectDataFrame):