Revert "use substring in __getitem__ to avoid column name change"

peter-toth · peter-toth · commit 6bd03d11b4d3 · 2023-09-19T11:28:30.000+02:00
This reverts commit d611fd5.
diff --git a/python/pyspark/sql/column.py b/python/pyspark/sql/column.py
@@ -712,19 +712,19 @@ def __getitem__(self, k: Any) -> "Column":
         --------
         >>> df = spark.createDataFrame([('abcedfg', {"key": "value"})], ["l", "d"])
         >>> df.select(df.l[slice(1, 3)], df.d['key']).show()
-        +------------------+------+
-        |substring(l, 1, 3)|d[key]|
-        +------------------+------+
-        |               abc| value|
-        +------------------+------+
+        +---------------+------+
+        |substr(l, 1, 3)|d[key]|
+        +---------------+------+
+        |            abc| value|
+        +---------------+------+
         """
         if isinstance(k, slice):
             if k.step is not None:
                 raise PySparkValueError(
                     error_class="SLICE_WITH_STEP",
                     message_parameters={},
                 )
-            return self.substring(k.start, k.stop)
+            return self.substr(k.start, k.stop)
         else:
             return _bin_op("apply")(self, k)
 
diff --git a/python/pyspark/sql/connect/column.py b/python/pyspark/sql/connect/column.py
@@ -460,7 +460,7 @@ def __getitem__(self, k: Any) -> "Column":
                     error_class="SLICE_WITH_STEP",
                     message_parameters={},
                 )
-            return self.substring(k.start, k.stop)
+            return self.substr(k.start, k.stop)
         else:
             return Column(UnresolvedExtractValue(self._expr, LiteralExpression._from_value(k)))
 

Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ def __getitem__(self, k: Any) -> "Column":`
`460`	`460`	`error_class="SLICE_WITH_STEP",`
`461`	`461`	`message_parameters={},`
`462`	`462`	`)`
`463`		`- return self.substring(k.start, k.stop)`
	`463`	`+ return self.substr(k.start, k.stop)`
`464`	`464`	`else:`
`465`	`465`	`return Column(UnresolvedExtractValue(self._expr, LiteralExpression._from_value(k)))`
`466`	`466`