push code

Author: jcwangxp

Makefile

@@ -3,8 +3,8 @@ help:
 	@echo "make debug                Build crossdb library and tool with debug"
 	@echo "make run                  Run crossdb tool"
 	@echo "make clean                Clean build result"
-	@echo "make install              Install crossdb(lib&tool&header) to Linux & FreeBSD"
-	@echo "make uninstall            Uninstall crossdb from Linux & FreeBSD"
+	@echo "make install              Install crossdb(lib&tool&header) to Linux/FreeBSD"
+	@echo "make uninstall            Uninstall crossdb from Linux/FreeBSD"
 	@echo "make installmacos         Install crossdb(lib&tool&header) to MacOS"
 	@echo "make uninstallmacos       Uninstall crossdb from MacOS"
 	@echo "make example              Build and run example (need to install crossdb first)"
@@ -65,4 +65,4 @@ example:
 
 .PHONY: bench
 bench:
-	make -C bench/c/
+	make -C bench/c/

README.md

@@ -9,21 +9,22 @@
 
 > **NOTE** 
 > This project was redesigned and rewritten from scratch.
-> It's still in early development stage, so please **DO NOT** use in your project now.
+> It's still in early development stage, so please DO NOT use in your project now.
 
 # Introduction
 
-**CrossDB** is a super high-performance embedded and server RDBMS. 
-It's developed for high performance scenarios with main memory can hold whole DB. 
+**CrossDB** is a super high-performance lightweight embedded and server SQL RDBMS. 
+It's developed for high performance scenarios with main memory can hold whole DB.
 
 ## Features
 
 - Support Multiple OS Platforms: Linux/Windows/MacOS/FreeBSD etc
 - Support Multiple CPU ARCH: X86/ARM/PPC/MIPS etc
 - Support OnDisk/In-memory/RamDisk/Hybrid Storage
 - Support Standard RDBMS model
-- Support MySQL like SQL
+- Support Standard SQL and many extensions from MySQL
 - Support Multiple databases
+- Support Embedded and Client-Server mode(TBD)
 - Support Primary Key and multiple Secondary Indexes
 - Support HASH and RBTREE(TBD) Index
 - Support Multi-columns Index
@@ -33,7 +34,7 @@ It's developed for high performance scenarios with main memory can hold whole DB
 - Support Multiple Threads and Multiple Processes Access
 - Support Table level read-write lock
 - Support Reader-Writer MVCC
-- Support Embedded CrossDB Shell
+- Support Embedded CrossDB Shell with convenient auto-completion
 - Support Multi-Statments APIs
 - Support Prepared Statments APIs
 - Super High Performance
@@ -42,31 +43,44 @@ It's developed for high performance scenarios with main memory can hold whole DB
 
 ## Use Cases
 
-- You can use CrossDB In-Memory DB to manage Process Runtime Data to replace STL or hand-wrting data structures.
+- High-frenquency trade (OLTP)
+- High-peformance query
+- High-peformance data manamgent: You can use CrossDB OnDisk DB to store data on Disk/Flash/SDD.
+- High-peformance IMDB: You can use CrossDB In-Memory DB to manage Process Runtime Data to replace STL or hand-written data structures.
 - You can use CrossDB RamDisk DB to support Process Restartability, In-Service Software Upgrade(ISSU) easily.
-- You can use CrossDB OnDisk DB to store data on Disk/Flash/SDD.
 - You can use CrossDB to work as a super fast cache DB.
 
 ## Build and Install
 
+### Linux/FreeBSD
+
+```bash
+make build
+sudo make install
 ```
-make
-make install
+
+### MacOS
+
+```bash
+make build
+sudo make installmacos
 ```
 
-## Contribution
-In order to keep CrossDB quality and high-performance, this project does not 
-accept patches. 
+### Windows
 
