[GitHub] carbondata pull request #1589: [CARBONDATA-1836][Spark-2.2] Carbon Spark2.2 ...

[qiuchenjian-2]

GitHub user sounakr opened a pull request:

    https://github.com/apache/carbondata/pull/1589

    [CARBONDATA-1836][Spark-2.2] Carbon Spark2.2 Integration Resolve CatalogRelation

    Code change in order to support change in CatalogRelation case class name change to HiveTableRelation.
   
     - [ ] Any interfaces changed?
          No
     
     - [ ] Any backward compatibility impacted?
          No
     
     - [ ] Document update required?
          No
   
     - [ ] Testing done
          Yes
           
     - [ ] For large changes, please consider breaking it into sub-tasks under an umbrella JIRA.
       NA


You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/sounakr/incubator-carbondata post-22

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/carbondata/pull/1589.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #1589
   
----
commit 6a81dbe11f7fe4309528272e267bc835532b7dbb
Author: sounakr <[hidden email]>
Date:   2017-11-29T11:11:39Z

    Carbon Spark2.2 Integration Resolve Catalog Relation

----


---

[qiuchenjian-2]

Github user CarbonDataQA commented on the issue:

    https://github.com/apache/carbondata/pull/1589
 
    Build Success with Spark 2.1.0, Please check CI http://136.243.101.176:8080/job/ApacheCarbonPRBuilder1/1567/



---

[qiuchenjian-2]

Github user ravipesala commented on the issue:

    https://github.com/apache/carbondata/pull/1589
 
    SDV Build Fail , Please check CI http://144.76.159.231:8080/job/ApacheSDVTests/1966/



---

[qiuchenjian-2]

Github user CarbonDataQA commented on the issue:

    https://github.com/apache/carbondata/pull/1589
 
    Build Success with Spark 2.1.0, Please check CI http://136.243.101.176:8080/job/ApacheCarbonPRBuilder1/1599/



---

[qiuchenjian-2]

Github user ravipesala commented on the issue:

    https://github.com/apache/carbondata/pull/1589
 
    SDV Build Success , Please check CI http://144.76.159.231:8080/job/ApacheSDVTests/1995/



---

[qiuchenjian-2]

Github user ravipesala commented on a diff in the pull request:

    https://github.com/apache/carbondata/pull/1589#discussion_r154115046
 
    --- Diff: integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonFileMetastore.scala ---
    @@ -147,7 +147,11 @@ class CarbonFileMetastore extends CarbonMetaStore {
           case LogicalRelation(
           carbonDatasourceHadoopRelation: CarbonDatasourceHadoopRelation, _, _) =>
             carbonDatasourceHadoopRelation.carbonRelation
    -      case SubqueryAlias(_, c: CatalogRelation) if sparkSession.version.startsWith("2.2") =>
    +      case SubqueryAlias(_, c) if sparkSession.version.startsWith("2.2") &&
    +      (c.getClass.getName.equals("org.apache.spark.sql.catalyst.catalog.CatalogRelation") ||
    +       c.getClass.getName.equals("org.apache.spark.sql.catalyst.catalog.HiveTableRelation") ||
    +       c.getClass.getName
    +         .equals("org.apache.spark.sql.catalyst.catalog.UnresolvedCatalogRelation")) =>
    --- End diff --
   
    Please format as below
    ```
    c.getClass.getName.equals(
      "org.apache.spark.sql.catalyst.catalog.UnresolvedCatalogRelation"))
    ```


---

[qiuchenjian-2]

Github user sounakr commented on a diff in the pull request:

    https://github.com/apache/carbondata/pull/1589#discussion_r154490425
 
    --- Diff: integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonFileMetastore.scala ---
    @@ -147,7 +147,11 @@ class CarbonFileMetastore extends CarbonMetaStore {
           case LogicalRelation(
           carbonDatasourceHadoopRelation: CarbonDatasourceHadoopRelation, _, _) =>
             carbonDatasourceHadoopRelation.carbonRelation
    -      case SubqueryAlias(_, c: CatalogRelation) if sparkSession.version.startsWith("2.2") =>
    +      case SubqueryAlias(_, c) if sparkSession.version.startsWith("2.2") &&
    +      (c.getClass.getName.equals("org.apache.spark.sql.catalyst.catalog.CatalogRelation") ||
    +       c.getClass.getName.equals("org.apache.spark.sql.catalyst.catalog.HiveTableRelation") ||
    +       c.getClass.getName
    +         .equals("org.apache.spark.sql.catalyst.catalog.UnresolvedCatalogRelation")) =>
    --- End diff --
   
    Done


---

[qiuchenjian-2]

Github user CarbonDataQA commented on the issue:

    https://github.com/apache/carbondata/pull/1589
 
    Build Success with Spark 2.1.0, Please check CI http://136.243.101.176:8080/job/ApacheCarbonPRBuilder1/1638/



---

[qiuchenjian-2]

Github user ravipesala commented on the issue:

    https://github.com/apache/carbondata/pull/1589
 
    SDV Build Success , Please check CI http://144.76.159.231:8080/job/ApacheSDVTests/2028/



---

[qiuchenjian-2]

Github user CarbonDataQA commented on the issue:

    https://github.com/apache/carbondata/pull/1589
 
    Build Success with Spark 2.2.0, Please check CI http://88.99.58.216:8080/job/ApacheCarbonPRBuilder/590/



---

[qiuchenjian-2]

Github user CarbonDataQA commented on the issue:

    https://github.com/apache/carbondata/pull/1589
 
    Build Success with Spark 2.2.0, Please check CI http://88.99.58.216:8080/job/ApacheCarbonPRBuilder/592/



---

[qiuchenjian-2]

Github user ravipesala commented on the issue:

    https://github.com/apache/carbondata/pull/1589
 
    LGTM


---

[qiuchenjian-2]

Github user asfgit closed the pull request at:

    https://github.com/apache/carbondata/pull/1589


---

[qiuchenjian-2]

Github user ravipesala commented on the issue:

    https://github.com/apache/carbondata/pull/1589
 
    SDV Build Fail , Please check CI http://144.76.159.231:8080/job/ApacheSDVTests/2190/



---