Parser errors with inequalities #13

Author: jcwangxp

Makefile

@@ -13,7 +13,6 @@ help:
 
 .PHONY: build
 build:
-	mkdir -p build
 	$(CC) -o build/libcrossdb.so -fPIC -shared -lpthread -O2 src/crossdb.c
 	$(CC) -o build/xdb-cli src/xdb-cli.c -lpthread -O2
 	cp include/crossdb.h build/

src/core/xdb_conn.c

@@ -24,6 +24,7 @@ xdb_conn_init (xdb_conn_t* pConn)
 	pConn->bAutoCommit = true;
 	pConn->conn_stdout = stdout;
 	xdb_lv2bmp_init (&pConn->dbTrans_bmp);
+	xdb_atomic_inc (&s_xdb_conn_count);
 }
 
 xdb_conn_t*
@@ -50,7 +51,6 @@ xdb_open (const char *dbpath)
 		}
 	}
 
-	xdb_atomic_inc (&s_xdb_conn_count);
 	return pConn;
 }
 
@@ -77,7 +77,7 @@ xdb_close (xdb_conn_t* pConn)
 
 	xdb_atomic_dec (&s_xdb_conn_count);
 
-	if (0 == s_xdb_conn_count) {
+	if (1 == s_xdb_conn_count) {
 		xdb_exit ();
 	}
 }

src/core/xdb_sysdb.c

@@ -224,3 +224,10 @@ xdb_sysdb_init ()
 
 	return XDB_OK;
 }
+
+XDB_STATIC void 
+xdb_sysdb_exit ()
+{
+	xdb_close (s_xdb_sysdb_pConn);
+	s_xdb_sysdb_pConn = NULL;
+}

src/crossdb.c

@@ -103,6 +103,7 @@ xdb_exit ()
 	// Close all opened DBs
 	s_xdb_bInit = false;
 	xdb_close_all_db (NULL);
+	xdb_sysdb_exit ();
 
 	return XDB_OK;
 }

src/parser/xdb_parser_dml.c

@@ -266,40 +266,65 @@ xdb_parse_limit (xdb_conn_t* pConn, xdb_stmt_select_t *pStmt, xdb_token_t *pTkn)
 	return -XDB_E_STMT;
 }
 
