Skip to content

Conversation

@davies
Copy link
Contributor

@davies davies commented Feb 9, 2015

All the DataTypes moved into pyspark.sql.types

The changes can be tracked by --find-copies-harder -M25

davies@localhost:~/work/spark/python$ git diff --find-copies-harder -M25 --numstat master..
2       5       python/docs/pyspark.ml.rst
0       3       python/docs/pyspark.mllib.rst
10      2       python/docs/pyspark.sql.rst
1       1       python/pyspark/mllib/linalg.py
21      14      python/pyspark/{mllib => sql}/__init__.py
14      2108    python/pyspark/{sql.py => sql/context.py}
10      1772    python/pyspark/{sql.py => sql/dataframe.py}
7       6       python/pyspark/{sql_tests.py => sql/tests.py}
8       1465    python/pyspark/{sql.py => sql/types.py}
4       2       python/run-tests
1       1       sql/core/src/main/scala/org/apache/spark/sql/test/ExamplePointUDT.scala

Also git blame -C -C python/pyspark/sql/context.py to track the history.

@SparkQA
Copy link

SparkQA commented Feb 9, 2015

Test build #27121 has started for PR 4479 at commit 2b2b983.

  • This patch does not merge cleanly.

@SparkQA
Copy link

SparkQA commented Feb 9, 2015

Test build #27122 has started for PR 4479 at commit 1b5f0a5.

  • This patch merges cleanly.

@SparkQA
Copy link

SparkQA commented Feb 9, 2015

Test build #27121 has finished for PR 4479 at commit 2b2b983.

  • This patch fails Spark unit tests.
  • This patch does not merge cleanly.
  • This patch adds no public classes.

@AmplabJenkins
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/27121/
Test FAILed.

@SparkQA
Copy link

SparkQA commented Feb 9, 2015

Test build #27122 has finished for PR 4479 at commit 1b5f0a5.

  • This patch fails Spark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@AmplabJenkins
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/27122/
Test FAILed.

@davies
Copy link
Contributor Author

davies commented Feb 9, 2015

@rxin I think this PR is ready, the failed tests are flaky, not related to this one.

@rxin
Copy link
Contributor

rxin commented Feb 9, 2015

Jenkins, retest this please.

@SparkQA
Copy link

SparkQA commented Feb 9, 2015

Test build #27128 has started for PR 4479 at commit 1b5f0a5.

  • This patch merges cleanly.

@SparkQA
Copy link

SparkQA commented Feb 9, 2015

Test build #594 has started for PR 4479 at commit 1b5f0a5.

  • This patch merges cleanly.

@davies davies changed the title [SPARK-5589] restructure pyspark.sql into multiple files [SPARK-5469] restructure pyspark.sql into multiple files Feb 9, 2015
@SparkQA
Copy link

SparkQA commented Feb 9, 2015

Test build #27128 has finished for PR 4479 at commit 1b5f0a5.

  • This patch fails Spark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@AmplabJenkins
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/27128/
Test FAILed.

@SparkQA
Copy link

SparkQA commented Feb 9, 2015

Test build #594 has finished for PR 4479 at commit 1b5f0a5.

  • This patch fails Spark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@rxin
Copy link
Contributor

rxin commented Feb 10, 2015

Jenkins, retest this please.

@SparkQA
Copy link

SparkQA commented Feb 10, 2015

Test build #27151 has started for PR 4479 at commit 1b5f0a5.

  • This patch merges cleanly.

@SparkQA
Copy link

SparkQA commented Feb 10, 2015

Test build #27151 has finished for PR 4479 at commit 1b5f0a5.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@AmplabJenkins
Copy link

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/27151/
Test PASSed.

@rxin
Copy link
Contributor

rxin commented Feb 10, 2015

Thanks. I'm merging this in master and 1.3.

asfgit pushed a commit that referenced this pull request Feb 10, 2015
All the DataTypes moved into pyspark.sql.types

The changes can be tracked by `--find-copies-harder -M25`
```
davieslocalhost:~/work/spark/python$ git diff --find-copies-harder -M25 --numstat master..
2       5       python/docs/pyspark.ml.rst
0       3       python/docs/pyspark.mllib.rst
10      2       python/docs/pyspark.sql.rst
1       1       python/pyspark/mllib/linalg.py
21      14      python/pyspark/{mllib => sql}/__init__.py
14      2108    python/pyspark/{sql.py => sql/context.py}
10      1772    python/pyspark/{sql.py => sql/dataframe.py}
7       6       python/pyspark/{sql_tests.py => sql/tests.py}
8       1465    python/pyspark/{sql.py => sql/types.py}
4       2       python/run-tests
1       1       sql/core/src/main/scala/org/apache/spark/sql/test/ExamplePointUDT.scala
```

Also `git blame -C -C python/pyspark/sql/context.py` to track the history.

Author: Davies Liu <davies@databricks.com>

Closes #4479 from davies/sql and squashes the following commits:

1b5f0a5 [Davies Liu] Merge branch 'master' of github.com:apache/spark into sql
2b2b983 [Davies Liu] restructure pyspark.sql

(cherry picked from commit 08488c1)
Signed-off-by: Reynold Xin <rxin@databricks.com>
@asfgit asfgit closed this in 08488c1 Feb 10, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants