Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Load from hdfs to hdfs #162

Open
wants to merge 534 commits into
base: master
Choose a base branch
from
Open

Load from hdfs to hdfs #162

wants to merge 534 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Mar 15, 2016

  1. UPDATE:Hadoop 2.7.1

    @Jackson1992
    Jackson1992 committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    14065ef View commit details
    Browse the repository at this point in the history

  2. Update: Hadoop 2.7.1

    @Jackson1992
    Jackson1992 committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    aeff40c View commit details
    Browse the repository at this point in the history

  3. Update: Hadoop 2.7.1

    @Jackson1992
    Jackson1992 committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    d213313 View commit details
    Browse the repository at this point in the history

  4. Update: Hadoop 2.7.1

    @Jackson1992
    Jackson1992 committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    048db58 View commit details
    Browse the repository at this point in the history

  5. Update: Hadoop 2.7.1

    @Jackson1992
    Jackson1992 committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    21d1f0b View commit details
    Browse the repository at this point in the history

  6. modify to adjust to hdfs

    @Jackson1992
    Jackson1992 committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    ad1be8d View commit details
    Browse the repository at this point in the history

  7. modify to adjust to hdfs

    @Jackson1992
    Jackson1992 committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    f926f0d View commit details
    Browse the repository at this point in the history

  8. support to start cluster from any node

    @cs-wang
    cs-wang committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    b2da789 View commit details
    Browse the repository at this point in the history

  9. support to start cluster from any node

    @cs-wang
    cs-wang committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    859b265 View commit details
    Browse the repository at this point in the history

  10. support to start cluster from any node

    @cs-wang
    cs-wang committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    f753352 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2016

  1. support to start claims on any node in cluster

    @cs-wang
    cs-wang committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    db6190a View commit details
    Browse the repository at this point in the history

  2. support to start claims on any node in cluster

    @cs-wang
    cs-wang committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    deae9c2 View commit details
    Browse the repository at this point in the history

  3. support to start claims on any node in cluster

    @cs-wang
    cs-wang committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    0104fb2 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2016

  1. announce sending message

    @fzhedu
    fzhedu committed Mar 17, 2016
    Configuration menu
    Copy the full SHA
    6bfd2ee View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2016

  1. Update: hadoop 2.7.1

    @Jackson1992
    Jackson1992 committed Mar 18, 2016
    Configuration menu
    Copy the full SHA
    5a80920 View commit details
    Browse the repository at this point in the history

  2. Update: hadoop 2.7.1

    @Jackson1992
    Jackson1992 committed Mar 18, 2016
    Configuration menu
    Copy the full SHA
    d7bf64c View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2016

  1. config and deploy improvement

    @cs-wang
    cs-wang committed Mar 20, 2016
    Configuration menu
    Copy the full SHA
    c08c1c8 View commit details
    Browse the repository at this point in the history

  2. config and deploy improvement

    @cs-wang
    cs-wang committed Mar 20, 2016
    Configuration menu
    Copy the full SHA
    ef178c7 View commit details
    Browse the repository at this point in the history

  3. config and deploy improvement

    @cs-wang
    cs-wang committed Mar 20, 2016
    Configuration menu
    Copy the full SHA
    e7c6ffc View commit details
    Browse the repository at this point in the history

  4. deploy improvement

    @cs-wang
    cs-wang committed Mar 20, 2016
    Configuration menu
    Copy the full SHA
    8d2ba04 View commit details
    Browse the repository at this point in the history

  5. deploy improvement

    @cs-wang
    cs-wang committed Mar 20, 2016
    Configuration menu
    Copy the full SHA
    f51347a View commit details
    Browse the repository at this point in the history

  6. deploy improvement

    @cs-wang
    cs-wang committed Mar 20, 2016
    Configuration menu
    Copy the full SHA
    d30ebb8 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2016

  1. solve bug 1. in logical_cross_join right broast,2. exchange sender so… 

    …cket builder,3. physical nest loop join which's right child is null but shouldn't ignored in multi partition case,4. block swith function should swap tuple_size
    @fzhedu
    fzhedu committed Mar 21, 2016
    Configuration menu
    Copy the full SHA
    17999ee View commit details
    Browse the repository at this point in the history

  2. solve bug 1. in logical_cross_join right broast,2. exchange sender so… 

    …cket builder,3. physical nest loop join which's right child is null but shouldn't ignored in multi partition case,4. block swith function should swap tuple_size
    @fzhedu
    fzhedu committed Mar 21, 2016
    Configuration menu
    Copy the full SHA
    b5f037b View commit details
    Browse the repository at this point in the history

  3. PortManager useless code delete

    @cs-wang
    cs-wang committed Mar 21, 2016
    Configuration menu
    Copy the full SHA
    b86ab60 View commit details
    Browse the repository at this point in the history

  4. PortManager useless code delete

    @cs-wang
    cs-wang committed Mar 21, 2016
    Configuration menu
    Copy the full SHA
    8e22b07 View commit details
    Browse the repository at this point in the history

  5. PortManager useless code delete

    @cs-wang
    cs-wang committed Mar 21, 2016
    Configuration menu
    Copy the full SHA
    a9f74cc View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master-new-hdfs' into scripts

    @cs-wang
    cs-wang committed Mar 21, 2016
    Configuration menu
    Copy the full SHA
    c9252ac View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master-new-hdfs' into scripts

    @cs-wang
    cs-wang committed Mar 21, 2016
    Configuration menu
    Copy the full SHA
    be85432 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master-new-hdfs' into scripts

    @cs-wang
    cs-wang committed Mar 21, 2016
    Configuration menu
    Copy the full SHA
    d7cb89a View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2016

  1. should reset block_for_asking in nest loop's next()

    @fzhedu
    fzhedu committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    8774839 View commit details
    Browse the repository at this point in the history

  2. should reset block_for_asking in nest loop's next()

    @fzhedu
    fzhedu committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    312b976 View commit details
    Browse the repository at this point in the history

  3. t push origin for_auto_testMerge branch 'FishYoung-for_auto_test' int… 

    …o for_auto_test
    @fzhedu
    fzhedu committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    af300ba View commit details
    Browse the repository at this point in the history

  4. t push origin for_auto_testMerge branch 'FishYoung-for_auto_test' int… 

    …o for_auto_test
    @fzhedu
    fzhedu committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    cb0cc77 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master-new-hdfs' of https://github.com/Jackson1992/CLAIMS… 

    … into Jackson1992-master-new-hdfs
    @fzhedu
    fzhedu committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    e7e6b32 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master-new-hdfs' of https://github.com/Jackson1992/CLAIMS… 

    … into Jackson1992-master-new-hdfs
    @fzhedu
    fzhedu committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    7b83822 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'bug_multiple_instance' into for_auto_test

    @fzhedu
    fzhedu committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    5aeaafd View commit details
    Browse the repository at this point in the history

  8. Merge branch 'bug_multiple_instance' into for_auto_test

    @fzhedu
    fzhedu committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    1799bd5 View commit details
    Browse the repository at this point in the history

  9. New Loader with new FileHandle, compiler has no complaint

    @yukai2014
    yukai2014 committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    a6bad79 View commit details
    Browse the repository at this point in the history

  10. scripts improvement

    @cs-wang
    cs-wang committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    d862e22 View commit details
    Browse the repository at this point in the history

  11. scripts improvement

    @cs-wang
    cs-wang committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    61b51d4 View commit details
    Browse the repository at this point in the history

  12. scripts improvement

    @cs-wang
    cs-wang committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    845fcd0 View commit details
    Browse the repository at this point in the history

  13. t push origin for_auto_testMerge branch 'Jackson1992-master-new-hdfs'… 

    … into for_auto_test
    @fzhedu
    fzhedu committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    57fd432 View commit details
    Browse the repository at this point in the history

  14. t push origin for_auto_testMerge branch 'Jackson1992-master-new-hdfs'… 

    … into for_auto_test
    @fzhedu
    fzhedu committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    8c70ceb View commit details
    Browse the repository at this point in the history

  15. Merge branch 'scripts' of https://github.com/cs-wang/CLAIMS into cs-w… 

    …ang-scripts
    @fzhedu
    fzhedu committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    febe9f3 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'scripts' of https://github.com/cs-wang/CLAIMS into cs-w… 

    …ang-scripts
    @fzhedu
    fzhedu committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    3cf6f16 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'scripts' of https://github.com/cs-wang/CLAIMS into cs-w… 

    …ang-scripts
    @fzhedu
    fzhedu committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    32e6700 View commit details
    Browse the repository at this point in the history

  18. t push origin for_auto_testMerge branch 'cs-wang-scripts' into for_au… 

    …to_test
    @fzhedu
    fzhedu committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    7c17e94 View commit details
    Browse the repository at this point in the history

  19. t push origin for_auto_testMerge branch 'cs-wang-scripts' into for_au… 

    …to_test
    @fzhedu
    fzhedu committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    cd3c3dd View commit details
    Browse the repository at this point in the history

  20. t push origin for_auto_testMerge branch 'cs-wang-scripts' into for_au… 

    …to_test
    @fzhedu
    fzhedu committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    d28c6c5 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2016

  1. Merge branch 'for_auto_test' of https://github.com/dase/CLAIMS

    @fzhedu
    fzhedu committed Mar 23, 2016
    Configuration menu
    Copy the full SHA
    61be0a2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'for_auto_test' of https://github.com/dase/CLAIMS

    @fzhedu
    fzhedu committed Mar 23, 2016
    Configuration menu
    Copy the full SHA
    94db32f View commit details
    Browse the repository at this point in the history

  3. merge with master i.e. the newest for_auto_test of dase

    @fzhedu
    fzhedu committed Mar 23, 2016
    Configuration menu
    Copy the full SHA
    c993288 View commit details
    Browse the repository at this point in the history

  4. delete data file results.txt

    @fzhedu
    fzhedu committed Mar 23, 2016
    Configuration menu
    Copy the full SHA
    33fc1c4 View commit details
    Browse the repository at this point in the history

  5. delete data file results.txt

    @fzhedu
    fzhedu committed Mar 23, 2016
    Configuration menu
    Copy the full SHA
    d55d2e3 View commit details
    Browse the repository at this point in the history

  6. delete results.txt

    @fzhedu
    fzhedu committed Mar 23, 2016
    Configuration menu
    Copy the full SHA
    87f7a7e View commit details
    Browse the repository at this point in the history

  7. update 2.7.1 makefile

    @fzhedu
    fzhedu committed Mar 23, 2016
    Configuration menu
    Copy the full SHA
    786f696 View commit details
    Browse the repository at this point in the history

  8. update 2.7.1 makefile

    @fzhedu
    fzhedu committed Mar 23, 2016
    Configuration menu
    Copy the full SHA
    4cddba2 View commit details
    Browse the repository at this point in the history

  9. scripts imperfect version

    @cs-wang
    cs-wang committed Mar 23, 2016
    Configuration menu
    Copy the full SHA
    052db18 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2016

  1. merge from dase/CLAIMS for_auto_test, delete result.txt in claims-tes… 

    …t/testcase
    @cs-wang
    cs-wang committed Mar 24, 2016
    Configuration menu
    Copy the full SHA
    0263b80 View commit details
    Browse the repository at this point in the history

  2. OPTIMIZE: specify FileOpenFlag in constructor function in file connctor 

    than Open()