+
+static xdb_op_t s_xdb_op_opposite[] = {
+	[XDB_OP_EQ] = XDB_OP_EQ,
+	[XDB_OP_NE] = XDB_OP_NE,
+	[XDB_OP_LT] = XDB_OP_GT,
+	[XDB_OP_GT] = XDB_OP_LT,
+	[XDB_OP_LE] = XDB_OP_GE,
+	[XDB_OP_GE] = XDB_OP_LE,
+};
+
 XDB_STATIC int 
 xdb_parse_where (xdb_conn_t* pConn, xdb_stmt_select_t *pStmt, xdb_token_t *pTkn)
 {
-	uint8_t bmp[8];
+	uint8_t 	bmp[8];
 	xdb_tblm_t	*pTblm = pStmt->pTblm;
-	memset (bmp, 0 , sizeof(bmp));
-	xdb_token_type type;
-	
+	memset (bmp, 0, sizeof(bmp));
+	xdb_token_type	type;
+	xdb_token_type	vtype;
+	int				vlen, flen;
+	xdb_op_t		op;
+	char 			*pVal, *pFldName;
+
 	do {
 		type = xdb_next_token (pTkn);
-		if (XDB_TOK_ID != type) {
-			break;
+		if (xdb_likely (XDB_TOK_ID == type)) {
+			pFldName = pTkn->token;
+			flen = pTkn->tk_len;
+			op = xdb_next_token (pTkn);
+			XDB_EXPECT (op >= XDB_OP_EQ && op <= XDB_OP_NE, XDB_E_STMT, "Unsupported operator");
+			vtype = xdb_next_token (pTkn);
+			pVal = pTkn->token;
+			vlen  = pTkn->tk_len;
+		} else {
+			vtype = type;
+			pVal = pTkn->token;
+			vlen  = pTkn->tk_len;
+			op = xdb_next_token (pTkn);
+			XDB_EXPECT (op >= XDB_OP_EQ && op <= XDB_OP_NE, XDB_E_STMT, "Unsupported operator");
+			op = s_xdb_op_opposite[op];
+			type = xdb_next_token (pTkn);
+			XDB_EXPECT (XDB_TOK_ID == type, XDB_E_STMT, "One val must be field");
+			pFldName = pTkn->token;
+			flen = pTkn->tk_len;
 		}
-		int fld_id = xdb_find_field (pStmt->pTblm, pTkn->token, pTkn->tk_len);
-		XDB_EXPECT (fld_id>=0, XDB_E_STMT, "Can't find field '%s'", pTkn->token);
+		int fld_id = xdb_find_field (pStmt->pTblm, pFldName, flen);
+		XDB_EXPECT (fld_id>=0, XDB_E_STMT, "Can't find field '%s'", pFldName);
 		xdb_filter_t *pFilter = &pStmt->filters[pStmt->filter_count];
 		pStmt->pFilters[pStmt->filter_count++] = pFilter;
 		//pFilter->fld_off	= pField->fld_off;
 		//pFilter->fld_type	= pField->fld_type;
 		xdb_field_t *pField = &pStmt->pTblm->pFields[fld_id];
 		pFilter->pField = pField;
 
-		type = xdb_next_token (pTkn);
-		//XDB_EXPECT (XDB_TOK_EQ == type, XDB_E_STMT, "Miss =");
-		if (xdb_likely (XDB_TOK_EQ == type)) {
+		if (xdb_likely (XDB_OP_EQ == op)) {
 			bmp[fld_id>>3] |= (1<<(fld_id&7));
-			pFilter->cmp_op = XDB_OP_EQ;
-		} else {
-			XDB_EXPECT (type > XDB_TOK_EQ && type <= XDB_TOK_NE, XDB_E_STMT, "Unsupported operator");
-			pFilter->cmp_op = type;
 		}
-		type = xdb_next_token (pTkn);
+		pFilter->cmp_op = op;
 
-		if (xdb_unlikely (XDB_TOK_QM == type)) {
+		if (xdb_unlikely (XDB_TOK_QM == vtype)) {
 			pFilter->val.fld_type = pField->fld_type;
 			pFilter->val.val_type = pField->sup_type;
 			pStmt->pBind[pStmt->bind_count++] = &pFilter->val;
@@ -309,19 +334,22 @@ xdb_parse_where (xdb_conn_t* pConn, xdb_stmt_select_t *pStmt, xdb_token_t *pTkn)
 			case XDB_TYPE_BIGINT:
 			case XDB_TYPE_TINYINT:
 			case XDB_TYPE_SMALLINT:
-				pFilter->val.ival = atoll (pTkn->token);
+				XDB_EXPECT (XDB_TOK_NUM == vtype, XDB_E_STMT, "Expect Value");
+				pFilter->val.ival = atoll (pVal);
 				pFilter->val.val_type = XDB_TYPE_BIGINT;
 				//xdb_print ("%s = %d\n", pField->fld_name.str, pFilter->val.ival);
 				break;
 			case XDB_TYPE_CHAR:
-				pFilter->val.str.len = pTkn->tk_len;
-				pFilter->val.str.ptr = pTkn->token;
+				XDB_EXPECT (XDB_TOK_STR == vtype, XDB_E_STMT, "Expect Value");
+				pFilter->val.str.len = vlen;
+				pFilter->val.str.ptr = pVal;
 				pFilter->val.val_type = XDB_TYPE_CHAR;
 				//xdb_print ("%s = %s\n", pField->fld_name.str, pFilter->val.str.ptr);
 				break;
 			case XDB_TYPE_FLOAT:
 			case XDB_TYPE_DOUBLE:
-				pFilter->val.fval = atof (pTkn->token);
+				XDB_EXPECT (XDB_TOK_NUM == vtype, XDB_E_STMT, "Expect Value");
+				pFilter->val.fval = atof (pVal);
 				pFilter->val.val_type = XDB_TYPE_DOUBLE;
 				//xdb_print ("%s = %d\n", pField->fld_name.str, pFilter->val.ival);
 				break;

src/parser/xdb_stmt.h

@@ -212,6 +212,7 @@ typedef enum xdb_op_t {
 	XDB_OP_GT 	= XDB_TOK_GT, 	// >
 	XDB_OP_GE 	= XDB_TOK_GE, 	// >=
 	XDB_OP_NE 	= XDB_TOK_NE, 	// != <>
+	XDB_OP_MAX	= XDB_OP_NE,
 	XDB_OP_ADD 	= XDB_TOK_ADD,
 	XDB_OP_SUB 	= XDB_TOK_SUB,
 	XDB_OP_MUL 	= XDB_TOK_MUL,