Changeset: 0c3b7faa33cc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c3b7faa33cc
Added Files:
monetdb5/tests/gdkTests/Tests/selecttst.mal
monetdb5/tests/gdkTests/Tests/selecttst.stable.err
monetdb5/tests/gdkTests/Tests/selecttst.stable.out
Modified Files:
configure.ag
monetdb5/tests/gdkTests/Tests/All
testing/Mtest.py.in
Branch: Feb2013
Log Message:
Merged from Oct2012
diffs (truncated from 1019 to 300 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1115,7 +1115,7 @@ AC_ARG_WITH(python2,
case "$have_python2" in
yes|no|auto) ;;
*)
- PYTHON2="$have_python"
+ PYTHON2="$have_python2"
;;
esac
@@ -1137,28 +1137,15 @@ if test "x$PYTHON" != xno; then
case "`"$PYTHON" -V 2>&1`" in
"Python 2."[[67]]*) # older Pythons don't get Python3 syntax
PYTHON_MAJ=2
- case "$have_python2" in
- yes|auto)
- have_python2=yes
- PYTHON2="$PYTHON"
- ;;
- esac
- AC_MSG_RESULT([2])
;;
"Python 3."*)
PYTHON_MAJ=3
- case "$have_python3" in
- yes|auto)
- have_python3=yes
- PYTHON3="$PYTHON"
- ;;
- esac
- AC_MSG_RESULT([3])
;;
*)
- AC_MSG_ERROR([unknown Python version])
+ AC_MSG_ERROR([unknown or unsupported Python version])
;;
esac
+ AC_MSG_RESULT($PYTHON_MAJ)
fi
@@ -1192,10 +1179,15 @@ if test "x$have_python2" != xno; then
fi
case "$host_os-`"$PYTHON2" -V 2>&1`" in
darwin9*-*2.5.1)
- PYTHON2_LIBDIR="`"$PYTHON2" -c 'import
distutils.sysconfig; print distutils.sysconfig.get_python_lib(0,1,"")'
2>/dev/null`/site-packages";;
+ # This is the Python installed on OSX
Leopard, in
+ # later versions of OSX, Python is
fixed to return
+ # standard output
+ PYTHON2_LIBDIR="`"$PYTHON2" -c 'import
distutils.sysconfig; print
distutils.sysconfig.get_python_lib(0,1,"'"$Qprefix"'")'
2>/dev/null`/site-packages";;
*)
- PYTHON2_LIBDIR="`"$PYTHON2" -c 'import
distutils.sysconfig; print distutils.sysconfig.get_python_lib(0,0,"")'
2>/dev/null`";;
+ # Use prefix field for Ubuntu Python,
bug #3207
+ PYTHON2_LIBDIR="`"$PYTHON2" -c 'import
distutils.sysconfig; print
distutils.sysconfig.get_python_lib(0,0,"'"$Qprefix"'")' 2>/dev/null`";;
esac
+ PYTHON2_LIBDIR=`echo "$PYTHON2_LIBDIR" | sed
"s|^$Qprefix/||"`
;;
no) ;;
$Qprefix/*) dnl dubious
@@ -1246,7 +1238,9 @@ if test "x$have_python3" != xno; then
if test x$cross_compiling = xyes; then
AC_MSG_ERROR([Must specify
--with-python3-libdir when cross compiling])
fi
- PYTHON3_LIBDIR="`"$PYTHON3" -c 'import
distutils.sysconfig; print(distutils.sysconfig.get_python_lib(0,0,""))'
2>/dev/null`"
+ # Use prefix field for Ubuntu Python, bug #3207
+ PYTHON3_LIBDIR="`"$PYTHON3" -c 'import
distutils.sysconfig;
print(distutils.sysconfig.get_python_lib(0,0,"'"$Qprefix"'"))' 2>/dev/null`"
+ PYTHON3_LIBDIR=`echo "$PYTHON3_LIBDIR" | sed
"s|^$Qprefix/||"`
;;
no) ;;
$Qprefix/*) dnl dubious
diff --git a/monetdb5/tests/gdkTests/Tests/All
b/monetdb5/tests/gdkTests/Tests/All
--- a/monetdb5/tests/gdkTests/Tests/All
+++ b/monetdb5/tests/gdkTests/Tests/All
@@ -13,3 +13,4 @@ str_heap
TMsubcommit
void
scanselect
+selecttst
diff --git a/monetdb5/tests/gdkTests/Tests/selecttst.mal
b/monetdb5/tests/gdkTests/Tests/selecttst.mal
new file mode 100644
--- /dev/null
+++ b/monetdb5/tests/gdkTests/Tests/selecttst.mal
@@ -0,0 +1,209 @@
+b := bat.new(:oid,:int);
+bat.append(b,0);
+bat.append(b,1);
+bat.append(b,2);
+bat.append(b,3);
+bat.append(b,4);
+bat.append(b,5);
+bat.append(b,6);
+bat.append(b,7);
+bat.append(b,nil:int);
+io.print(b);
+
+x := algebra.subselect(b,4,nil:int,false,false,false);
+io.print("low=4 high=nil li=false hi=false anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,nil:int,true,false,false);
+io.print("low=4 high=nil li=true hi=false anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,nil:int,false,true,false);
+io.print("low=4 high=nil li=false hi=true anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,nil:int,true,true,false);
+io.print("low=4 high=nil li=true hi=true anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,nil:int,false,false,true);
+io.print("low=4 high=nil li=false hi=false anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,nil:int,true,false,true);
+io.print("low=4 high=nil li=true hi=false anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,nil:int,false,true,true);
+io.print("low=4 high=nil li=false hi=true anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,nil:int,true,true,true);
+io.print("low=4 high=nil li=true hi=true anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+
+x := algebra.subselect(b,nil:int,4,false,false,false);
+io.print("low=nil high=4 li=false hi=false anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,nil:int,4,true,false,false);
+io.print("low=nil high=4 li=true hi=false anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,nil:int,4,false,true,false);
+io.print("low=nil high=4 li=false hi=true anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,nil:int,4,true,true,false);
+io.print("low=nil high=4 li=true hi=true anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,nil:int,4,false,false,true);
+io.print("low=nil high=4 li=false hi=false anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,nil:int,4,true,false,true);
+io.print("low=nil high=4 li=true hi=false anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,nil:int,4,false,true,true);
+io.print("low=nil high=4 li=false hi=true anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,nil:int,4,true,true,true);
+io.print("low=nil high=4 li=true hi=true anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+
+x := algebra.subselect(b,4,6,false,false,false);
+io.print("low=4 high=6 li=false hi=false anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,6,true,false,false);
+io.print("low=4 high=6 li=true hi=false anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,6,false,true,false);
+io.print("low=4 high=6 li=false hi=true anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,6,true,true,false);
+io.print("low=4 high=6 li=true hi=true anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,6,false,false,true);
+io.print("low=4 high=6 li=false hi=false anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,6,true,false,true);
+io.print("low=4 high=6 li=true hi=false anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,6,false,true,true);
+io.print("low=4 high=6 li=false hi=true anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,6,true,true,true);
+io.print("low=4 high=6 li=true hi=true anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+
+x := algebra.subselect(b,6,4,false,false,false);
+io.print("low=6 high=4 li=false hi=false anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,6,4,true,false,false);
+io.print("low=6 high=4 li=true hi=false anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,6,4,false,true,false);
+io.print("low=6 high=4 li=false hi=true anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,6,4,true,true,false);
+io.print("low=6 high=4 li=true hi=true anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,6,4,false,false,true);
+io.print("low=6 high=4 li=false hi=false anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,6,4,true,false,true);
+io.print("low=6 high=4 li=true hi=false anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,6,4,false,true,true);
+io.print("low=6 high=4 li=false hi=true anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,6,4,true,true,true);
+io.print("low=6 high=4 li=true hi=true anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+
+x := algebra.subselect(b,4,4,false,false,false);
+io.print("low=4 high=4 li=false hi=false anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,4,true,false,false);
+io.print("low=4 high=4 li=true hi=false anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,4,false,true,false);
+io.print("low=4 high=4 li=false hi=true anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,4,true,true,false);
+io.print("low=4 high=4 li=true hi=true anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,4,false,false,true);
+io.print("low=4 high=4 li=false hi=false anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,4,true,false,true);
+io.print("low=4 high=4 li=true hi=false anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,4,false,true,true);
+io.print("low=4 high=4 li=false hi=true anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,4,4,true,true,true);
+io.print("low=4 high=4 li=true hi=true anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+
+x := algebra.subselect(b,nil:int,nil:int,false,false,false);
+io.print("low=nil high=nil li=false hi=false anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,nil:int,nil:int,true,false,false);
+io.print("low=nil high=nil li=true hi=false anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,nil:int,nil:int,false,true,false);
+io.print("low=nil high=nil li=false hi=true anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,nil:int,nil:int,true,true,false);
+io.print("low=nil high=nil li=true hi=true anti=false");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,nil:int,nil:int,false,false,true);
+io.print("low=nil high=nil li=false hi=false anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,nil:int,nil:int,true,false,true);
+io.print("low=nil high=nil li=true hi=false anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,nil:int,nil:int,false,true,true);
+io.print("low=nil high=nil li=false hi=true anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
+x := algebra.subselect(b,nil:int,nil:int,true,true,true);
+io.print("low=nil high=nil li=true hi=true anti=true");
+y := algebra.leftfetchjoin(x,b);
+io.print(y);
diff --git a/monetdb5/tests/gdkTests/Tests/selecttst.stable.err
b/monetdb5/tests/gdkTests/Tests/selecttst.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/tests/gdkTests/Tests/selecttst.stable.err
@@ -0,0 +1,32 @@
+stderr of test 'selecttst` in directory 'tests/gdkTests` itself:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