OPTIMIZE: add is_closed flag to avoid one file connector being closed
twice
ADD: new unit test for file connector, to be pass!!!
ADD: error info sent to client when creating projection/droping table
failed
    @yukai2014
    yukai2014 committed Mar 24, 2016
    Configuration menu
    Copy the full SHA
    1a12060 View commit details
    Browse the repository at this point in the history

  3. scripts improvement

    @cs-wang
    cs-wang committed Mar 24, 2016
    Configuration menu
    Copy the full SHA
    b559eec View commit details
    Browse the repository at this point in the history

  4. scripts improvement

    @cs-wang
    cs-wang committed Mar 24, 2016
    Configuration menu
    Copy the full SHA
    6c6917f View commit details
    Browse the repository at this point in the history

  5. merge with dase0324

    @Jackson1992
    Jackson1992 committed Mar 24, 2016
    Configuration menu
    Copy the full SHA
    2973cc9 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2016

  1. test

    @Jackson1992
    Jackson1992 committed Mar 25, 2016
    Configuration menu
    Copy the full SHA
    eedaee3 View commit details
    Browse the repository at this point in the history

  2. fix a bug

    @Jackson1992
    Jackson1992 committed Mar 25, 2016
    Configuration menu
    Copy the full SHA
    5bea6ff View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'remotes/origin/autotest-dase160324' into 

    RealThreadSafeFileHandler