-If you would like to suggest a change and you include a patch as a proof-of-
-concept, that would be great. 
+You need to install [MINGW64](https://www.mingw-w64.org/) to build.
+Then set `gcc` path to `system environment variables` `Path` and make sure `gcc` can run.
 
-However, please do not be offended if we rewrite your patch from scratch.
+```
+build.bat
+```
+
+## Contribution
 
 Following contributions are welcome:
 
 - Language bindings: `Python`, `Java`, `Go`, `CSharp`, `Javascript`, `PHP`, etc
 - Test and report bugs
 
 ## Want to Lean More?
-https://crossdb.org
+https://crossdb.org

bench/c/bench.c

@@ -11,7 +11,7 @@ static void ts_beg() { s_last_ts = timestamp_us (); }
 static void ts_end (int count) 
 {
 	s_last_ts = timestamp_us() - s_last_ts; 
-	printf ("Use time %uns, QPS %d\n", (uint32_t)s_last_ts, (int)((uint64_t)count*1000000/s_last_ts)); 
+	printf ("Use time %uus, QPS %d\n", (uint32_t)s_last_ts, (int)((uint64_t)count*1000000/s_last_ts)); 
 }
 
 int main (int argc, char **argv)
@@ -107,8 +107,8 @@ int main (int argc, char **argv)
 			pRow = xdb_fetch_row (pRes);
 			if (NULL != pRow) {
 				count++;
-				xdb_free_result (pRes);
 			}
+			xdb_free_result (pRes);
 		}
 		ts_end(LKUP_COUNT);
 		if (count != LKUP_COUNT) {
@@ -153,4 +153,4 @@ int main (int argc, char **argv)
 	xdb_close (pConn);
 
 	return 0;
-}
+}

build.cmd

@@ -0,0 +1,5 @@
+IF not exist build (mkdir build)
+gcc -o build/libcrossdb.dll src/crossdb.c -fPIC -shared -lws2_32 -lpthread -static -O2 -Wl,--out-implib,build/libcrossdb.lib
+gcc -o build/crossdb src/main.c -lws2_32 -lpthread -static -O2
+copy /Y src\crossdb.h build\
+xcopy /ehiqy build\* c:\crossdb\

examples/c/example.c

@@ -159,6 +159,7 @@ int main (int argc, char **argv)
 		xdb_free_result (pRes);
 	}
 
+	// Embedded shell
 	xdb_exec (pConn, "SHELL");
 
 error:

src/core/xdb_cfg.h

@@ -36,4 +36,9 @@
 
 #define XDB_PATH_LEN		256
 
-#endif // __CROSS_CFG_H__
+
+#ifndef XDB_ENABLE_SERVER
+#define XDB_ENABLE_SERVER 0
+#endif
+
+#endif // __CROSS_CFG_H__

src/core/xdb_common.h

@@ -45,6 +45,7 @@ typedef int	xdb_rowid;
 		pConn->conn_res.row_data = (uintptr_t)pConn->conn_msg.msg;	\
 		pConn->conn_msg.len = snprintf(pConn->conn_msg.msg, sizeof(pConn->conn_msg.msg)-1, errmsgfmt);	\
 		pConn->conn_msg.len_type = (XDB_RET_MSG<<28) | pConn->conn_msg.len;	\
+		pConn->conn_res.data_len = pConn->conn_msg.len;
 
 #define XDB_EXPECT_BRK(expr, code, errmsgfmt...)	\
 	if (!(expr)) {	\

src/core/xdb_conn.h

@@ -75,7 +75,7 @@ typedef struct xdb_conn_t {
 	char				*pNxtSql;
 	char				sql_buf[4096];
 
-#ifdef XDB_ENABLE_SERVER
+#if (XDB_ENABLE_SERVER == 1)
 	xdb_server_t		*pServer;
 #endif
 	xdb_rowset_t		row_set;

src/core/xdb_db.c

@@ -135,17 +135,17 @@ xdb_create_db (xdb_stmt_db_t *pStmt)
 	pDbm->bMemory = pStmt->bMemory;
 
 	xdb_stghdr_t stg_hdr = {.stg_magic = 0xE7FCFDFB, .blk_flags=1, .blk_size = sizeof(xdb_dbobj_t), 
-							.ctl_off = 0, .blk_off = XDB_OFFSET(xdb_dbHdr_t, dbobj)};
+							.ctl_off = 0, .blk_off = XDB_OFFSET(xdb_db_t, dbobj)};
 	pDbm->stg_mgr.pOps = pDbm->bMemory ? &s_xdb_store_mem_ops : &s_xdb_store_file_ops;
 	pDbm->stg_mgr.pStgHdr	= &stg_hdr;
 	int rc = xdb_stg_open (&pDbm->stg_mgr, path, NULL, NULL);
 	pDbm->lock_mode = pStmt->lock_mode;
 
-	xdb_dbHdr_t *pDbHdr = (xdb_dbHdr_t*)pDbm->stg_mgr.pStgHdr;
+	xdb_db_t *pDb = (xdb_db_t*)pDbm->stg_mgr.pStgHdr;
 	if (XDB_OK == rc) {
-		pDbHdr->lock_mode = pStmt->lock_mode;
+		pDb->lock_mode = pStmt->lock_mode;
 	} else if (0 == pDbm->lock_mode) {
-		pDbm->lock_mode = pDbHdr->lock_mode;
+		pDbm->lock_mode = pDb->lock_mode;
 	}
 
 	XDB_EXPECT (strlen(real_db_name) < sizeof (pDbm->db_path), XDB_E_PARAM, "Too long path");
@@ -299,4 +299,41 @@ xdb_gen_db_schema (xdb_dbm_t *pDbm)
 		xdb_dump_db_schema (pDbm, file);
 	}
 	return 0;
