GitHub user babokim opened a pull request:

    https://github.com/apache/tajo/pull/288

    TAJO-1233: Merge hbase_storage branch to the master branch

    The following test cases are failed. So those test cases are commented in 
this patch.
    ```
    TestDateTimeFunctions
      testAddMonths
      testAddDays
      testToDate
      
      
    TestIntervalType
      testIntervalPostgresqlCase
      testCaseByCase  
    ```
    
    Those test cases should be uncommented after fixing timezone bug.

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

    $ git pull https://github.com/babokim/tajo TAJO-1233

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

    https://github.com/apache/tajo/pull/288.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 #288
    
----
commit 0162270bacbd70eaca4b793047892111ccabddd0
Author: HyoungJun Kim <[email protected]>
Date:   2014-10-22T14:46:59Z

    TAJO-1121: Remove the 'v2' storage package.
    
    Closes #203

commit 78c4e3103ae649f7be10adee173cdbf20b998e2d
Author: HyoungJun Kim <[email protected]>
Date:   2014-10-26T19:25:35Z

    Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into 
hbase_storage
    
    Conflicts:
        
tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java
        
tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/HashShuffleFileWriteExec.java
        
tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PartitionMergeScanExec.java
        
tajo-core/src/main/java/org/apache/tajo/master/querymaster/Repartitioner.java
        tajo-core/src/main/java/org/apache/tajo/master/querymaster/SubQuery.java

commit cc46aeacd6f43d9872b6d676dfb21567e127890a
Author: HyoungJun Kim <[email protected]>
Date:   2014-10-27T05:28:46Z

    TAJO-1123: Use Fragment instead of FileFragment.
    
    Closes #207

commit 85627a520aa80c0339e88f450f3d5d84297bef4d
Author: HyoungJun Kim <[email protected]>
Date:   2014-11-05T09:47:35Z

    Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into 
hbase_storage
    
    Conflicts:
        CHANGES
        
tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java
        
tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java
        
tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/RangeShuffleFileWriteExec.java
        
tajo-core/src/main/java/org/apache/tajo/engine/query/QueryUnitRequest.java
        
tajo-core/src/main/java/org/apache/tajo/engine/query/QueryUnitRequestImpl.java
        tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java

commit 03c3ea2904e1e821b24e8e441b91ea7fed55df35
Author: HyoungJun Kim <[email protected]>
Date:   2014-11-12T06:37:57Z

    Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into 
hbase_storage
    
    Conflicts:
        tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
        
tajo-core/src/main/java/org/apache/tajo/master/querymaster/QueryUnit.java
        tajo-storage/src/main/java/org/apache/tajo/storage/RawFile.java
        
tajo-storage/src/test/java/org/apache/tajo/storage/TestCompressionStorages.java
        tajo-storage/src/test/java/org/apache/tajo/storage/TestStorages.java

commit 69373878b5b722ab82add0f62303019022302a73
Author: HyoungJun Kim <[email protected]>
Date:   2014-11-16T01:12:17Z

    TAJO-1131: Supports Inserting or Creating table into the HBase mapped table.
    
    Closes #232

commit 337677be7f32cb4971ca5d9c80fbe1c57b12eb8a
Author: HyoungJun Kim <[email protected]>
Date:   2014-11-25T06:58:11Z

    Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into 
hbase_storage
    
    Conflicts:
        
tajo-core/src/main/java/org/apache/tajo/master/querymaster/QueryMasterTask.java
        
tajo-storage/src/main/java/org/apache/tajo/storage/text/DelimitedTextFile.java
        
tajo-storage/src/main/java/org/apache/tajo/storage/trevni/TrevniAppender.java
        
tajo-storage/src/main/java/org/apache/tajo/storage/trevni/TrevniScanner.java
        tajo-storage/src/main/resources/storage-default.xml

commit 87c957e4399aa4e8dc382c48c11b21fe4485335b
Author: HyoungJun Kim <[email protected]>
Date:   2014-11-25T14:44:58Z

    Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into 
hbase_storage
    
    Conflicts:
        tajo-client/src/main/java/org/apache/tajo/jdbc/TajoResultSet.java
        tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
        
tajo-core/src/main/java/org/apache/tajo/master/querymaster/Repartitioner.java
        tajo-core/src/main/java/org/apache/tajo/master/querymaster/SubQuery.java
        
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java
        
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java
        
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java
        
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java
        
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java
        
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java
        
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java
        
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java
        
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterNLJoinExec.java
        
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java
        
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java
        
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
        
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java
        
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java
        
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java

commit dfd7f996d3c4a3e095dcd2ddc62fd7d6d793640d
Author: HyoungJun Kim <[email protected]>
Date:   2014-11-27T01:43:34Z

    TAJO-1122: Refactor the tajo-storage project structure.
    
    Closes #247

commit 940546a06143d9ba508b4d82a921b98b52116d0e
Author: HyoungJun Kim <[email protected]>
Date:   2014-12-05T05:38:36Z

    Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into 
hbase_storage
    
    Conflicts:
        CHANGES
        
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java
        tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
        
tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java
        tajo-core/src/main/java/org/apache/tajo/master/LazyTaskScheduler.java
        tajo-core/src/main/java/org/apache/tajo/master/querymaster/Query.java
        
tajo-core/src/main/java/org/apache/tajo/master/querymaster/QueryMasterTask.java
        tajo-core/src/main/java/org/apache/tajo/master/querymaster/SubQuery.java
        tajo-storage/pom.xml
        tajo-storage/src/test/java/org/apache/tajo/storage/TestLineReader.java
        tajo-storage/tajo-storage-common/src/main/resources/storage-default.xml
        
tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/DelimitedTextFile.java
        
tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestFileSystems.java
        
tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/s3/INode.java
        
tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/s3/InMemoryFileSystemStore.java
        
tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/s3/S3OutputStream.java
        
tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/s3/SmallBlockS3FileSystem.java
        tajo-storage/tajo-storage-hdfs/src/test/resources/testVariousTypes.avsc

commit 0073ef23a3873bbe20534f6a2a0c75a5dcbda167
Author: HyoungJun Kim <[email protected]>
Date:   2014-12-05T07:55:06Z

    Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into 
hbase_storage
    
    Conflicts:
        CHANGES
        tajo-core/src/main/java/org/apache/tajo/master/querymaster/Query.java
        
tajo-plan/src/main/java/org/apache/tajo/plan/verifier/PreLogicalPlanVerifier.java
        
tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/json/JsonLineDeserializer.java
        
tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/DelimitedTextFile.java

commit 1526b7d1073c24c653ce17b93df3290c65ffe4e2
Author: HyoungJun Kim <[email protected]>
Date:   2014-12-05T08:20:19Z

    Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into 
hbase_storage
    
    Conflicts:
        tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java

commit 073e621b35ecec50672aba549b8e65ddb4a922f4
Author: HyoungJun Kim <[email protected]>
Date:   2014-12-05T08:39:20Z

    TAJO-1233: Merge hbase_storage branch to the master branch
    
    Comment some time related testcases which are fail.

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---

Reply via email to