Conflicts:
	.gitignore
	common/Block/BlockStream.cpp
	common/file_handle/hdfs_file_handle_imp.cpp
	physical_operator/exchange_merger.cpp
    @yukai2014
    yukai2014 committed Mar 25, 2016
    Configuration menu
    Copy the full SHA
    7ad23e7 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2016

  1. ADD: destructor function in HdfsConnector to disconnect hdfs 

    FIX: bug in Close() in single_file_connector/table_file_connector
FIX: delete one ASSERT in DeleteAllTableFiles() in table_file_connector
ADD and FIX: more test cases in loader folder
    @yukai2014
    yukai2014 committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    920eb3e View commit details
    Browse the repository at this point in the history

  2. OPTIMIZE: client outputs error info in red color 

    FIX: only use HdfsConnector to provide hdfsFS in all CLAIMS
    @yukai2014
    yukai2014 committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    d7626ba View commit details
    Browse the repository at this point in the history

  3. remove CLAIMS_HOME in scripts

    @cs-wang
    cs-wang committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    26dc087 View commit details
    Browse the repository at this point in the history

  4. config to fit 90s192

    @cs-wang
    cs-wang committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    ecfc487 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2016

  1. OPTIMIZE: use .so instead of .a in Makefile.am 

    ADD: assert in catalog.cpp
