Commit e01cbb4

committed

Merge branch 'master' into SPARK-12300-fix-schmea-inferance-on-local-collections

2 parents 7ca7eca + 1b82203 commit e01cbb4Copy full SHA for e01cbb4

85 files changed

+842

-2096

lines changed

R/pkg
- NAMESPACE
- R
  - DataFrame.R
  - SQLContext.R
- inst/tests/testthat
  - test_sparkSQL.R
core/src
- main/scala/org/apache/spark
  - HttpFileServer.scala
  - HttpServer.scala
  - SparkConf.scala
  - SparkContext.scala
  - executor
    - Executor.scala
  - memory
  - rpc
    - RpcEnv.scala
    - akka
      - AkkaRpcEnv.scala
    - netty
      - NettyStreamManager.scala
  - scheduler
    - Task.scala
- test
  - java/org/apache/spark
    - memory
      - TaskMemoryManagerSuite.java
    - shuffle/sort
    - unsafe/map
      - AbstractBytesToBytesMapSuite.java
    - util/collection/unsafe/sort
      - UnsafeExternalSorterSuite.java
      - UnsafeInMemorySorterSuite.java
  - scala/org/apache/spark
    - memory
      - StaticMemoryManagerSuite.scala
      - UnifiedMemoryManagerSuite.scala
    - rpc
      - RpcEnvSuite.scala
docs
examples/src/main
- python/streaming
  - stateful_network_wordcount.py
- r
  - dataframe.R
mllib/src
- main/scala/org/apache/spark
  - mllib/api/python
    - PythonMLLibAPI.scala
  - ml/classification
    - LogisticRegression.scala
- test/scala/org/apache/spark/ml/classification
  - LogisticRegressionSuite.scala
python/pyspark/streaming
- dstream.py
- tests.py
repl
- scala-2.10/src/main/scala/org/apache/spark/repl
  - SparkILoop.scala
  - SparkIMain.scala
- scala-2.11/src/main/scala/org/apache/spark/repl
  - Main.scala
- src
  - main/scala/org/apache/spark/repl
    - ExecutorClassLoader.scala
  - test/scala/org/apache/spark/repl
    - ExecutorClassLoaderSuite.scala
sql
- catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions
  - ScalaUDF.scala
- core/src
  - main/scala/org/apache/spark/sql/execution
    - aggregate
      - udaf.scala
    - joins
      - HashedRelation.scala
  - test/scala/org/apache/spark/sql
    - DataFrameSuite.scala
    - execution
      - UnsafeFixedWidthAggregationMapSuite.scala
      - UnsafeKVExternalSorterSuite.scala
- hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver
  - SparkSQLCLIDriver.scala
- hive/src
  - main/scala/org/apache/spark/sql/hive
    - HiveContext.scala
    - test
      - TestHive.scala
  - test/scala/org/apache/spark/sql/hive
    - HiveSparkSubmitSuite.scala
    - execution
      - AggregationQuerySuite.scala
streaming/src/main/scala/org/apache/spark/streaming
- api/python
  - PythonDStream.scala
- ui
  - StreamingPage.scala

85 files changed

+842

-2096

lines changed

`‎R/pkg/NAMESPACE‎`

-Original file line number
+Diff line change
        "createExternalTable",
        "dropTempTable",
        "jsonFile",
 +       "read.json",
        "loadDF",
        "parquetFile",
        "read.df",

Comments

(0)