Skip to content

Commit

Permalink
Merge pull request #4 from ironmussa/master
Browse files Browse the repository at this point in the history 
Update fork
  • Loading branch information
@eschizoid
eschizoid authored Nov 10, 2019
2 parents 6414341 + d3d838b commit 8299444
Show file tree
Hide file tree
Showing 28 changed files with 36,248 additions and 14,833 deletions.
2 changes: 1 addition & 1 deletion docs/source/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
# The short X.Y version.
version = '2.2'
# The full version, including alpha/beta/rc tags.
release = "2.2.22"
release = "2.2.26"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
221 changes: 6 additions & 215 deletions ...n_from_spark_to_pandas_with_optimus.ipynb → ...n_from_pandas_to_spark_with_optimus.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2533,195 +2533,11 @@
},
{
"cell_type": "code",
"execution_count": 15,
"execution_count": null,
"metadata": {},
"outputs": [
{
"data": {
"text/html": [
"<style>\n",
" .data_type {\n",
" font-size: 0.8em;\n",
" font-weight: normal;\n",
" }\n",
"\n",
" .column_name {\n",
" font-size: 1.2em;\n",
" }\n",
"\n",
" .info_items {\n",
" margin: 10px 0;\n",
" font-size: 0.8em;\n",
" }\n",
"\n",
" .optimus_table tr:nth-child(even) {\n",
" background-color: #f2f2f2 !important;\n",
" }\n",
"\n",
" .optimus_table tr:nth-child(odd) {\n",
" background-color: #ffffff !important;\n",
" }\n",
"\n",
" .optimus_table thead {\n",
" border-bottom: 1px solid black;\n",
" }\n",
" .optimus_table{\n",
" font-size: 12px;\n",
" }\n",
"\n",
"</style>\n",
"\n",
"\n",
"\n",
"\n",
"<div class=\"info_items\">Viewing 3 of 3 rows / 5 columns</div>\n",
"<div class=\"info_items\">1 partition(s)</div>\n",
"\n",
"<table class=\"optimus_table\">\n",
" <thead>\n",
" <tr>\n",
" \n",
" <th>\n",
" <div class=\"column_name\">names</div>\n",
" <div class=\"data_type\">1 (string)</div>\n",
" <div class=\"data_type\">\n",
" \n",
" nullable\n",
" \n",
" </div>\n",
" </th>\n",
" \n",
" <th>\n",
" <div class=\"column_name\">height</div>\n",
" <div class=\"data_type\">2 (double)</div>\n",
" <div class=\"data_type\">\n",
" \n",
" nullable\n",
" \n",
" </div>\n",
" </th>\n",
" \n",
" <th>\n",
" <div class=\"column_name\">function</div>\n",
" <div class=\"data_type\">3 (string)</div>\n",
" <div class=\"data_type\">\n",
" \n",
" nullable\n",
" \n",
" </div>\n",
" </th>\n",
" \n",
" <th>\n",
" <div class=\"column_name\">rank</div>\n",
" <div class=\"data_type\">4 (bigint)</div>\n",
" <div class=\"data_type\">\n",
" \n",
" nullable\n",
" \n",
" </div>\n",
" </th>\n",
" \n",
" <th>\n",
" <div class=\"column_name\">id</div>\n",
" <div class=\"data_type\">5 (bigint)</div>\n",
" <div class=\"data_type\">\n",
" \n",
" </div>\n",
" </th>\n",
" \n",
" </tr>\n",
"\n",
" </thead>\n",
" <tbody>\n",
" \n",
" <tr>\n",
" \n",
" <td>\n",
" bumbl#ebéé⸱⸱\n",
" </td>\n",
" \n",
" <td>\n",
" 17.5\n",
" </td>\n",
" \n",
" <td>\n",
" Espionage\n",
" </td>\n",
" \n",
" <td>\n",
" 7\n",
" </td>\n",
" \n",
" <td>\n",
" 0\n",
" </td>\n",
" \n",
" </tr>\n",
" \n",
" <tr>\n",
" \n",
" <td>\n",
" Optim&#39;us\n",
" </td>\n",
" \n",
" <td>\n",
" 28.0\n",
" </td>\n",
" \n",
" <td>\n",
" Leader\n",
" </td>\n",
" \n",
" <td>\n",
" 10\n",
" </td>\n",
" \n",
" <td>\n",
" 1\n",
" </td>\n",
" \n",
" </tr>\n",
" \n",
" <tr>\n",
" \n",
" <td>\n",
" ironhide&amp;\n",
" </td>\n",
" \n",
" <td>\n",
" 26.0\n",
" </td>\n",
" \n",
" <td>\n",
" Security\n",
" </td>\n",
" \n",
" <td>\n",
" 7\n",
" </td>\n",
" \n",
" <td>\n",
" 2\n",
" </td>\n",
" \n",
" </tr>\n",
" \n",
" </tbody>\n",
"</table>\n",
"\n",
"<div class=\"info_items\">Viewing 3 of 3 rows / 5 columns</div>\n",
"<div class=\"info_items\">1 partition(s)</div>\n"
],
"text/plain": [
"<IPython.core.display.HTML object>"
]
},
"metadata": {},
"output_type": "display_data"
}
],
"outputs": [],
"source": [
"df.create_id().table()"
"df.rows.create_id().table()"
]
},
{
Expand Down Expand Up @@ -4659,25 +4475,14 @@
},
{
"cell_type": "code",
"execution_count": 33,
"execution_count": null,
"metadata": {
"inputHidden": false,
"outputHidden": false
},
"outputs": [
{
"data": {
"text/plain": [
"'[(\\'names\\', StringType(), True),(\\'height\\', DoubleType(), True),(\\'function\\', StringType(), True),(\\'rank\\', LongType(), True)], [(\\'bumbl#ebéé \\', 17.5, \\'Espionage\\', 7), (\"Optim\\'us\", 28.0, \\'Leader\\', 10), (\\'ironhide&\\', 26.0, \\'Security\\', 7)]'"
]
},
"execution_count": 33,
"metadata": {},
"output_type": "execute_result"
}
],
"outputs": [],
"source": [
"df.export()"
"df.to_json()"
]
},
{
Expand Down Expand Up @@ -7014,13 +6819,6 @@
"df.table()"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
},
{
"cell_type": "code",
"execution_count": 15,
Expand Down Expand Up @@ -7796,13 +7594,6 @@
"source": [
"df_result.table()"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
Expand Down
6 changes: 1 addition & 5 deletions ..._min_from_spark_to_pandas_with_optimus.py → ..._min_from_pandas_to_spark_with_optimus.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@

# Create and unique id for every row.

df.create_id().table()
df.rows.create_id().table()

# Create wew columns

Expand Down Expand Up @@ -361,8 +361,6 @@ def func(value, args):

df.table()



# +
import requests

Expand All @@ -385,5 +383,3 @@ def func_response(response):
# -

df_result.table()


Loading

0 comments on commit 8299444

Please sign in to comment.