FIX: bugs in file connectors test case
    @yukai2014
    yukai2014 committed Mar 29, 2016
    Configuration menu
    Copy the full SHA
    923818d View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2016

  1. scripts improve for 90s192

    @cs-wang
    cs-wang committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    758a8f5 View commit details
    Browse the repository at this point in the history

  2. bug fix

    @cs-wang
    cs-wang committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    e981ead View commit details
    Browse the repository at this point in the history

  3. bug fix

    @cs-wang
    cs-wang committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    e1b6473 View commit details
    Browse the repository at this point in the history

  4. bug fix

    @cs-wang
    cs-wang committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    b666ee1 View commit details
    Browse the repository at this point in the history

  5. script: monitor_loader.py improvement

    @cs-wang
    cs-wang committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    451d6b0 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2016

  1. ADD: close connector after saving catalog

    @yukai2014
    yukai2014 committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    fef582f View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2016

  1. could report execution status

    @fzhedu
    fzhedu committed Apr 1, 2016
    Configuration menu
    Copy the full SHA
    850e63a View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2016

  1. ok

    @fzhedu
    fzhedu committed Apr 3, 2016
    Configuration menu
    Copy the full SHA
    1473899 View commit details
    Browse the repository at this point in the history

  2. extract status class

    @fzhedu
    fzhedu committed Apr 3, 2016
    Configuration menu
    Copy the full SHA
    315ce54 View commit details
    Browse the repository at this point in the history

  3. extract status class

    @fzhedu
    fzhedu committed Apr 3, 2016
    Configuration menu
    Copy the full SHA
    2a1c3f3 View commit details
    Browse the repository at this point in the history

  4. add segment exec status paramater to open() ,next()

    @fzhedu
    fzhedu committed Apr 3, 2016
    Configuration menu
    Copy the full SHA
    0b69f16 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2016

  1. caf couldn't transfer enum type

    @fzhedu
    fzhedu committed Apr 4, 2016
    Configuration menu
    Copy the full SHA
    ce66f65 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2016

  1. tuple style improve in python script

    @cs-wang
    cs-wang committed Apr 5, 2016
    Configuration menu
    Copy the full SHA
    0b7b48a View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2016

  1. canceling segment is OK

    @fzhedu
    fzhedu committed Apr 7, 2016
    Configuration menu
    Copy the full SHA
    8fc0767 View commit details
    Browse the repository at this point in the history

  2. add left and right outer join with equal condition.

    @FishYoung
    FishYoung committed Apr 7, 2016
    Configuration menu
    Copy the full SHA
    b3343d2 View commit details
    Browse the repository at this point in the history

  3. solve the bug that chunk_list is zero by mulit insert(ReturnChunk)

    @Jackson1992
    Jackson1992 committed Apr 7, 2016
    Configuration menu
    Copy the full SHA
    6e9fec3 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2016

  1. expr value_ = NULL and it->destory()

    @fzhedu
    fzhedu committed Apr 9, 2016
    Configuration menu
    Copy the full SHA
    4de95c9 View commit details
    Browse the repository at this point in the history

  2. fix bug in exchange_merger.cpp by initalizing socket_fd

    @fzhedu
    fzhedu committed Apr 9, 2016
    Configuration menu
    Copy the full SHA
    6d67315 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2016

  1. update .gitignore by adding sbin/2-claims-conf*

    @fzhedu
    fzhedu committed Apr 11, 2016
    Configuration menu
    Copy the full SHA
    cf273cb View commit details
    Browse the repository at this point in the history

  2. merge .gitignore confict

    @fzhedu
    fzhedu committed Apr 11, 2016
    Configuration menu
    Copy the full SHA
    fac9280 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/yukai2014/Claims into yuk… 

    …ai2014-master
    @fzhedu
    fzhedu committed Apr 11, 2016
    Configuration menu
    Copy the full SHA
    c2706bf View commit details
    Browse the repository at this point in the history

  4. close some gtest related to hdfs

    @fzhedu
    fzhedu committed Apr 11, 2016
    Configuration menu
    Copy the full SHA
    32f9f6c View commit details
    Browse the repository at this point in the history

  5. t push origin for_auto_testMerge branch 'yukai2014-master' into for_a… 

    …uto_test
    @fzhedu
    fzhedu committed Apr 11, 2016
    Configuration menu
    Copy the full SHA
    f53297f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'scripts' of https://github.com/cs-wang/CLAIMS into cs-w… 

    …ang-scripts
    @fzhedu
    fzhedu committed Apr 11, 2016
    Configuration menu
    Copy the full SHA
    06fd532 View commit details
    Browse the repository at this point in the history

  7. t push origin for_auto_testMerge branch 'cs-wang-scripts' into for_au… 

    …to_test
    @fzhedu
    fzhedu committed Apr 11, 2016
    Configuration menu
    Copy the full SHA
    c1d7197 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2016

  1. update expr

    @fzhedu
    fzhedu committed Apr 13, 2016
    Configuration menu
    Copy the full SHA
    db720ab View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2016

  1. update expr in equal_join

    @fzhedu
    fzhedu committed Apr 14, 2016
    Configuration menu
    Copy the full SHA
    578fb40 View commit details
    Browse the repository at this point in the history

  2. update expr in equal_join everywhere

    @fzhedu
    fzhedu committed Apr 14, 2016
    Configuration menu
    Copy the full SHA
    ff2bbe8 View commit details
    Browse the repository at this point in the history

  3. delete useless vector

    @fzhedu
    fzhedu committed Apr 14, 2016
    Configuration menu
    Copy the full SHA
    a066354 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2016

  1. fix substring bug

    @fzhedu
    fzhedu committed Apr 15, 2016
    Configuration menu
    Copy the full SHA
    653c436 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2016

  1. add full outer join, but it just works under single thread

    @FishYoung
    FishYoung committed Apr 16, 2016
    Configuration menu
    Copy the full SHA
    155ba9f View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2016

  1. change pushdowncondition() and find bug due to deleting the member po… 

    …int of state in destructor of nest loop join
    @fzhedu
    fzhedu committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    d95d14f View commit details
    Browse the repository at this point in the history

  2. modify full outer join. Now full outer join support multiple threads.

    @FishYoung
    FishYoung committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    6578673 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2016

  1. modify the full join logic under mutiple threads.

    @FishYoung
    FishYoung committed Apr 20, 2016
    Configuration menu
    Copy the full SHA
    576f971 View commit details
    Browse the repository at this point in the history

  2. modify full outer join logic again to fix some bugs under a lot of data.

    @FishYoung
    FishYoung committed Apr 20, 2016
    Configuration menu
    Copy the full SHA
    798e355 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2016

  1. decimal optimization

    @cs-wang
    cs-wang committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    850e71c View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2016

  1. Merge with dase/for_auto_test.Fix some bugs about multiple threads pr… 

    …oducing null tuples in full join.
    @FishYoung
    FishYoung committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    2c4852c View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2016

  1. fix a bug: Hashtable iterator can not be remarked when hashtable_iter… 

    …ator.readCurrent() is not null.
    @FishYoung
    FishYoung committed Apr 25, 2016
    Configuration menu
    Copy the full SHA
    8d5e092 View commit details
    Browse the repository at this point in the history

  2. fix a bug: wrong condition about Next() exit, so the thread wait othe… 

    …r threads all the time.
    @FishYoung
    FishYoung committed Apr 25, 2016
    Configuration menu
    Copy the full SHA
    fba27a9 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2016

  1. number = 1 -> number = 4 in 4partition

    @cs-wang
    cs-wang committed Apr 28, 2016
    Configuration menu
    Copy the full SHA
    3746fd6 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2016

  1. fix old bug that occur again

    @fzhedu
    fzhedu committed Apr 30, 2016
    Configuration menu
    Copy the full SHA
    f5005b1 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2016

  1. fix bug in Debug.h which found by yk

    @fzhedu
    fzhedu committed May 2, 2016
    Configuration menu
    Copy the full SHA
    2986791 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2016

  1. Fix a bug: sometimes the tuples in hash table can't be looped through… 

    … by correct ending condition.
    @FishYoung
    FishYoung committed May 3, 2016
    Configuration menu
    Copy the full SHA
    73ba278 View commit details
    Browse the repository at this point in the history

  2. exchange tables of EqualJoin in gtest

    @fzhedu
    fzhedu committed May 3, 2016
    Configuration menu
    Copy the full SHA
    a3c4eeb View commit details
    Browse the repository at this point in the history

  3. Merge branch 'for_auto_test'

    @fzhedu
    fzhedu committed May 3, 2016
    Configuration menu
    Copy the full SHA
    34e384f View commit details
    Browse the repository at this point in the history

  4. Merge pull request dase#130 from fzhedu/master 

    update expr
    @fzhedu
    fzhedu committed May 3, 2016
    Configuration menu
    Copy the full SHA
    cfda34b View commit details
    Browse the repository at this point in the history

Commits on May 4, 2016

  1. merge from for_auto_test

    @cs-wang
    cs-wang committed May 4, 2016
    Configuration menu
    Copy the full SHA
    a99799f View commit details
    Browse the repository at this point in the history

  2. merge from for_auto_test

    @cs-wang
    cs-wang committed May 4, 2016
    Configuration menu
    Copy the full SHA
    e0b0959 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2016

  1. Merge branch 'for_auto_test_remote' into for_auto_test

    @fzhedu
    fzhedu committed May 5, 2016
    Configuration menu
    Copy the full SHA
    5d1110b View commit details
    Browse the repository at this point in the history

  2. fix bug due to my fault

    @fzhedu
    fzhedu committed May 5, 2016
    Configuration menu
    Copy the full SHA
    4c52677 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'auto_test' into decimal2

    @cs-wang
    cs-wang committed May 5, 2016
    Configuration menu
    Copy the full SHA
    c8d484f View commit details
    Browse the repository at this point in the history

  4. performance result gen

    @cs-wang
    cs-wang committed May 5, 2016
    Configuration menu
    Copy the full SHA
    791ca94 View commit details
    Browse the repository at this point in the history

  5. merge with for_auto_test_0505

    @Jackson1992
    Jackson1992 committed May 5, 2016
    Configuration menu
    Copy the full SHA
    626f852 View commit details
    Browse the repository at this point in the history

  6. check memory leak and solved

    @Jackson1992
    Jackson1992 committed May 5, 2016
    Configuration menu
    Copy the full SHA
    27d651e View commit details
    Browse the repository at this point in the history

