|
[-]
[+]
|
Changed |
cego.changes
|
|
|
|
[-]
[+]
|
Changed |
cego.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
cego-2.20.10.tar.bz2/samples/chkdb/debfail.sql
^
|
| @@ -1,117 +0,0 @@
-drop if exists table t1;
-create table t1( a int, b string(30));
-insert into t1 values(20, 'XXX');
-insert into t1 values(2, 'XXX');
-insert into t1 values(32, 'XXX');
-insert into t1 values(32, 'XXX');
-insert into t1 values(32, 'XXX');
-insert into t1 values(45, 'XXX');
-insert into t1 values(27, 'XXX');
-insert into t1 values(82, 'fdsfsdfsdXXX');
-insert into t1 values(423, 'XXX');
-insert into t1 values(890, 'fsdfsdfsdfsjXXX');
-insert into t1 values(412, 'XXX');
-insert into t1 values(412, 'XXX');
-insert into t1 values(412, 'XXfdsfsdfsdfsdaX');
-insert into t1 values(42, 'XXX');
-insert into t1 values(812, 'XXX');
-insert into t1 values(812, 'XXX');
-insert into t1 values(33, 'XXX');
-insert into t1 values(33, 'XXX');
-insert into t1 values(33, 'XXX');
-insert into t1 values(812, 'XXX');
-insert into t1 values(52, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(30, 'XXX');
-insert into t1 values(32, 'XXX');
-insert into t1 values(33, 'XXX');
-insert into t1 values(32, 'XXX');
-insert into t1 values(33, 'XXXfsdfsfsfs');
-insert into t1 values(32, 'XXXddddddddddfsfsdf');
-insert into t1 values(33, 'XXX');
-insert into t1 values(33, 'XXX');
-insert into t1 values(33, 'XXX');
-insert into t1 values(32, 'Xbalalllalasfsdfsfsdf');
-insert into t1 values(32, 'XXgugugugugufsdfsfsdf');
-insert into t1 values(32, 'XXrrrrrsfsdfsfsdf');
-insert into t1 values(32, 'XXppppsfsdfsfsdf');
-insert into t1 values(32, 'XXllllllsdfsfsdf');
-insert into t1 values(32, 'XXssssssfsdfsfsdf');
-insert into t1 values(32, 'XXwwwwwfsdfsfsdf');
-insert into t1 values(32, 'XXaaaaaaasdfsfsdf');
-insert into t1 values(32, 'XXX');
-insert into t1 values(45, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(3, 'XXXxxxxxxxxxx');
-insert into t1 values(3, 'XXX');
-insert into t1 values(812, 'XXX');
-insert into t1 values(812, 'XX6666666666fds');
-insert into t1 values(52, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(30, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(812, 'XXX');
-insert into t1 values(812, 'XXX');
-insert into t1 values(52, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(30, 'XXX');
-insert into t1 values(33, 'XXX');
-insert into t1 values(45, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(812, 'XXX');
-insert into t1 values(812, 'XXX');
-insert into t1 values(52, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(30, 'XXX');
-insert into t1 values(890, 'XXX');
-insert into t1 values(412, 'XXX');
-insert into t1 values(45, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(812, 'XXX');
-insert into t1 values(812, 'XXX');
-insert into t1 values(52, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(30, 'XXX');
-insert into t1 values(890, 'XXX');
-insert into t1 values(412, 'XXX');
-insert into t1 values(412, 'XXX');
-insert into t1 values(412, 'XXX');
-insert into t1 values(42, 'XXX');
-insert into t1 values(812, 'XXX');
-insert into t1 values(812, 'XXX');
-insert into t1 values(52, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(30, 'XXX');
-insert into t1 values(33, 'XXX');
-insert into t1 values(45, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(812, 'XXX');
-insert into t1 values(812, 'XXX');
-insert into t1 values(52, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(30, 'XXX');
-insert into t1 values(33, 'XXX');
-insert into t1 values(45, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(812, 'XXX');
-insert into t1 values(812, 'XXX');
-insert into t1 values(52, 'XXX');
-insert into t1 values(3, 'XXX');
-insert into t1 values(30, 'XXX');
-insert into t1 values(30, 'XXX');
-insert into t1 values(33, 'XXX');
-insert into t1 values(45, 'XXX');
-select count(*) from t1;
-
-select * from t1 where a = 32;
-create btree b1 on t1(a);
-select * from t1 where a = 32;
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/TODO
^
|
| @@ -13,10 +13,4 @@
- improve query plans
- expand system tables to show more information abuout keys, add information for checks
-
-- BTree implementation
- o table correction
-
-
-
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/configure
^
|
| @@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Cego 2.20.10.
+# Generated by GNU Autoconf 2.69 for Cego 2.20.14.
#
# Report bugs to <lemke@lemke-it.com>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='Cego'
PACKAGE_TARNAME='cego'
-PACKAGE_VERSION='2.20.10'
-PACKAGE_STRING='Cego 2.20.10'
+PACKAGE_VERSION='2.20.14'
+PACKAGE_STRING='Cego 2.20.14'
PACKAGE_BUGREPORT='lemke@lemke-it.com'
PACKAGE_URL=''
@@ -1329,7 +1329,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Cego 2.20.10 to adapt to many kinds of systems.
+\`configure' configures Cego 2.20.14 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1399,7 +1399,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Cego 2.20.10:";;
+ short | recursive ) echo "Configuration of Cego 2.20.14:";;
esac
cat <<\_ACEOF
@@ -1510,7 +1510,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Cego configure 2.20.10
+Cego configure 2.20.14
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2054,7 +2054,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Cego $as_me 2.20.10, which was
+It was created by Cego $as_me 2.20.14, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2917,7 +2917,7 @@
# Define the identity of the package.
PACKAGE='cego'
- VERSION='2.20.10'
+ VERSION='2.20.14'
cat >>confdefs.h <<_ACEOF
@@ -16806,7 +16806,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Cego $as_me 2.20.10, which was
+This file was extended by Cego $as_me 2.20.14, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16872,7 +16872,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Cego config.status 2.20.10
+Cego config.status 2.20.14
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/configure.ac
^
|
| @@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([Cego], [2.20.10], [lemke@lemke-it.com])
+AC_INIT([Cego], [2.20.14], [lemke@lemke-it.com])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_HEADERS([config.h])
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/gates/mkdb
^
|
| @@ -33,79 +33,81 @@
### end of customizing ###
CEGO=../src/cego
+ECHO="/bin/echo -n"
+ECHONL="/bin/echo"
rm -rf db
mkdir db
-rm $DBXML
+rm -rf $DBXML
-echo "Creating xml ..."
-cat > $DBXML <<EOF
-<?xml version="1.0" ?>
-<!DOCTYPE CEGO_DB_SPEC>
-<DATABASE NAME="$DBNAME" PAGESIZE="$PAGESIZE" ADMINPORT="$ADMPORT" LOGPORT="$LOGPORT" DATAPORT="$DBPORT" PIDFILE="$PIDFILE" MAXFID="1" MAXTSID="1"
- NUMRECSEMA="281" NUMSYSPAGESEMA="53" NUMDATAPAGESEMA="281" NUMIDXPAGESEMA="281" NUMRBPAGESEMA="281" NUMDATAFILESEMA="53" NUMBUFFERPOOLSEMA="31"
- CSMODE="ON">
-<MODULE NAME="ALL" LEVEL="$DEBUGLEVEL"></MODULE>
-</DATABASE>
-EOF
+$ECHO "Init database xml ..."
+$CEGO --mode=init --dbxml=${DBXML} --dbname=$DBNAME --hostname=$DBHOST --pgsize=$PAGESIZE --dbport=$DBPORT --admport=$ADMPORT --logport=$LOGPORT --pidfile=$PIDFILE
-echo "Creating admin user ...\c"
-$CEGO --mode=adduser --dbxml=${DBXML} --user=${ADMINUSER}/${ADMINPWD} --role=admin
if [ $? -eq 0 ]
then
- echo "... operation ok"
+ $ECHONL "... operation ok"
else
- echo "... operation failed"
+ $ECHONL "... operation failed"
exit 1
fi
-echo "Defining tableset ...\c"
-$CEGO --mode=define --tableset=${TS} -dbxml=${DBXML} --tsdef=tsroot:${TSROOT},tsticket:${TSTICKET},syssize:${SYSSIZE},tmpsize:${TMPSIZE},logfilesize:${LOGFILESIZE},logfilenum:${LOGFILENUM},appfile:${APPFILE},appsize:${APPSIZE}
+$ECHO "Creating database role ..."
+$CEGO --mode=addrole --dbxml=${DBXML} --role=ALL
+if [ $? -eq 0 ]
+then
+ $ECHONL "... operation ok"
+else
+ $ECHONL "... operation failed"
+ exit 1
+fi
+
+$ECHO "Creating admin user ..."
+$CEGO --mode=adduser --dbxml=${DBXML} --user=${ADMINUSER}/${ADMINPWD} --role=admin
if [ $? -eq 0 ]
then
- echo "... operation ok"
+ $ECHONL "... operation ok"
else
- echo "... operation failed"
+ $ECHONL "... operation failed"
exit 1
fi
-echo "Creating database user ...\c"
+$ECHO "Creating database user ..."
$CEGO --mode=adduser --tableset=${TS} --dbxml=${DBXML} --user=${DBUSER}/${DBPWD} --role=ALL
if [ $? -eq 0 ]
then
- echo "... operation ok"
+ $ECHONL "... operation ok"
else
- echo "... operation failed"
+ $ECHONL "... operation failed"
exit 1
fi
-echo "Creating database role ...\c"
-$CEGO --mode=addrole --dbxml=${DBXML} --role=ALL
+$ECHO "Defining tableset ..."
+$CEGO --mode=define --tableset=${TS} -dbxml=${DBXML} --tsdef=tsroot:${TSROOT},tsticket:${TSTICKET},syssize:${SYSSIZE},tmpsize:${TMPSIZE},logfilesize:${LOGFILESIZE},logfilenum:${LOGFILENUM},appfile:${APPFILE},appsize:${APPSIZE}
if [ $? -eq 0 ]
then
- echo "... operation ok"
+ $ECHONL "... operation ok"
else
- echo "... operation failed"
+ $ECHONL "... operation failed"
exit 1
fi
-echo "Creating database role permission ...\c"
+$ECHO "Creating database role permission ..."
$CEGO --mode=addperm --dbxml=${DBXML} --role=ALL --permid=P1 --tableset=${TS} --perm=ALL --filter=ALL
if [ $? -eq 0 ]
then
- echo "... operation ok"
+ $ECHONL "... operation ok"
else
- echo "... operation failed"
+ $ECHONL "... operation failed"
exit 1
fi
-echo "Creating tableset ...\c"
+$ECHO "Creating tableset ..."
$CEGO --mode=create --dbxml=${DBXML} --tableset=${TS}
if [ $? -eq 0 ]
then
- echo "... operation ok"
+ $ECHONL "... operation ok"
else
- echo "... operation failed"
+ $ECHONL "... operation failed"
exit 1
fi
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/samples/cgplustest/Makefile
^
|
| @@ -76,8 +76,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = x86_64-apple-darwin13.2.0
-host_triplet = x86_64-apple-darwin13.2.0
+build_triplet = x86_64-apple-darwin13.3.0
+host_triplet = x86_64-apple-darwin13.3.0
bin_PROGRAMS = cgplustest$(EXEEXT)
subdir = samples/cgplustest
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
@@ -164,13 +164,13 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /Users/lemke/work/cego-2.20.10/missing aclocal-1.14
+ACLOCAL = ${SHELL} /Users/lemke/work/cego-2.20.14/missing aclocal-1.14
AMTAR = $${TAR-tar}
AM_DEFAULT_VERBOSITY = 1
AR = ar
-AUTOCONF = ${SHELL} /Users/lemke/work/cego-2.20.10/missing autoconf
-AUTOHEADER = ${SHELL} /Users/lemke/work/cego-2.20.10/missing autoheader
-AUTOMAKE = ${SHELL} /Users/lemke/work/cego-2.20.10/missing automake-1.14
+AUTOCONF = ${SHELL} /Users/lemke/work/cego-2.20.14/missing autoconf
+AUTOHEADER = ${SHELL} /Users/lemke/work/cego-2.20.14/missing autoheader
+AUTOMAKE = ${SHELL} /Users/lemke/work/cego-2.20.14/missing automake-1.14
AWK = awk
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -180,7 +180,7 @@
CXX = g++
CXXCPP = g++ -E
CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -DCGDEBUG
+CXXFLAGS = -g -O2
CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
@@ -210,7 +210,7 @@
LIPO = lipo
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /Users/lemke/work/cego-2.20.10/missing makeinfo
+MAKEINFO = ${SHELL} /Users/lemke/work/cego-2.20.14/missing makeinfo
MANIFEST_TOOL = :
MINGW32DEF =
MKDIR_P = ../.././install-sh -c -d
@@ -223,21 +223,21 @@
PACKAGE = cego
PACKAGE_BUGREPORT = lemke@lemke-it.com
PACKAGE_NAME = Cego
-PACKAGE_STRING = Cego 2.20.10
+PACKAGE_STRING = Cego 2.20.14
PACKAGE_TARNAME = cego
PACKAGE_URL =
-PACKAGE_VERSION = 2.20.10
+PACKAGE_VERSION = 2.20.14
PATH_SEPARATOR = :
RANLIB = ranlib
SED = /usr/bin/sed
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
-VERSION = 2.20.10
-abs_builddir = /Users/lemke/work/cego-2.20.10/samples/cgplustest
-abs_srcdir = /Users/lemke/work/cego-2.20.10/samples/cgplustest
-abs_top_builddir = /Users/lemke/work/cego-2.20.10
-abs_top_srcdir = /Users/lemke/work/cego-2.20.10
+VERSION = 2.20.14
+abs_builddir = /Users/lemke/work/cego-2.20.14/samples/cgplustest
+abs_srcdir = /Users/lemke/work/cego-2.20.14/samples/cgplustest
+abs_top_builddir = /Users/lemke/work/cego-2.20.14
+abs_top_srcdir = /Users/lemke/work/cego-2.20.14
ac_ct_AR = ar
ac_ct_CC = gcc
ac_ct_CXX = g++
@@ -248,10 +248,10 @@
am__tar = $${TAR-tar} chof - "$$tardir"
am__untar = $${TAR-tar} xf -
bindir = ${exec_prefix}/bin
-build = x86_64-apple-darwin13.2.0
+build = x86_64-apple-darwin13.3.0
build_alias =
build_cpu = x86_64
-build_os = darwin13.2.0
+build_os = darwin13.3.0
build_vendor = apple
builddir = .
datadir = ${datarootdir}
@@ -259,15 +259,15 @@
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = x86_64-apple-darwin13.2.0
+host = x86_64-apple-darwin13.3.0
host_alias =
host_cpu = x86_64
-host_os = darwin13.2.0
+host_os = darwin13.3.0
host_vendor = apple
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = ${SHELL} /Users/lemke/work/cego-2.20.10/install-sh
+install_sh = ${SHELL} /Users/lemke/work/cego-2.20.14/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/samples/cgwraptest/Makefile
^
|
| @@ -76,8 +76,8 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = x86_64-apple-darwin13.2.0
-host_triplet = x86_64-apple-darwin13.2.0
+build_triplet = x86_64-apple-darwin13.3.0
+host_triplet = x86_64-apple-darwin13.3.0
bin_PROGRAMS = cgwtest$(EXEEXT)
subdir = samples/cgwraptest
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
@@ -164,13 +164,13 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /Users/lemke/work/cego-2.20.10/missing aclocal-1.14
+ACLOCAL = ${SHELL} /Users/lemke/work/cego-2.20.14/missing aclocal-1.14
AMTAR = $${TAR-tar}
AM_DEFAULT_VERBOSITY = 1
AR = ar
-AUTOCONF = ${SHELL} /Users/lemke/work/cego-2.20.10/missing autoconf
-AUTOHEADER = ${SHELL} /Users/lemke/work/cego-2.20.10/missing autoheader
-AUTOMAKE = ${SHELL} /Users/lemke/work/cego-2.20.10/missing automake-1.14
+AUTOCONF = ${SHELL} /Users/lemke/work/cego-2.20.14/missing autoconf
+AUTOHEADER = ${SHELL} /Users/lemke/work/cego-2.20.14/missing autoheader
+AUTOMAKE = ${SHELL} /Users/lemke/work/cego-2.20.14/missing automake-1.14
AWK = awk
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -180,7 +180,7 @@
CXX = g++
CXXCPP = g++ -E
CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -DCGDEBUG
+CXXFLAGS = -g -O2
CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
@@ -210,7 +210,7 @@
LIPO = lipo
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /Users/lemke/work/cego-2.20.10/missing makeinfo
+MAKEINFO = ${SHELL} /Users/lemke/work/cego-2.20.14/missing makeinfo
MANIFEST_TOOL = :
MINGW32DEF =
MKDIR_P = ../.././install-sh -c -d
@@ -223,21 +223,21 @@
PACKAGE = cego
PACKAGE_BUGREPORT = lemke@lemke-it.com
PACKAGE_NAME = Cego
-PACKAGE_STRING = Cego 2.20.10
+PACKAGE_STRING = Cego 2.20.14
PACKAGE_TARNAME = cego
PACKAGE_URL =
-PACKAGE_VERSION = 2.20.10
+PACKAGE_VERSION = 2.20.14
PATH_SEPARATOR = :
RANLIB = ranlib
SED = /usr/bin/sed
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
-VERSION = 2.20.10
-abs_builddir = /Users/lemke/work/cego-2.20.10/samples/cgwraptest
-abs_srcdir = /Users/lemke/work/cego-2.20.10/samples/cgwraptest
-abs_top_builddir = /Users/lemke/work/cego-2.20.10
-abs_top_srcdir = /Users/lemke/work/cego-2.20.10
+VERSION = 2.20.14
+abs_builddir = /Users/lemke/work/cego-2.20.14/samples/cgwraptest
+abs_srcdir = /Users/lemke/work/cego-2.20.14/samples/cgwraptest
+abs_top_builddir = /Users/lemke/work/cego-2.20.14
+abs_top_srcdir = /Users/lemke/work/cego-2.20.14
ac_ct_AR = ar
ac_ct_CC = gcc
ac_ct_CXX = g++
@@ -248,10 +248,10 @@
am__tar = $${TAR-tar} chof - "$$tardir"
am__untar = $${TAR-tar} xf -
bindir = ${exec_prefix}/bin
-build = x86_64-apple-darwin13.2.0
+build = x86_64-apple-darwin13.3.0
build_alias =
build_cpu = x86_64
-build_os = darwin13.2.0
+build_os = darwin13.3.0
build_vendor = apple
builddir = .
datadir = ${datarootdir}
@@ -259,15 +259,15 @@
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = x86_64-apple-darwin13.2.0
+host = x86_64-apple-darwin13.3.0
host_alias =
host_cpu = x86_64
-host_os = darwin13.2.0
+host_os = darwin13.3.0
host_vendor = apple
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = ${SHELL} /Users/lemke/work/cego-2.20.10/install-sh
+install_sh = ${SHELL} /Users/lemke/work/cego-2.20.14/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/samples/chkdb/check003.sql
^
|
| @@ -19,7 +19,6 @@
insert into t1 values ( 56, 7, 'EEEEEE' );
insert into t1 values ( 57, 8, 'KKKK' );
-
drop index id1;
drop table t1;
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/samples/chkdb/chkup
^
|
| @@ -4,13 +4,13 @@
export CGEXESHELL
CEGOPROG=../../src/cego
-POOLSIZE=1000000
+POOLSIZE=1000
if [ $# -eq 0 ]
then
- $CEGOPROG --mode=daemon --forceload --numdbthread=30 --dbxml=./db/chkdb.xml --poolsize=$POOLSIZE --protocol=serial
+ $CEGOPROG --mode=daemon --forceload --numdbthread=10 --dbxml=./db/chkdb.xml --poolsize=$POOLSIZE --protocol=serial
else
- $CEGOPROG --mode=daemon --forceload --numdbthread=30 --dbxml=./db/chkdb.xml --poolsize=$POOLSIZE --tableset=$1 --protocol=serial --cleanup
+ $CEGOPROG --mode=daemon --forceload --numdbthread=10 --dbxml=./db/chkdb.xml --poolsize=$POOLSIZE --tableset=$1 --protocol=serial --cleanup
fi
|
|
[-]
[+]
|
Added |
cego-2.20.14.tar.bz2/samples/chkdb/fixed1.sql
^
|
| @@ -0,0 +1,17 @@
+drop if exists table t1;
+create table t1 ( a int not null, b int not null );
+
+insert into t1 values ( 8, 1);
+insert into t1 values ( 7, 2);
+insert into t1 values ( 6, 2);
+-- insert into t1 values ( 8, 2);
+-- insert into t1 values ( 3, 2);
+-- insert into t1 values ( 4, 2);
+-- insert into t1 values ( 6, 2);
+-- insert into t1 values ( 7, 1);
+
+create primary btree on t1(b,a);
+
+tableinfo t1;
+
+
|
|
[-]
[+]
|
Added |
cego-2.20.14.tar.bz2/samples/chkdb/fixed2.sql
^
|
| @@ -0,0 +1,23 @@
+drop if exists table person;
+drop if exists table room;
+drop if exists table room2person;
+
+
+create table person ( pid int not null, pname string(30));
+create table room ( rid int not null, rname string(30));
+
+create table room2person ( pid int not null, rid int not null );
+create primary btree on room2person ( pid, rid);
+
+insert into person values ( 1, 'lemke');
+insert into person values ( 2, 'hugo');
+
+insert into room values ( 1, 'living');
+
+insert into room2person values ( 1, 1);
+insert into room2person values ( 2, 1);
+
+
+delete from room2person where pid = ( select pid from person where pname = 'lemke' ) and rid = ( select rid from room where rname = 'living');
+
+
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/samples/chkdb/mkdb
^
|
| @@ -38,59 +38,73 @@
mkdir db
rm -f $DBXML
-echo "Creating xml ..."
-cat > $DBXML <<EOF
-<?xml version="1.0" ?>
-<!DOCTYPE CEGO_DB_SPEC>
-<DATABASE NAME="$DBNAME" PAGESIZE="$PAGESIZE" HOSTNAME="$DBHOST" ADMINPORT="$ADMPORT" LOGPORT="$LOGPORT" DATAPORT="$DBPORT"
-PIDFILE="$PIDFILE"
-NUMRECSEMA="2141" NUMSYSPAGESEMA="441" NUMDATAPAGESEMA="41"
-NUMIDXPAGESEMA="41" NUMRBPAGESEMA="2141" NUMDATAFILESEMA="11" NUMBUFFERPOOLSEMA="11"
-MAXFIXTRIES="30"
- CSMODE="ON" QESCMODE="ON" LOGMNGPROG="./cglogmng">
-<MODULE NAME="ALL" LEVEL="$DEBUGLEVEL"></MODULE>
-</DATABASE>
-EOF
+# echo "Creating xml ..."
+# cat > $DBXML <<EOF
+# <?xml version="1.0" ?>
+# <!DOCTYPE CEGO_DB_SPEC>
+# <DATABASE NAME="$DBNAME" PAGESIZE="$PAGESIZE" HOSTNAME="$DBHOST" ADMINPORT="$ADMPORT" LOGPORT="$LOGPORT" DATAPORT="$DBPORT"
+# PIDFILE="$PIDFILE"
+# NUMRECSEMA="2141" NUMSYSPAGESEMA="441" NUMDATAPAGESEMA="41"
+# NUMIDXPAGESEMA="41" NUMRBPAGESEMA="2141" NUMDATAFILESEMA="11" NUMBUFFERPOOLSEMA="11"
+# MAXFIXTRIES="30"
+# CSMODE="ON" QESCMODE="ON" LOGMNGPROG="./cglogmng">
+# <MODULE NAME="ALL" LEVEL="$DEBUGLEVEL"></MODULE>
+# </DATABASE>
+# EOF
# <MODULE NAME="CegoTableManager" LEVEL="NOTICE"></MODULE>
# <MODULE NAME="CegoAdminThreadPool" LEVEL="NOTICE"></MODULE>
# <MODULE NAME="CegoSelect" LEVEL="NOTICE"></MODULE>
CEGOPROG=../../src/cego
+ECHO="/bin/echo -n"
+ECHONL="/bin/echo"
-echo "Creating admin user ...\c"
+$ECHO "Init database xml ..."
+$CEGOPROG --mode=init --dbxml=${DBXML} --dbname=$DBNAME --hostname=$DBHOST --pgsize=$PAGESIZE --dbport=$DBPORT --admport=$ADMPORT --logport=$LOGPORT --pidfile=$PIDFILE
+
+if [ $? -eq 0 ]
+then
+ $ECHONL "... operation ok"
+else
+ $ECHONL "... operation failed"
+ exit 1
+fi
+
+
+$ECHO "Creating admin user ..."
$CEGOPROG --mode=adduser --dbxml=${DBXML} --user=${ADMINUSER}/${ADMINPWD} --role=admin
if [ $? -eq 0 ]
then
- echo "... operation ok"
+ $ECHONL "... operation ok"
else
- echo "... operation failed"
+ $ECHONL "... operation failed"
exit 1
fi
-echo "Creating role ...\c"
+$ECHO "Creating role ..."
$CEGOPROG --mode=addrole --dbxml=${DBXML} --role=ALL
if [ $? -eq 0 ]
then
- echo "... operation ok"
+ $ECHONL "... operation ok"
else
- echo "... operation failed"
+ $ECHONL "... operation failed"
exit 1
fi
for TS in $TSLIST
do
- echo "Creating role ...\c"
+ $ECHO "Creating role ..."
$CEGOPROG --mode=addperm --dbxml=${DBXML} --permid=${TS}_P --role=ALL --tableset=$TS --filter="ALL" --perm="ALL"
if [ $? -eq 0 ]
then
- echo "... operation ok"
+ $ECHONL "... operation ok"
else
- echo "... operation failed"
+ $ECHONL "... operation failed"
exit 1
fi
done
@@ -111,33 +125,33 @@
DBPWD=lemke
- echo "Defining tableset $TS...\c"
+ $ECHO "Defining tableset $TS..."
$CEGOPROG --mode=define --tableset=${TS} -dbxml=${DBXML} --tsdef="tsroot:${TSROOT},tsticket:${TSTICKET},syssize:${SYSSIZE},tmpsize:${TMPSIZE},appsize:${APPSIZE},logfilesize:${LOGFILESIZE},logfilenum:${LOGFILENUM},sortareasize:${SORTAREASIZE}"
if [ $? -eq 0 ]
then
- echo "... operation ok"
+ $ECHONL "... operation ok"
else
- echo "... operation failed"
+ $ECHONL "... operation failed"
exit 1
fi
- echo "Creating database user for $TS ...\c"
+ $ECHO "Creating database user for $TS ..."
$CEGOPROG --mode=adduser --dbxml=${DBXML} --user=${DBUSER}/${DBPWD} --role=ALL
if [ $? -eq 0 ]
then
- echo "... operation ok"
+ $ECHONL "... operation ok"
else
- echo "... operation failed"
+ $ECHONL "... operation failed"
exit 1
fi
- echo "Creating tableset $TS...\c"
+ $ECHO "Creating tableset $TS..."
$CEGOPROG --mode=create --dbxml=${DBXML} --tableset=${TS}
if [ $? -eq 0 ]
then
- echo "... operation ok"
+ $ECHONL "... operation ok"
else
- echo "... operation failed"
+ $ECHONL "... operation failed"
exit 1
fi
done
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/src/CegoAVLIndexCursor.cc
^
|
| @@ -382,11 +382,6 @@
char* p;
int len;
- int tid;
-
- bool rbFound=false;
- bool nativeFound=false;
-
bool attrMatch = false;
if (_ie.getParent() == _rdp )
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/src/CegoAVLIndexManager.cc
^
|
| @@ -1974,8 +1974,7 @@
CegoTableObject oe;
_pTM->getObject(tabSetId, indexName, idxType, oe);
-
-
+
CegoObjectCursor* pC = _pTM->getObjectCursor(tabSetId, oe.getTabName(), indexName, idxType);
if ( ! pC )
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/src/CegoAction.cc
^
|
| @@ -2530,15 +2530,7 @@
CegoObject::ObjectType type;
- if ( _pTabMng->distObjectExists(_tableSet, idxName, CegoObject::UINDEX))
- {
- type = CegoObject::UINDEX;
- }
- else if ( _pTabMng->distObjectExists(_tableSet, idxName, CegoObject::PINDEX))
- {
- type = CegoObject::PINDEX;
- }
- else if ( _pTabMng->distObjectExists(_tableSet, idxName, CegoObject::INDEX))
+ if ( _pTabMng->distObjectExists(_tableSet, idxName, CegoObject::INDEX))
{
type = CegoObject::INDEX;
}
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/src/CegoAttrCond.cc
^
|
| @@ -79,7 +79,6 @@
CegoField *pF = fl.First();
while ( pF)
{
- bool attrFound=false;
CegoAttrComp *pAC = _attrCompSet.First();
while ( pAC )
{
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/src/CegoBTreeValue.cc
^
|
| @@ -75,12 +75,13 @@
void CegoBTreeValue::valueFromSchema(const ListT<CegoField> tableSchema, const ListT<CegoField> indexSchema)
{
-
+
// get Index len
int len = 0;
CegoField* pIF = indexSchema.First();
while (pIF)
{
+
len += pIF->getValue().getLength();
pIF = indexSchema.Next();
}
@@ -183,12 +184,12 @@
char* idxPtr1 = _pI;
char* idxPtr2 = iv.getPtr();
-
+
CegoField* pF = pSchema->First();
while (pF)
{
int len = pF->getLength();
-
+
CegoFieldValue fv1;
CegoFieldValue fv2;
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/src/CegoDatabaseManager.cc
^
|
| @@ -109,6 +109,16 @@
return _tid;
}
+const Chain& CegoDatabaseManager::ObjectRecord::getName() const
+{
+ return _objName;
+}
+
+const CegoObject::ObjectType CegoDatabaseManager::ObjectRecord::getType() const
+{
+ return _type;
+}
+
CegoDatabaseManager::ObjectRecord& CegoDatabaseManager::ObjectRecord::operator = ( const CegoDatabaseManager::ObjectRecord& t)
{
_tabSetId = t._tabSetId;
@@ -122,7 +132,24 @@
bool CegoDatabaseManager::ObjectRecord::operator == ( const CegoDatabaseManager::ObjectRecord& r)
{
- if ( _tabSetId == r._tabSetId && _objName == r._objName && _type == r._type)
+
+ bool typeMatch=false;
+ if ( ( _type == CegoObject::PINDEX || _type == CegoObject::UINDEX || _type == CegoObject::INDEX )
+ && ( r._type == CegoObject::PINDEX || r._type == CegoObject::UINDEX || r._type == CegoObject::INDEX ) )
+ {
+ typeMatch=true;
+ }
+ else if ( ( _type == CegoObject::PBTREE || _type == CegoObject::UBTREE || _type == CegoObject::BTREE )
+ && ( r._type == CegoObject::PBTREE || r._type == CegoObject::UBTREE || r._type == CegoObject::BTREE ) )
+ {
+ typeMatch=true;
+ }
+ else
+ {
+ typeMatch = _type == r._type;
+ }
+
+ if ( _tabSetId == r._tabSetId && _objName == r._objName && typeMatch )
return true;
return false;
}
@@ -729,6 +756,21 @@
}
+void CegoDatabaseManager::printObjectList()
+{
+
+ PW();
+ ObjectRecord *pOR = _objList.First();
+
+ while ( pOR )
+ {
+ cout << "ObjListEntry : " << pOR->getName() << " Type = " << pOR->getType() << endl;
+ pOR = _objList.Next();
+ }
+
+ V();
+
+}
void CegoDatabaseManager::setThreadInfo(int numDbThread, int numAdmThread, int numLogThread)
{
_numDbThread = numDbThread;
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/src/CegoDatabaseManager.h
^
|
| @@ -64,6 +64,8 @@
void removeObject(int tabSetId, const Chain& objName, CegoObject::ObjectType type);
bool objectExists(int tabSetId, const Chain& objName, CegoObject::ObjectType type);
+
+ void printObjectList();
void setThreadInfo(int numDbThread, int numAdmThread, int numLogThread);
void getThreadInfo(int& numDbThread, int& numAdmThread, int& numLogThread,
@@ -121,6 +123,9 @@
const int getTabSetId() const;
+ const Chain& getName() const;
+ const CegoObject::ObjectType getType() const;
+
void incUsed();
void decUsed();
int numUsed() const;
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/src/CegoDistManager.cc
^
|
| @@ -96,7 +96,6 @@
createBasicTableSet(tableSet);
-
Host h;
startTableSet(tableSet, h.getName(), false);
@@ -119,6 +118,7 @@
if ( isAutoCorrect )
{
+
int tabSetId = _pDBMng->getTabSetId(tableSet);
// auto correction
@@ -166,7 +166,7 @@
if ( pBTree->isValid() == false )
{
-
+
dropBTree(tabSetId, pBTree->getName());
createBTree(tabSetId, pBTree->getName(), pBTree->getTabName(), pBTree->getSchema(), pBTree->getType());
@@ -663,8 +663,14 @@
_pDBMng->removeObject(tabSetId, pCO->getName(), pCO->getType());
pCO = checkList.Next();
}
-
+
+ // _pDBMng->printObjectList();
+
+ // cout << "Removing object " << objName << " of type " << type << endl;
+
_pDBMng->removeObject(tabSetId, objName, type);
+
+ // _pDBMng->printObjectList();
if ( tableName != objName && useIt )
_pDBMng->unuseObject(tabSetId, tableName, useType, CegoDatabaseManager::EXCLUSIVE);
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/src/CegoQueryHelper.cc
^
|
| @@ -382,8 +382,20 @@
pAttrDesc1->getTableName() == Chain())
&& (Chain)pAttrDesc1->getAttrName() == (Chain)pFB->getAttrName())
{
+
+ // we have to map comparison
+ CegoComparison comp = pP->getComparison();
+ if ( comp == LESS_THAN )
+ comp = MORE_THAN;
+ else if ( comp == MORE_THAN )
+ comp = LESS_THAN;
+ else if ( comp == LESS_EQUAL_THAN )
+ comp = MORE_EQUAL_THAN;
+ else if ( comp == MORE_EQUAL_THAN )
+ comp = LESS_EQUAL_THAN;
+
ac.add(CegoAttrComp(pF->getAttrName(),
- pP->getComparison(),
+ comp,
*pAttrDesc1));
}
pFB = flArray[i].Next();
@@ -906,7 +918,7 @@
if (pBufBase == 0)
{
- throw Exception(EXLOC, "malloc system error");
+ throw Exception(EXLOC, "malloc system error");
}
char *pBuf = pBufBase;
@@ -1140,7 +1152,6 @@
void CegoQueryHelper::decodeFVL(ListT<CegoField>& fvl, char* pc, int len, int &tid, int &tastep, CegoTupleState& ts, bool doReset)
{
-
if ( doReset )
{
// make sure no field values are set
@@ -1166,10 +1177,9 @@
bool eot = false;
+ int fldCount = fvl.Size();
- CegoField* pF = fvl.First();
-
- while (pc - pBase < len && eot == false && pF)
+ while (pc - pBase < len && eot == false && fldCount > 0 )
{
int id;
memcpy(&id, pc, sizeof(int));
@@ -1177,13 +1187,6 @@
// cout << "Decoding id " << id << endl;
// cout << "PF Id = " << pF->getId() << endl;
-
- while ( pF && id > pF->getId() )
- {
- pF = fvl.Next();
- }
- if ( pF == 0 )
- return;
pc += sizeof(int);
@@ -1207,8 +1210,14 @@
CegoTypeConverter tc;
flen = tc.getTypeLen(dt);
}
-
- if (pF->getId() == id )
+
+ CegoField* pF = fvl.First();
+ while ( pF && id != pF->getId() )
+ {
+ pF = fvl.Next();
+ }
+
+ if ( pF )
{
pF->getValue().setType(dt);
pF->getValue().setLength(flen);
@@ -1222,7 +1231,8 @@
// cout << "Decoded valued " << pF->getValue() << endl;
- pF = fvl.Next();
+ fldCount--;
+
}
if ( flen > 0 )
@@ -1230,12 +1240,9 @@
pc += flen;
}
}
- /*
- if ( pF )
- {
- cout << "Decoding not complete !!!!!!! => " << pF->getId() << endl;
- }
- */
+
+ /* fldCount is the number of not encoded values => null values */
+
}
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/src/CegoRecoveryManager.cc
^
|
| @@ -467,8 +467,6 @@
}
}
}
-
-
}
_pDBMng->log(_modId, Logger::NOTICE, Chain("Finished recovery loop ..."));
@@ -640,6 +638,7 @@
CegoTableObject to;
to.decode(logRec.getData());
_pGTM->createDataTable(tabSetId, logRec.getObjName(), logRec.getObjType(), to.getSchema());
+ _pDBMng->addObject(tabSetId, logRec.getObjName(), CegoObject::TABLE);
break;
}
case CegoObject::INDEX:
@@ -649,6 +648,17 @@
CegoTableObject to;
to.decode(logRec.getData());
_pGTM->createIndexTable(tabSetId, logRec.getObjName(), to.getTabName(), to.getSchema(), logRec.getObjType());
+ _pDBMng->addObject(tabSetId, logRec.getObjName(), logRec.getObjType());
+ break;
+ }
+ case CegoObject::BTREE:
+ case CegoObject::PBTREE:
+ case CegoObject::UBTREE:
+ {
+ CegoBTreeObject bo;
+ bo.decode(logRec.getData());
+ _pGTM->createIndexTable(tabSetId, logRec.getObjName(), bo.getTabName(), bo.getSchema(), logRec.getObjType());
+ _pDBMng->addObject(tabSetId, logRec.getObjName(), logRec.getObjType());
break;
}
case CegoObject::VIEW:
@@ -656,6 +666,7 @@
CegoViewObject vo;
vo.decode(logRec.getData());
_pGTM->createViewObject(vo);
+ _pDBMng->addObject(tabSetId, logRec.getObjName(), CegoObject::VIEW);
break;
}
case CegoObject::PROCEDURE:
@@ -663,6 +674,7 @@
CegoProcObject po;
po.decode(logRec.getData());
_pGTM->createProcObject(po);
+ _pDBMng->addObject(tabSetId, logRec.getObjName(), CegoObject::PROCEDURE);
break;
}
case CegoObject::FKEY:
@@ -670,6 +682,15 @@
CegoKeyObject ko;
ko.decode(logRec.getData());
_pGTM->createKeyObject(ko);
+ _pDBMng->addObject(tabSetId, logRec.getObjName(), CegoObject::FKEY);
+ break;
+ }
+ case CegoObject::CHECK:
+ {
+ CegoCheckObject co;
+ co.decode(logRec.getData());
+ _pGTM->createCheckObject(co);
+ _pDBMng->addObject(tabSetId, logRec.getObjName(), CegoObject::CHECK);
break;
}
default:
@@ -680,6 +701,7 @@
case CegoLogRecord::LOGREC_DROP:
{
_pGTM->removeObject(tabSetId, logRec.getObjName(), logRec.getObjType());
+ _pDBMng->removeObject(tabSetId, logRec.getObjName(), logRec.getObjType());
break;
}
case CegoLogRecord::LOGREC_ALTER:
@@ -693,6 +715,8 @@
{
Chain newObjName(logRec.getData(), logRec.getDataLen());
_pGTM->renameObject(tabSetId, logRec.getObjName(), logRec.getObjType(), newObjName );
+ _pDBMng->removeObject(tabSetId, logRec.getObjName(), logRec.getObjType());
+ _pDBMng->addObject(tabSetId, newObjName, logRec.getObjType());
break;
}
case CegoLogRecord::LOGREC_BEGIN:
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/src/CegoTableCursor.cc
^
|
| @@ -75,6 +75,12 @@
ListT<CegoCheckObject> checkList;
int numInvalid;
+ if ( attrCond.numComp() == 0 )
+ {
+ _idxSetup = false;
+ return CegoAttrCond::INAPP;
+ }
+
if ( _idxSetup == false || attrCond.diff(_attrCond) == false )
{
#ifdef CGDEBUG
@@ -200,6 +206,8 @@
_attrCond = checkCond;
_attrCond.setIdxSchema(pBTO->getSchema());
+
+ cout << "B Setting attr cond = " << _attrCond << endl;
_idxName = pBTO->getName();
#ifdef CGDEBUG
@@ -231,7 +239,6 @@
}
// Setting up attribute condition to actual field values
-
#ifdef CGDEBUG
if ( _idxMatch == CegoAttrCond::FULL )
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/src/CegoTableManager.cc
^
|
| @@ -3217,8 +3217,11 @@
try
{
-
- CegoAttrCond::IndexMatch idxMatch = pTC->setup(ac);
+
+ CegoAttrCond::IndexMatch idxMatch = CegoAttrCond::INAPP;
+
+ if ( m != CegoQueryHelper::INAPP )
+ idxMatch = pTC->setup(ac);
if ( idxMatch == CegoAttrCond::INAPP )
{
@@ -3685,15 +3688,9 @@
void CegoTableManager::dropIndex(int tabSetId, const Chain& idxName)
{
- CegoObject::ObjectType idxType;
+ CegoObject::ObjectType idxType = CegoObject::INDEX;
- if ( objectExists(tabSetId, idxName, CegoObject::INDEX) )
- idxType = CegoObject::INDEX;
- else if ( objectExists(tabSetId, idxName, CegoObject::UINDEX) )
- idxType = CegoObject::UINDEX;
- else if ( objectExists(tabSetId, idxName, CegoObject::PINDEX) )
- idxType = CegoObject::PINDEX;
- else
+ if ( ! objectExists(tabSetId, idxName, idxType ) )
{
Chain msg = "Unknown index " + idxName;
throw Exception(EXLOC, msg);
@@ -3718,15 +3715,9 @@
void CegoTableManager::dropBTree(int tabSetId, const Chain& btreeName)
{
- CegoObject::ObjectType btType;
+ CegoObject::ObjectType btType = CegoObject::BTREE;
- if ( objectExists(tabSetId, btreeName, CegoObject::BTREE) )
- btType = CegoObject::BTREE;
- else if ( objectExists(tabSetId, btreeName, CegoObject::UBTREE) )
- btType = CegoObject::UBTREE;
- else if ( objectExists(tabSetId, btreeName, CegoObject::PBTREE) )
- btType = CegoObject::PBTREE;
- else
+ if ( ! objectExists(tabSetId, btreeName, btType ) )
{
Chain msg = "Unknown btree " + btreeName;
throw Exception(EXLOC, msg);
@@ -3742,7 +3733,6 @@
lr.setDataLen(0);
// lr.setTID(0);
-
logIt(tabSetId, lr);
}
@@ -3939,6 +3929,7 @@
CegoField* pF = schema.First();
while (pF)
{
+
CegoField* pSF = toe.getSchema().Find(CegoField(tableName, pF->getAttrName()));
if ( pSF )
@@ -3992,7 +3983,7 @@
CegoField* pF = schema.First();
while (pF)
{
- len += pF->getValue().getLength();
+ len += pF->getLength();
pF = schema.Next();
}
@@ -4063,11 +4054,9 @@
logIt(btoe.getTabSetId(), lr);
free(buf);
-
}
-
void CegoTableManager::createAVLIndexTable(int tabSetId, const Chain& indexName, const Chain& tableName, ListT<CegoField>& schema, CegoObject::ObjectType type)
{
CegoTableObject toe;
|
|
[-]
[+]
|
Changed |
cego-2.20.14.tar.bz2/src/CegoXMLSpace.cc
^
|
| @@ -1141,7 +1141,6 @@
pTSE->setAttribute(XML_TSROOT_ATTR, tsPath);
-
pTSE->setAttribute(XML_PRIMARY_ATTR, primary);
pTSE->setAttribute(XML_SECONDARY_ATTR, secondary);
pTSE->setAttribute(XML_MEDIATOR_ATTR, mediator);
@@ -1161,6 +1160,10 @@
pTSE->setAttribute(XML_SORTAREASIZE_ATTR, Chain( sortAreaSize ) );
+ /* default tableset values */
+ pTSE->setAttribute(XML_AUTOCORRECT_ATTR, XML_ON_VALUE);
+
+
for ( int i = 0 ; i < logFileNum ; i++ )
{
Element *pLE = new Element(XML_LOGFILE_ELEMENT);
|
