From 312076396657425960fede4968adabdf80ec6813 Mon Sep 17 00:00:00 2001
From: Bill <sunyinqi0508@gmail.com>
Date: Wed, 26 Oct 2022 05:52:36 +0800
Subject: [PATCH] fixes recurring bug

---
 prompt.py                    |  6 +++---
 server/table.h               |  9 +++++++++
 tests/{simple2 => jose_gh.a} | 13 ++++++++++++-
 tests/udf5.a                 | 10 ----------
 4 files changed, 24 insertions(+), 14 deletions(-)
 rename tests/{simple2 => jose_gh.a} (70%)
 delete mode 100644 tests/udf5.a

diff --git a/prompt.py b/prompt.py
index 9c486f1..cc6cb15 100644
--- a/prompt.py
+++ b/prompt.py
@@ -499,17 +499,17 @@ def prompt(running = lambda:True, next = lambda:input('> '), state = None):
                 rm(state)
                 exit()
             elif q.startswith('sh'):
-                from distutils.spawn import find_executable
+                from shutil import which
                 qs = re.split(r'[ \t]', q)
                 shells = ('zsh', 'bash', 'sh', 'fish', 'cmd', 'pwsh', 'powershell', 'csh', 'tcsh', 'ksh')
                 shell_path = ''
                 if len(qs) > 1 and qs[1] in shells:
-                    shell_path = find_executable(qs[1])
+                    shell_path = which(qs[1])
                     if shell_path:
                         os.system(shell_path)
                 else:
                     for sh in shells:
-                        shell_path = find_executable(sh)
+                        shell_path = which(sh)
                         if shell_path:
                             os.system(shell_path)
                             break
diff --git a/server/table.h b/server/table.h
index f3911af..782397e 100644
--- a/server/table.h
+++ b/server/table.h
@@ -75,6 +75,15 @@ public:
 		this->name = name;
 	}
 	template<template <typename> class VT, typename T>
+	void initfrom(VT<T>&& v, const char* name = "") {
+		ty = types::Types<_Ty>::getType();
+		this->size = v.size;
+		this->capacity = v.capacity;
+		this->container = (_Ty*)(v.container);
+		this->name = name;
+		v.capacity = 0;
+	}
+	template<template <typename> class VT, typename T>
 	void initfrom(const VT<T>& v, const char* name = "") {
 		ty = types::Types<_Ty>::getType();
 		this->size = v.size;
diff --git a/tests/simple2 b/tests/jose_gh.a
similarity index 70%
rename from tests/simple2
rename to tests/jose_gh.a
index d8f3d8c..4589202 100644
--- a/tests/simple2
+++ b/tests/jose_gh.a
@@ -17,4 +17,15 @@ INSERT INTO t VALUES(4, 'B', 40)
 INSERT INTO t VALUES(4, 'B', 80)
 
 
-SELECT * FROM t 
\ No newline at end of file
+SELECT * FROM t 
+
+FUNCTION myCov(x, y) {
+  center_x := x - avg(x);
+  center_y := y - avg(y);
+  num := sum(center_x * center_y);
+  denom := sqrt(sum(center_x * center_x)) * sqrt(sum(center_y * center_y));
+  num / denom
+  }
+
+
+select myCov(1,2);
\ No newline at end of file
diff --git a/tests/udf5.a b/tests/udf5.a
deleted file mode 100644
index 89e1d0f..0000000
--- a/tests/udf5.a
+++ /dev/null
@@ -1,10 +0,0 @@
-FUNCTION myCov(x, y) {
-  center_x := x - avg(x);
-  center_y := y - avg(y);
-  num := sum(center_x * center_y);
-  denom := sqrt(sum(center_x * center_x)) * sqrt(sum(center_y * center_y));
-  num / denom
-  }
-
-
-select myCov(1,2);
\ No newline at end of file