Commits on May 6, 2016

  1. filelst sort

    @cs-wang
    cs-wang committed May 6, 2016
    Configuration menu
    Copy the full SHA
    68e2714 View commit details
    Browse the repository at this point in the history

  2. fix memory leak

    @Jackson1992
    Jackson1992 committed May 6, 2016
    Configuration menu
    Copy the full SHA
    b29ceaa View commit details
    Browse the repository at this point in the history

  3. merge with dase/CLAIMS:for_auto_test.Modify the outer join according … 

    …to the latest EXPR by Zhuhe Fang.
    @FishYoung
    FishYoung committed May 6, 2016
    Configuration menu
    Copy the full SHA
    2b3604c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'for_auto_test' of https://github.com/dase/CLAIMS into o… 

    …uter_join
    @FishYoung
    FishYoung committed May 6, 2016
    Configuration menu
    Copy the full SHA
    30bc615 View commit details
    Browse the repository at this point in the history

  5. fix a bug about join condition after merging.

    @FishYoung
    FishYoung committed May 6, 2016
    Configuration menu
    Copy the full SHA
    3cbffff View commit details
    Browse the repository at this point in the history

Commits on May 7, 2016

  1. debug

    @Jackson1992
    Jackson1992 committed May 7, 2016
    Configuration menu
    Copy the full SHA
    955e478 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2016

  1. update folder sbin

    @Jackson1992
    Jackson1992 committed May 16, 2016
    Configuration menu
    Copy the full SHA
    f756be8 View commit details
    Browse the repository at this point in the history

  2. t push origin for_auto_testMerge branch 'Jackson1992-storage' into fo… 

    …r_auto_test
    @fzhedu
    fzhedu committed May 16, 2016
    Configuration menu
    Copy the full SHA
    e200830 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'decimal2' of https://github.com/cs-wang/CLAIMS into cs-… 

    …wang-decimal2
    @fzhedu
    fzhedu committed May 16, 2016
    Configuration menu
    Copy the full SHA
    864208f View commit details
    Browse the repository at this point in the history

  4. t push origin for_auto_testMerge branch 'cs-wang-decimal2' into for_a… 

    …uto_test
    @fzhedu
    fzhedu committed May 16, 2016
    Configuration menu
    Copy the full SHA
    c95c921 View commit details
    Browse the repository at this point in the history

  5. merge with csw-decimal, change gitignore

    @fzhedu
    fzhedu committed May 16, 2016
    Configuration menu
    Copy the full SHA
    4f69ed2 View commit details
    Browse the repository at this point in the history

  6. fix bug in delete operator

    @fzhedu
    fzhedu committed May 16, 2016
    Configuration menu
    Copy the full SHA
    b7b0212 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2016

  1. merge caf to for_auto_test

    @fzhedu
    fzhedu committed May 18, 2016
    Configuration menu
    Copy the full SHA
    95b7423 View commit details
    Browse the repository at this point in the history

  2. delete useless output

    @fzhedu
    fzhedu committed May 18, 2016
    Configuration menu
    Copy the full SHA
    2a2b709 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2016

  1. correct the condition push down under outer join.

    @FishYoung
    FishYoung committed May 19, 2016
    Configuration menu
    Copy the full SHA
    8e92328 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2016

  1. fix erase() bug of unordered_map and add some comments

    @fzhedu
    fzhedu committed May 20, 2016
    Configuration menu
    Copy the full SHA
    301d74e View commit details
    Browse the repository at this point in the history

  2. fix memory leak

    @Jackson1992
    Jackson1992 committed May 20, 2016
    Configuration menu
    Copy the full SHA
    99ba77d View commit details
    Browse the repository at this point in the history

Commits on May 21, 2016

  1. reduce remote_actor

    @fzhedu
    fzhedu committed May 21, 2016
    Configuration menu
    Copy the full SHA
    91b4b5b View commit details
    Browse the repository at this point in the history

  2. update error no

    @fzhedu
    fzhedu committed May 21, 2016
    Configuration menu
    Copy the full SHA
    efb04ff View commit details
    Browse the repository at this point in the history

  3. exchange tables of EqualJoin in gtest

    @fzhedu
    fzhedu committed May 21, 2016
    Configuration menu
    Copy the full SHA
    212c0b7 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2016

  1. fix bug of dead lock

    @fzhedu
    fzhedu committed May 22, 2016
    Configuration menu
    Copy the full SHA
    1cb4488 View commit details
    Browse the repository at this point in the history

  2. delete useless LOG

    @fzhedu
    fzhedu committed May 22, 2016
    Configuration menu
    Copy the full SHA
    b1699d5 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2016

  1. merge with dase/CLAIMS:for_auto_test.Fix a bug in AstFromList, GetEqu… 

    …alJoinPair.
    @FishYoung
    FishYoung committed May 23, 2016
    Configuration menu
    Copy the full SHA
    93e7caf View commit details
    Browse the repository at this point in the history

  2. merge from for_auto_test

    @cs-wang
    cs-wang committed May 23, 2016
    Configuration menu
    Copy the full SHA
    c3d906c View commit details
    Browse the repository at this point in the history

  3. add run-gtest.sh

    @cs-wang
    cs-wang committed May 23, 2016
    Configuration menu
    Copy the full SHA
    4e4980e View commit details
    Browse the repository at this point in the history

