[BACKPORT] Fix DataFrame comparison when data type is period (#2373) (#…

…2376)
mars-project · Aug 23, 2021 · 23d4c31 · 23d4c31
1 parent 7147141
commit 23d4c31
Show file tree

Hide file tree

Showing 9 changed files with 265 additions and 130 deletions.
diff --git a/docs/source/locale/zh_CN/LC_MESSAGES/reference/dataframe/frame.po b/docs/source/locale/zh_CN/LC_MESSAGES/reference/dataframe/frame.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mars 0.5.0a2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-03 18:42+0800\n"
+"POT-Creation-Date: 2021-08-23 16:36+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1016,247 +1016,257 @@ msgstr ""
 msgid "Combining / joining / merging"
 msgstr "数据合并"
 
-#: ../../source/reference/dataframe/frame.rst:200:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:201:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.append <mars.dataframe.DataFrame.append>`\\ "
 "\\(other\\[\\, ignore\\_index\\, ...\\]\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:200:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:201:<autosummary>:1
+msgid ""
+":obj:`DataFrame.assign <mars.dataframe.DataFrame.assign>`\\ "
+"\\(\\*\\*kwargs\\)"
+msgstr ""
+
+#: ../../source/reference/dataframe/frame.rst:201:<autosummary>:1
+msgid "Assign new columns to a DataFrame."
+msgstr ""
+
+#: ../../source/reference/dataframe/frame.rst:201:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.join <mars.dataframe.DataFrame.join>`\\ \\(other\\[\\, "
 "on\\, how\\, lsuffix\\, ...\\]\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:200:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:201:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.merge <mars.dataframe.DataFrame.merge>`\\ \\(right\\[\\, "
 "how\\, on\\, left\\_on\\, ...\\]\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:202
+#: ../../source/reference/dataframe/frame.rst:203
 msgid "Time series-related"
 msgstr "时间序列相关"
 
-#: ../../source/reference/dataframe/frame.rst:209:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:210:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.diff <mars.dataframe.DataFrame.diff>`\\ \\(\\[periods\\, "
 "axis\\]\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:209:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:210:<autosummary>:1
 msgid "First discrete difference of element."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:209:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:210:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.shift <mars.dataframe.DataFrame.shift>`\\ "
 "\\(\\[periods\\, freq\\, axis\\, ...\\]\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:209:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:210:<autosummary>:1
 msgid "Shift index by desired number of periods with an optional time `freq`."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:209:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:210:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.tshift <mars.dataframe.DataFrame.tshift>`\\ "
 "\\(\\[periods\\, freq\\, axis\\]\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:209:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:210:<autosummary>:1
 msgid "Shift the time index, using the index's frequency if available."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:213
+#: ../../source/reference/dataframe/frame.rst:214
 msgid "Plotting"
 msgstr "绘图"
 
-#: ../../source/reference/dataframe/frame.rst:214
+#: ../../source/reference/dataframe/frame.rst:215
 msgid ""
 "``DataFrame.plot`` is both a callable method and a namespace attribute "
 "for specific plotting methods of the form ``DataFrame.plot.<kind>``."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:222:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:223:<autosummary>:1
 msgid ":obj:`DataFrame.plot <mars.dataframe.DataFrame.plot>`\\"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:222:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:223:<autosummary>:1
 msgid "alias of :class:`mars.dataframe.plotting.core.PlotAccessor`"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.plot.area <mars.dataframe.DataFrame.plot.area>`\\ "
 "\\(\\*args\\, \\*\\*kwargs\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid "Draw a stacked area plot."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.plot.bar <mars.dataframe.DataFrame.plot.bar>`\\ "
 "\\(\\*args\\, \\*\\*kwargs\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid "Vertical bar plot."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.plot.barh <mars.dataframe.DataFrame.plot.barh>`\\ "
 "\\(\\*args\\, \\*\\*kwargs\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid "Make a horizontal bar plot."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.plot.box <mars.dataframe.DataFrame.plot.box>`\\ "
 "\\(\\*args\\, \\*\\*kwargs\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid "Make a box plot of the DataFrame columns."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.plot.density <mars.dataframe.DataFrame.plot.density>`\\ "
 "\\(\\*args\\, \\*\\*kwargs\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid "Generate Kernel Density Estimate plot using Gaussian kernels."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.plot.hexbin <mars.dataframe.DataFrame.plot.hexbin>`\\ "
 "\\(\\*args\\, \\*\\*kwargs\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid "Generate a hexagonal binning plot."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.plot.hist <mars.dataframe.DataFrame.plot.hist>`\\ "
 "\\(\\*args\\, \\*\\*kwargs\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid "Draw one histogram of the DataFrame's columns."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.plot.kde <mars.dataframe.DataFrame.plot.kde>`\\ "
 "\\(\\*args\\, \\*\\*kwargs\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.plot.line <mars.dataframe.DataFrame.plot.line>`\\ "
 "\\(\\*args\\, \\*\\*kwargs\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid "Plot Series or DataFrame as lines."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.plot.pie <mars.dataframe.DataFrame.plot.pie>`\\ "
 "\\(\\*args\\, \\*\\*kwargs\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid "Generate a pie plot."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.plot.scatter <mars.dataframe.DataFrame.plot.scatter>`\\ "
 "\\(\\*args\\, \\*\\*kwargs\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:238:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:239:<autosummary>:1
 msgid "Create a scatter plot with varying marker point size and color."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:244:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:245:<autosummary>:1
 msgid ":obj:`DataFrame.boxplot <DataFrame.boxplot>`\\"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:244:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:245:<autosummary>:1
 msgid ":obj:`DataFrame.hist <DataFrame.hist>`\\"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:248
+#: ../../source/reference/dataframe/frame.rst:249
 msgid "Serialization / IO / conversion"
 msgstr "序列化、IO 和转换"
 
-#: ../../source/reference/dataframe/frame.rst:255:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:256:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.to_csv <mars.dataframe.DataFrame.to_csv>`\\ \\(path\\[\\,"
 " sep\\, na\\_rep\\, ...\\]\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:255:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:256:<autosummary>:1
 msgid "Write object to a comma-separated values (csv) file."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:255:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:256:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.to_parquet <mars.dataframe.DataFrame.to_parquet>`\\ "
 "\\(path\\[\\, engine\\, ...\\]\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:255:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:256:<autosummary>:1
 msgid ""
 "Write a DataFrame to the binary parquet format, each chunk will be "
 "written to a Parquet file."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:255:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:256:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.to_sql <mars.dataframe.DataFrame.to_sql>`\\ \\(name\\, "
 "con\\[\\, schema\\, ...\\]\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:255:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:256:<autosummary>:1
 msgid "Write records stored in a DataFrame to a SQL database."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:257
+#: ../../source/reference/dataframe/frame.rst:258
 msgid "Misc"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:263:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:264:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.map_chunk <mars.dataframe.DataFrame.map_chunk>`\\ "
 "\\(func\\[\\, args\\]\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:263:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:264:<autosummary>:1
 msgid "Apply function to each chunk."
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:263:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:264:<autosummary>:1
 msgid ""
 ":obj:`DataFrame.rebalance <mars.dataframe.DataFrame.rebalance>`\\ "
 "\\(\\[factor\\, axis\\, ...\\]\\)"
 msgstr ""
 
-#: ../../source/reference/dataframe/frame.rst:263:<autosummary>:1
+#: ../../source/reference/dataframe/frame.rst:264:<autosummary>:1
 msgid "Make Data more balanced across entire cluster."
 msgstr ""