From: groceryheist Date: Fri, 31 Aug 2018 23:01:07 +0000 (-0700) Subject: Merge branch 'user_level_wikiq' of code.communitydata.cc:mediawiki_dump_tools into... X-Git-Url: https://code.communitydata.science/mediawiki_dump_tools.git/commitdiff_plain/cc551eef6e04e2f82b8dbc7870fd98bfc0997e13 Merge branch 'user_level_wikiq' of code.communitydata.cc:mediawiki_dump_tools into user_level_wikiq --- cc551eef6e04e2f82b8dbc7870fd98bfc0997e13 diff --cc wikiq_users/wikiq_users_spark.py index 31d078a,31d078a..edc2d4f --- a/wikiq_users/wikiq_users_spark.py +++ b/wikiq_users/wikiq_users_spark.py @@@ -123,8 -123,8 +123,7 @@@ if __name__ == "__main__" # some kind of bad work around a bug # see https://issues.apache.org/jira/browse/SPARK-14948 -- reverts_df = reverts_df.select(reverts_df.revid.alias("r_revid"),'editor_nth_revert','article_nth_r --evert') ++ reverts_df = reverts_df.select(reverts_df.revid.alias("r_revid"),'editor_nth_revert','article_nth_revert') df = df.join(reverts_df, df.revid == reverts_df.r_revid, how='left_outer') df = df.drop("r_revid") del(reverts_df)