Commits on May 24, 2016

  1. t push origin for_auto_testMerge branch 'cs-wang-decimal2' into for_a… 

    …uto_test
    @fzhedu
    fzhedu committed May 24, 2016
    Configuration menu
    Copy the full SHA
    a7c7987 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'outer_join' of https://github.com/FishYoung/CLAIMS into… 

    … FishYoung-outer_join
    @fzhedu
    fzhedu committed May 24, 2016
    Configuration menu
    Copy the full SHA
    851e28a View commit details
    Browse the repository at this point in the history

  3. add () is NULL and is not NULL, used in out join for int, u_long,varc… 

    …har, decimal
    @fzhedu
    fzhedu committed May 24, 2016
    Configuration menu
    Copy the full SHA
    5e5b04b View commit details
    Browse the repository at this point in the history

  4. t push origin for_auto_test 

    Merge branch 'FishYoung-outer_join' into for_auto_test
    @fzhedu
    fzhedu committed May 24, 2016
    Configuration menu
    Copy the full SHA
    324db4d View commit details
    Browse the repository at this point in the history

Commits on May 25, 2016

  1. update lock

    @fzhedu
    fzhedu committed May 25, 2016
    Configuration menu
    Copy the full SHA
    96db6d1 View commit details
    Browse the repository at this point in the history

  2. lock

    @Jackson1992
    Jackson1992 committed May 25, 2016
    Configuration menu
    Copy the full SHA
    173352d View commit details
    Browse the repository at this point in the history

  3. check out join

    @fzhedu
    fzhedu committed May 25, 2016
    Configuration menu
    Copy the full SHA
    e80fdf7 View commit details
    Browse the repository at this point in the history

  4. add claimsserver tracker in sbin scripts

    @cs-wang
    cs-wang committed May 25, 2016
    Configuration menu
    Copy the full SHA
    0c0979d View commit details
    Browse the repository at this point in the history

Commits on May 26, 2016

  1. Merge branch 'for_auto_test_1' into lock_muti_read

    @Jackson1992
    Jackson1992 committed May 26, 2016
    Configuration menu
    Copy the full SHA
    e570c34 View commit details
    Browse the repository at this point in the history

  2. memory lock

    @Jackson1992
    Jackson1992 committed May 26, 2016
    Configuration menu
    Copy the full SHA
    01aec4f View commit details
    Browse the repository at this point in the history