-}
+}
+
+XDB_STATIC int 
+xdb_flush_db (xdb_dbm_t *pDbm, uint32_t flags)
+{
+#if (XDB_ENABLE_WAL == 1)
+	// Switch wal if has commit, then flush tables, afterward backup wal can be recycled
+	bool bSwitch = xdb_wal_switch (pDbm);
+#endif
+
+	// flush tables
+	int count = XDB_OBJM_MAX(pDbm->db_objm);
+	for (int i = 0; i < count; ++i) {
+		xdb_tblm_t *pTblm = XDB_OBJM_GET(pDbm->db_objm, i);
+		if (NULL != pTblm) {
+			xdb_flush_table (pTblm, flags);
+		}
+	}
+
+#if (XDB_ENABLE_WAL == 1)
+	// flush backup wal if switched
+	if (bSwitch) {
+		xdb_wal_wrlock (pDbm);
+		__xdb_wal_flush (pDbm->pWalmBak, false);
+		if (pDbm->pWalm->pWal->commit_size > sizeof (xdb_wal_t)) {
+			// Mark for next round flush
+			pDbm->db_dirty = true;
+		}
+		xdb_wal_wrunlock (pDbm);
+
+		// fsync may take long time, so do it out of wal lock
+		xdb_stg_sync (pDbm->pWalm,    0, 0, false);
+		xdb_stg_sync (pDbm->pWalmBak, 0, 0, false);
+	}
+#endif
+
+	return 0;
+}

src/core/xdb_db.h

@@ -21,28 +21,38 @@
 
 typedef struct xdb_dbm_t {
 	xdb_obj_t		obj;
-	struct xdb_dbHdr_t		*pDb;
 	char			db_path[XDB_PATH_LEN+1];
 	xdb_objm_t		db_objm;
 	xdb_stgmgr_t	stg_mgr;
 	bool			bMemory;
 	bool			bSysDb;
 	xdb_lockmode_t	lock_mode;
+	bool			db_dirty;
+
+#ifdef XDB_EANBLE_WAL
+	xdb_walm_t 			wal_mgmt1;
+	xdb_walm_t 			wal_mgmt2;
+	xdb_walm_t 			*pWalm;
+	xdb_walm_t 			*pWalmBak;
+	xdb_walrow_t		*pWalRow;
+#endif
+
+	xdb_rwlock_t	wal_lock;
 } xdb_dbm_t;
 
 typedef struct xdb_dbobj_t {
 	uint64_t	val[8];
 } xdb_dbobj_t;
 
-typedef struct xdb_dbHdr_t {
+typedef struct xdb_db_t {
 	xdb_stghdr_t	blk_hdr;
 	uint64_t		lsn;
 	uint8_t			lock_mode; // xdb_lockmode_t
 	uint8_t			rsvd[7];
 	xdb_dbobj_t 	dbobj[];
-} xdb_dbHdr_t;
+} xdb_db_t;
 
 XDB_STATIC xdb_dbm_t* 
 xdb_find_db (const char *name);
 
-#endif // __XDB_DB_H__
+#endif // __XDB_DB_H__