← Back to branch summary

~mmcm/akiban-server/construct-hkey-positions

~mmcm/akiban-server/construct-hkey-positions

Viewing all changes in revision 2722.

Committer: build-akiban
Date: 2013-07-29 17:21:51 UTC
mfrom: (2700.2.8 trunk)
Revision ID: build@akiban.com-20130729172151-4dq194718vcl04ak

merge tjoneslo: Add the FileMergeSort to the akiban trunk.

https://code.launchpad.net/~tjoneslo/akiban-server/file-merge-sort/+merge/176781

files added:
src/main/java/com/akiban/qp/persistitadapter/indexcursor/MergeJoinSorter.java

src/main/java/com/akiban/server/error/MergeSortIOException.java

src/test/java/com/akiban/qp/persistitadapter

src/test/java/com/akiban/qp/persistitadapter/indexcursor

src/test/java/com/akiban/qp/persistitadapter/indexcursor/KeyFinalCursorIT.java

src/test/java/com/akiban/qp/persistitadapter/indexcursor/KeyReaderWriterTest.java

src/test/java/com/akiban/server/test/it/sort/MergeJoinSorterIT.java

files modified:
pom.xml

src/main/java/com/akiban/qp/operator/SimpleQueryContext.java

src/main/java/com/akiban/qp/persistitadapter/PersistitAdapter.java

src/main/java/com/akiban/server/error/ErrorCode.java

src/main/java/com/akiban/server/service/tree/TreeServiceImpl.java

src/main/resources/com/akiban/server/error/error_code.properties

src/main/resources/com/akiban/server/service/config/configuration-defaults.properties

src/test/java/com/akiban/server/test/it/sort/MemorySorterIT.java

Show diffs side-by-side

added added

removed removed

src/main/java/com/akiban/qp/operator/SimpleQueryContext.java

src/main/java/com/akiban/qp/persistitadapter/PersistitAdapter.java

src/main/java/com/akiban/qp/persistitadapter/indexcursor/MergeJoinSorter.java

src/main/java/com/akiban/server/error/ErrorCode.java

src/main/java/com/akiban/server/error/MergeSortIOException.java

src/main/java/com/akiban/server/service/tree/TreeServiceImpl.java

src/main/resources/com/akiban/server/error/error_code.properties

src/main/resources/com/akiban/server/service/config/configuration-defaults.properties

src/test/java/com/akiban/qp/persistitadapter/

src/test/java/com/akiban/qp/persistitadapter/indexcursor/

src/test/java/com/akiban/qp/persistitadapter/indexcursor/KeyFinalCursorIT.java

src/test/java/com/akiban/qp/persistitadapter/indexcursor/KeyReaderWriterTest.java

src/test/java/com/akiban/server/test/it/sort/MemorySorterIT.java

src/test/java/com/akiban/server/test/it/sort/MergeJoinSorterIT.java

Older »