test

Author: zhengruifeng

python/pyspark/sql/connect/dataframe.py

@@ -1703,10 +1703,10 @@ def __getattr__(self, name: str) -> "Column":
                 errorClass="JVM_ATTRIBUTE_NOT_SUPPORTED", messageParameters={"attr_name": name}
             )
 
-        if name not in self.columns:
-            raise PySparkAttributeError(
-                errorClass="ATTRIBUTE_NOT_SUPPORTED", messageParameters={"attr_name": name}
-            )
+        # if name not in self.columns:
+        #     raise PySparkAttributeError(
+        #         errorClass="ATTRIBUTE_NOT_SUPPORTED", messageParameters={"attr_name": name}
+        #     )
 
         return self._col(name)
 
@@ -1739,14 +1739,14 @@ def __getitem__(
                 #   ConnectColumn(addDataFrameIdToCol(resolve(colName)))
                 # }
 
-                # validate the column name
-                if not hasattr(self._session, "is_mock_session"):
-                    from pyspark.sql.connect.types import verify_col_name
-
-                    # Try best to verify the column name with cached schema
-                    # If fails, fall back to the server side validation
-                    if not verify_col_name(item, self._schema):
-                        self.select(item).isLocal()
+                # # validate the column name
+                # if not hasattr(self._session, "is_mock_session"):
+                #     from pyspark.sql.connect.types import verify_col_name
+                #
+                #     # Try best to verify the column name with cached schema
+                #     # If fails, fall back to the server side validation
+                #     if not verify_col_name(item, self._schema):
+                #         self.select(item).isLocal()
 
                 return self._col(item)
         elif isinstance(item, Column):

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ColumnResolutionHelper.scala

@@ -622,18 +622,15 @@ trait ColumnResolutionHelper extends Logging with DataTypeErrorsBase {
       p: LogicalPlan,
       currentDepth: Int): (Option[(NamedExpression, Int)], Boolean) = {
     val (resolved, matched) = if (p.getTagValue(LogicalPlan.PLAN_ID_TAG).contains(id)) {
-      val resolved = try {
-        if (!isMetadataAccess) {
-          p.resolve(u.nameParts, conf.resolver)
-        } else if (u.nameParts.size == 1) {
-          p.getMetadataAttributeByNameOpt(u.nameParts.head)
-        } else {
-          None
-        }
-      } catch {
-        case e: AnalysisException =>
-          logDebug(s"Fail to resolve $u with $p due to $e")
-          None
+      val resolved = if (!isMetadataAccess) {
+        p.resolve(u.nameParts, conf.resolver)
+      } else if (u.nameParts.size == 1) {
+        p.getMetadataAttributeByNameOpt(u.nameParts.head)
+      } else {
+        None
+      }
+      if (resolved.isEmpty) {
+        throw QueryCompilationErrors.cannotResolveDataFrameColumn(u)
       }
       (resolved.map(r => (r, currentDepth)), true)
     } else {