From 191983f1857fc24db33ae5895f1b216944f55132 Mon Sep 17 00:00:00 2001 From: prabatuty Date: Thu, 26 Jul 2007 14:48:14 +0000 Subject: [PATCH] Added more test cases and fixed failures of Table/test001 and UserManager/test001 --- csql.kdevelop.pcs | Bin 448070 -> 449730 bytes csql.kdevses | 107 ++++++++++--------------------------- src/server/Chunk.cxx | 2 +- src/server/DatabaseManagerImpl.cxx | 4 +- src/server/SessionImpl.cxx | 1 + test/dbapi/Table/inserttest1.c | 2 +- test/dbapi/UserManager/usertest1.c | 6 ++- 7 files changed, 39 insertions(+), 83 deletions(-) rewrite csql.kdevses (74%) diff --git a/csql.kdevelop.pcs b/csql.kdevelop.pcs index 96941095b6a9bd0b7a5a92f561783ce457ff5b41..7fb7af85e0ad0fa93bae0604d39acbf100639704 100644 GIT binary patch delta 13432 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 delta 12876 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 B%}W3P diff --git a/csql.kdevses b/csql.kdevses dissimilarity index 74% index a6956ab9..42128f5d 100644 --- a/csql.kdevses +++ b/csql.kdevses @@ -1,78 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/server/Chunk.cxx b/src/server/Chunk.cxx index b5c15800..269c43a1 100644 --- a/src/server/Chunk.cxx +++ b/src/server/Chunk.cxx @@ -448,7 +448,7 @@ long Chunk::getTotalDataNodes() { if (*((int*)data) == 1) { totalNodes++;} data = data + allocSize_; - } + } pageInfo = (PageInfo*)(((PageInfo*)pageInfo)->nextPage_) ; } releaseChunkMutex(); diff --git a/src/server/DatabaseManagerImpl.cxx b/src/server/DatabaseManagerImpl.cxx index 631b2649..57ce36ce 100644 --- a/src/server/DatabaseManagerImpl.cxx +++ b/src/server/DatabaseManagerImpl.cxx @@ -272,8 +272,8 @@ DbRetVal DatabaseManagerImpl::closeDatabase() printError(ErrAlready, "Database is already closed\n"); return ErrAlready; } - //check if this is the last thread to be deregistered. - if (ProcessManager::noThreads == 1) + //check if this is the last thread to be deregistered + //if (ProcessManager::noThreads == 1) { os::shm_detach((char*)db_->getMetaDataPtr()); } diff --git a/src/server/SessionImpl.cxx b/src/server/SessionImpl.cxx index 3d6b47d9..87f4567c 100644 --- a/src/server/SessionImpl.cxx +++ b/src/server/SessionImpl.cxx @@ -138,6 +138,7 @@ DbRetVal SessionImpl::open(const char *username, const char *password) CatalogTableUSER cUser(dbMgr->sysDb()); cUser.authenticate(username, password, isAuthenticated, isDba); + strcpy(userName, username); //isAuthenticated=true; dbMgr->sysDb()->releaseDatabaseMutex(); if (!isAuthenticated) diff --git a/test/dbapi/Table/inserttest1.c b/test/dbapi/Table/inserttest1.c index 98df7c9e..856e814e 100644 --- a/test/dbapi/Table/inserttest1.c +++ b/test/dbapi/Table/inserttest1.c @@ -2,7 +2,7 @@ int main() { Connection conn; - DbRetVal rv = conn.open("wrongusername", "manager"); + DbRetVal rv = conn.open("praba", "manager"); if (rv != OK) return 1; DatabaseManager *dbMgr = conn.getDatabaseManager(); if (dbMgr == NULL) { printf("Auth failed\n"); return 2;} diff --git a/test/dbapi/UserManager/usertest1.c b/test/dbapi/UserManager/usertest1.c index 1c4cbd1d..ee4b740b 100644 --- a/test/dbapi/UserManager/usertest1.c +++ b/test/dbapi/UserManager/usertest1.c @@ -7,6 +7,8 @@ int main() rv = conn.open("user1", "passwd"); if (rv == OK) return 1; + printf("connection open failed \n"); + //open with dba to create new user rv = conn.open("praba", "manager"); if (rv != OK) return 2; @@ -14,12 +16,13 @@ int main() uMgr->createUser("user1", "passwd"); rv = conn.close(); if (rv != OK) return 3; - + printf("New user created \n"); //check whether the newly created user name works rv = conn.open("user1", "passwd"); if (rv != OK) return 4; rv = conn.close(); if (rv != OK) return 5; + printf("New user login worked \n"); //check whether the newly created user name fails if //wrong password is passed @@ -33,6 +36,7 @@ int main() uMgr->deleteUser("user1"); rv = conn.close(); if (rv != OK) return 8; + printf("New user deleted \n"); //check whether it is deleted by connecting with that user //name and password. It should fail -- 2.11.4.GIT