fix sort process.

type/vos_TStmtJoin:
- deleted, merge into vos_TStmtMeta.h

op/vos_File:
- file_open: fix memory leak on open fail.
- file_raw_copy: new, function to copy file.
- file_raw_get_dirname: new, function to get directory name from path.

op/vos_Stmt:
- stmt_find_by_name: re-structure the switch.
- stmt_update_meta: new, update meta filename to the last output name.

op/vos_StmtSort:
- stmtsort_create: remove free sort->in.
- stmtsort_init_output:	split into stmtsort_init.
- stmtsort_init: new.
- stmtsort_destroy: remove unused temporary sort file.

proc/vos_create:
- vos_process_create: update meta object before processing.

proc/vos_join:
- change affect by split of stmtsort_init_output.

proc/vos_parser:
- use 'filename' as an alias if alias is not set in statement.

proc/vos_sort:
- vos_process_sort: fix bug in sort process.
	when input file is splitted into several thread and the first split
	is precisely end in a new-line character, this can cause losing of one
	row in the output file.

- sort_write: use 'get_tmp_dir()' to get temporary directory.

proc/vos_sort_merge:
- vos_sort_merge: simplified the merge process if only one file to be merged.
- single_merge: new.

vos:
- get_tmp_dir: new, function to get temporary directory.

1 files changed, 23 insertions, 1 deletions

diff --git a/proc/vos_sort_merge.c b/proc/vos_sort_merge.c
index 30bddf2..97660f1 100644
--- a/proc/vos_sort_merge.c
+++ b/proc/vos_sort_merge.c
@@ -123,6 +123,24 @@ static struct MNode * mnode_get_loser(struct MNode **root,
 	return loser;
 }
 
+static int single_merge(const char *from, const char *to)
+{
+	int	s;
+	char	*from_dir	= 0;
+	char	*to_dir		= 0;
+
+	file_raw_get_dirname(from, &from_dir);
+	file_raw_get_dirname(to, &to_dir);
+
+	if (strcmp(from_dir, to_dir) == 0) {
+		s = rename(from, to);
+	} else {
+		s = file_raw_copy(from, to);
+	}
+
+	return s;
+}
+
 int vos_sort_merge(struct Stmt *sort, struct LL *lsfile,
 			struct Record **_all_rows, unsigned long all_n_row)
 {
@@ -136,9 +154,13 @@ int vos_sort_merge(struct Stmt *sort, struct LL *lsfile,
 	struct Record	*R	= 0;
 	struct Record	*all_rows = (*_all_rows);
 
+	s = stmtsort_init_output(sort);
+	if (s)
+		return s;
+
 	/* in case of only one file to merge */
 	if (! lsfile->next) {
-		s = rename(lsfile->str, sort->out->filename);
+		s = single_merge(lsfile->str, sort->out->filename);
 		return s;
 	}