Commits on May 30, 2016

  1. open several glog in exchange_merger.cpp

    @fzhedu
    fzhedu committed May 30, 2016
    Configuration menu
    Copy the full SHA
    af6f06a View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2016

  1. scripts improvement

    @cs-wang
    cs-wang committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    f971c00 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'for_auto_test' into mergerbug

    @cs-wang
    cs-wang committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    f0ae546 View commit details
    Browse the repository at this point in the history

  3. memory leak

    @Jackson1992
    Jackson1992 committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    1e71612 View commit details
    Browse the repository at this point in the history

  4. run-gtest.sh add run time

    @cs-wang
    cs-wang committed Jun 2, 2016
    Configuration menu
    Copy the full SHA
    9ac1bc5 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2016

  1. merger bug solution1

    @cs-wang
    cs-wang committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    0505e8b View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2016

  1. add slave node try to connect to master

    @fzhedu
    fzhedu committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    df55d6f View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2016

  1. memory leak finish state 1

    @Jackson1992
    Jackson1992 committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    b6ac746 View commit details
    Browse the repository at this point in the history

  2. merger verfiy with goto

    @cs-wang
    cs-wang committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    16bb39e View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2016

  1. mergerbug without goto

    @cs-wang
    cs-wang committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    b9898bd View commit details
    Browse the repository at this point in the history

  2. add micro CONNECTION_VERIFY

    @cs-wang
    cs-wang committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    90c5c3d View commit details
    Browse the repository at this point in the history

  3. open the micro CONNECTION_VERITY

    @cs-wang
    cs-wang committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    2fa547e View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2016

  1. memory leak

    @Jackson1992
    Jackson1992 committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    f0fa971 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'forHan' into forTEST

    @Jackson1992
    Jackson1992 committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    cc303f8 View commit details
    Browse the repository at this point in the history

  3. just for test

    @Jackson1992
    Jackson1992 committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    f3f6c89 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2016

  1. fix logical_equal_join bug

    @fzhedu
    fzhedu committed Jun 12, 2016
    Configuration menu
    Copy the full SHA
    7de9c52 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2016

  1. heartbeat

    @zhejiangxiaomai
    zhejiangxiaomai committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    870f98a View commit details
    Browse the repository at this point in the history

  2. heartbeat

    @zhejiangxiaomai
    zhejiangxiaomai committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    3a89038 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2016

  1. rewrite report status

    @fzhedu
    fzhedu committed Jul 9, 2016
    Configuration menu
    Copy the full SHA
    0a4fdd6 View commit details
    Browse the repository at this point in the history

  2. for_test

    claims committed Jul 9, 2016
    Configuration menu
    Copy the full SHA
    64b3234 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2016

  1. heart

    @zhejiangxiaomai
    zhejiangxiaomai committed Jul 10, 2016
    Configuration menu
    Copy the full SHA
    53f1f7f View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2016

  1. update

    @zhejiangxiaomai
    zhejiangxiaomai committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    6c7aad1 View commit details
    Browse the repository at this point in the history

  2. modifed the sbin

    @Jackson1992
    Jackson1992 committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    5c3d6aa View commit details
    Browse the repository at this point in the history

  3. Merge branch 'for_auto_test_2' into forTEST

    @Jackson1992
    Jackson1992 committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    aa3e145 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2016

  1. reregister ok

    @zhejiangxiaomai
    zhejiangxiaomai committed Jul 14, 2016
    Configuration menu
    Copy the full SHA
    4d21f77 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2016

  1. change reporting status by event_based

    @fzhedu
    fzhedu committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    45b4d73 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2016

  1. Merge branch 'forTEST' into for_auto_test

    @cs-wang
    cs-wang committed Jul 20, 2016
    Configuration menu
    Copy the full SHA
    ab4a1d9 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2016

  1. partition

    @zhejiangxiaomai
    zhejiangxiaomai committed Jul 22, 2016
    Configuration menu
    Copy the full SHA
    798d14e View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2016

  1. fix bug about CAF by fzh

    @cs-wang
    cs-wang committed Jul 23, 2016
    Configuration menu
    Copy the full SHA
    47c439d View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2016

  1. fix reregister

    @zhejiangxiaomai
    zhejiangxiaomai committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    19cf3e3 View commit details
    Browse the repository at this point in the history

  2. fix register

    @zhejiangxiaomai
    zhejiangxiaomai committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    adb15dd View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2016

  1. blockmanager problem

    @zhejiangxiaomai
    zhejiangxiaomai committed Jul 26, 2016
    Configuration menu
    Copy the full SHA
    c1f75b7 View commit details
    Browse the repository at this point in the history

  2. master restart problem

    @zhejiangxiaomai
    zhejiangxiaomai committed Jul 26, 2016
    Configuration menu
    Copy the full SHA
    29ac380 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2016

  1. register ok , heartbeat

    @zhejiangxiaomai
    zhejiangxiaomai committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    7424432 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2016

  1. just for commit

    @zhejiangxiaomai
    zhejiangxiaomai committed Jul 31, 2016
    Configuration menu
    Copy the full SHA
    30863c7 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2016

  1. guizhoutest

    @cs-wang
    cs-wang committed Aug 1, 2016
    Configuration menu
    Copy the full SHA
    a98088c View commit details
    Browse the repository at this point in the history

  2. merge from CAFfzh for new feature update

    @cs-wang
    cs-wang committed Aug 1, 2016
    Configuration menu
    Copy the full SHA
    98939bd View commit details
    Browse the repository at this point in the history

  3. fault-tolerance step1 finish

    @zhejiangxiaomai
    zhejiangxiaomai committed Aug 1, 2016
    Configuration menu
    Copy the full SHA
    15066a6 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2016

  1. add log

    @Jackson1992
    Jackson1992 committed Aug 2, 2016
    Configuration menu
    Copy the full SHA
    47ef8b2 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2016

  1. add test of huishuiQ1

    @cs-wang
    cs-wang committed Aug 5, 2016
    Configuration menu
    Copy the full SHA
    47dd69e View commit details
    Browse the repository at this point in the history

  2. add test for huishuiQ1

    @cs-wang
    cs-wang committed Aug 5, 2016
    Configuration menu
    Copy the full SHA
    1669e02 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'update' into guizhoutest

    @cs-wang
    cs-wang committed Aug 5, 2016
    Configuration menu
    Copy the full SHA
    215ebe5 View commit details
    Browse the repository at this point in the history

  4. fix syntax

    @zhejiangxiaomai
    zhejiangxiaomai committed Aug 5, 2016
    Configuration menu
    Copy the full SHA
    8c52ab7 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2016

  1. add test for guizhou proj

    @cs-wang
    cs-wang committed Aug 7, 2016
    Configuration menu
    Copy the full SHA
    c0e27e7 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2016

  1. test for bug 0802

    @Jackson1992
    Jackson1992 committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    cfff52f View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2016

  1. add scripts monitor-guizhou-90s.sh

    @cs-wang
    cs-wang committed Aug 13, 2016
    Configuration menu
    Copy the full SHA
    a321c75 View commit details
    Browse the repository at this point in the history

  2. delete .idea

    @fzhedu
    fzhedu committed Aug 13, 2016
    Configuration menu
    Copy the full SHA
    6fd9481 View commit details
    Browse the repository at this point in the history

  3. merget

    @fzhedu
    fzhedu committed Aug 13, 2016
    Configuration menu
    Copy the full SHA
    9440dbc View commit details
    Browse the repository at this point in the history

  4. t push origin for_auto_testMerge branch 'cs-wang-guizhoutest' into fo… 

    …r_auto_test
    @fzhedu
    fzhedu committed Aug 13, 2016
    Configuration menu
    Copy the full SHA
    3e918df View commit details
    Browse the repository at this point in the history

  5. avoid reporting status when updating status

    @fzhedu
    fzhedu committed Aug 13, 2016
    Configuration menu
    Copy the full SHA
    c3152ad View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2016

  1. uniform the execute() of select stmt for avoiding error on delete stmt

    @fzhedu
    fzhedu committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    e2dc66a View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2016

  1. UPDATE support

    @cs-wang
    cs-wang committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    69d03e9 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2016

  1. Merge branch 'updatenew' into update

    @cs-wang
    cs-wang committed Aug 18, 2016
    Configuration menu
    Copy the full SHA
    a9a6ae8 View commit details
    Browse the repository at this point in the history

  2. update support step2

    @cs-wang
    cs-wang committed Aug 18, 2016
    Configuration menu
    Copy the full SHA
    9f02181 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2016

  1. update support 3

    @cs-wang
    cs-wang committed Aug 19, 2016
    Configuration menu
    Copy the full SHA
    a5de8c7 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2016

  1. fix some output

    @zhejiangxiaomai
    zhejiangxiaomai committed Aug 22, 2016
    Configuration menu
    Copy the full SHA
    248179f View commit details
    Browse the repository at this point in the history

  2. update support version 1.0

    @cs-wang
    cs-wang committed Aug 22, 2016
    Configuration menu
    Copy the full SHA
    d4b33b3 View commit details
    Browse the repository at this point in the history

  3. update support version 1.0.1

    @cs-wang
    cs-wang committed Aug 22, 2016
    Configuration menu
    Copy the full SHA
    90f78f6 View commit details
    Browse the repository at this point in the history

  4. fix bug in heartbeat stage

    @zhejiangxiaomai
    zhejiangxiaomai committed Aug 22, 2016
    Configuration menu
    Copy the full SHA
    c3e4385 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2016

  1. add error process in stmt_tracker

    @zhejiangxiaomai
    zhejiangxiaomai committed Aug 25, 2016
    Configuration menu
    Copy the full SHA
    b959c4d View commit details
    Browse the repository at this point in the history

  2. add segment KError

    @zhejiangxiaomai
    zhejiangxiaomai committed Aug 25, 2016
    Configuration menu
    Copy the full SHA
    fb99466 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2016

  1. segment kCancelled

    @zhejiangxiaomai
    zhejiangxiaomai committed Aug 26, 2016
    Configuration menu
    Copy the full SHA
    cdd44ce View commit details
    Browse the repository at this point in the history

  2. fix stmt_exec_status.cpp error_case

    @zhejiangxiaomai
    zhejiangxiaomai committed Aug 26, 2016
    Configuration menu
    Copy the full SHA
    5f01bf9 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2016

  1. avoid contention in scan (update catalog)

    @Jackson1992
    Jackson1992 committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    c27a551 View commit details
    Browse the repository at this point in the history

  2. clear unused log

    @Jackson1992
    Jackson1992 committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    5013a58 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'CAFfzh' into for_auto_test

    @Jackson1992
    Jackson1992 committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    1a210f1 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2016

  1. Add getest of outer join (dase#142) 

    * add some comment and delete or comment useless member in outer join

* add gtest of outer join from tpc-h13
    @FishYoung @fzhedu
    FishYoung authored and fzhedu committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    f8b8090 View commit details
    Browse the repository at this point in the history

  2. Merge pull request dase#144 from zhejiangxiaomai/for_auto_test 

    For auto test
    @fzhedu
    fzhedu authored Sep 1, 2016
    Configuration menu
    Copy the full SHA
    ef09710 View commit details
    Browse the repository at this point in the history

  3. merge

    @fzhedu
    fzhedu committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    cec7567 View commit details
    Browse the repository at this point in the history

  4. t push origin for_auto_testMerge branch 'Jackson1992-for_auto_test' i… 

    …nto for_auto_test
    @fzhedu
    fzhedu committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    e126f8e View commit details
    Browse the repository at this point in the history

  5. fix bug in stmt_exec_tracker.cpp:147, when it==end(), then it->first … 

    …is illegal
    @fzhedu
    fzhedu committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    16a2b3b View commit details
    Browse the repository at this point in the history

  6. update reporttime to 3s

    @fzhedu
    fzhedu committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    f78e57f View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2016

  1. merge with for_auto_test

    @zhejiangxiaomai
    zhejiangxiaomai committed Sep 2, 2016
    Configuration menu
    Copy the full SHA
    257a89b View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2016

  1. solve delete update memory leak & oom_adj script & update delete test… 

    … case
    @cs-wang
    cs-wang committed Sep 4, 2016
    Configuration menu
    Copy the full SHA
    711b91e View commit details
    Browse the repository at this point in the history

  2. delete exec_result->result_; after GenerateUpdateData

    @cs-wang
    cs-wang committed Sep 4, 2016
    Configuration menu
    Copy the full SHA
    8771e9a View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2016

  1. Merge pull request dase#146 from cs-wang/update 

    Update
    @fzhedu
    fzhedu authored Oct 3, 2016
    Configuration menu
    Copy the full SHA
    022eba2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request dase#147 from zhejiangxiaomai/new_heartbeat 

    heartbeat, tolerance recovery
    @fzhedu
    fzhedu authored Oct 3, 2016
    Configuration menu
    Copy the full SHA
    81a803f View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2016

  1. Fix a bug caused by ambiguous open_flag in load statement.

    @FishYoung
    FishYoung committed Nov 29, 2016
    Configuration menu
    Copy the full SHA
    7a1f8dd View commit details
    Browse the repository at this point in the history

  2. change assert to LoadFromFile() method

    @FishYoung
    FishYoung committed Nov 29, 2016
    Configuration menu
    Copy the full SHA
    b44f384 View commit details
    Browse the repository at this point in the history

  3. add more assert in IF branches.

    @FishYoung
    FishYoung committed Nov 29, 2016
    Configuration menu
    Copy the full SHA
    39ff784 View commit details
    Browse the repository at this point in the history

  4. Merge pull request dase#152 from FishYoung/load_stmt 

    Fix LOAD statement bug.
    @yukai2014
    yukai2014 authored Nov 29, 2016
    Configuration menu
    Copy the full SHA
    e26ba05 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2016

  1. change the threshold of memory buffer(dynamic)

    @Jackson1992
    Jackson1992 committed Dec 12, 2016
    Configuration menu
    Copy the full SHA
    7ca6b0d View commit details
    Browse the repository at this point in the history

  2. Merge pull request dase#153 from Jackson1992/for_auto_test 

    change the  threshold of memory buffer(dynamic)
    @Jackson1992
    Jackson1992 authored Dec 12, 2016
    Configuration menu
    Copy the full SHA
    4fcea4e View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2016

  1. the conflicts of loading and querying has fixed

    @Jackson1992
    Jackson1992 committed Dec 19, 2016
    Configuration menu
    Copy the full SHA
    44de51d View commit details
    Browse the repository at this point in the history

  2. Merge pull request dase#154 from Jackson1992/for_auto_test 

    the conflicts of loading and querying has fixed
    @Jackson1992
    Jackson1992 authored Dec 19, 2016
    Configuration menu
    Copy the full SHA
    6c713cb View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2017

  1. solve bug in sort

    @fzhedu
    fzhedu committed Feb 28, 2017
    Configuration menu
    Copy the full SHA
    1c99497 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'for_auto_test_remote' into for_auto_test

    @fzhedu
    fzhedu committed Feb 28, 2017
    Configuration menu
    Copy the full SHA
    e0eafdd View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2017

  1. Add the function of loading from hdfs to hdfs.

    @hchsh
    hchsh committed Mar 24, 2017
    Configuration menu
    Copy the full SHA
    95bcca9 View commit details
    Browse the repository at this point in the history

  2. Add the function of loading from hdfs to hdfs.

    @hchsh
    hchsh committed Mar 24, 2017
    Configuration menu
    Copy the full SHA
    7554cf4 View commit details
    Browse the repository at this point in the history