From 62a872bb49145da4b3ff174bf398aed0a5760e29 Mon Sep 17 00:00:00 2001
From: Jinqing Kuang <kuangjinqingcn@gmail.com>
Date: Thu, 6 Feb 2025 15:19:49 +0800
Subject: [PATCH] fix: resolve compilation issues

- Remove redundant third-party library builds
- Fix parsing conflicts in sql.y
---
 contrib/CMakeLists.txt       |  7 -------
 source/common/CMakeLists.txt | 17 -----------------
 source/libs/parser/inc/sql.y |  2 +-
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 71b1f339e8..767df03d22 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -186,13 +186,6 @@ if(${BUILD_GEOS})
     cat("${TD_SUPPORT_DIR}/geos_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 endif()
 
-# libcurl
-if(NOT ${TD_WINDOWS})
-    file(MAKE_DIRECTORY $ENV{HOME}/.cos-local.2/)
-    cat("${TD_SUPPORT_DIR}/ssl_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-    cat("${TD_SUPPORT_DIR}/curl_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-endif(NOT ${TD_WINDOWS})
-
 #
 if(${BUILD_PCRE2})
     cat("${TD_SUPPORT_DIR}/pcre2_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
diff --git a/source/common/CMakeLists.txt b/source/common/CMakeLists.txt
index 4c7940432d..a430033bf2 100644
--- a/source/common/CMakeLists.txt
+++ b/source/common/CMakeLists.txt
@@ -78,23 +78,6 @@ else()
   )
 endif()
 
-if(NOT ${TD_WINDOWS})
-  target_include_directories(
-    common
-    PUBLIC "$ENV{HOME}/.cos-local.2/include"
-  )
-
-  find_library(CURL_LIBRARY curl $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
-  find_library(SSL_LIBRARY ssl $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
-  find_library(CRYPTO_LIBRARY crypto $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
-  target_link_libraries(
-    common
-    PUBLIC ${CURL_LIBRARY}
-    PUBLIC ${SSL_LIBRARY}
-    PUBLIC ${CRYPTO_LIBRARY}
-  )
-endif()
-
 if(${BUILD_S3})
   if(${BUILD_WITH_S3})
     set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y
index e470d4517a..3b34705217 100755
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
@@ -1557,7 +1557,7 @@ window_offset_literal(A) ::= NK_MINUS(B) NK_VARIABLE(C).
                                                                                     A = createRawExprNode(pCxt, &t, createTimeOffsetValueNode(pCxt, &t));
                                                                                   }
 
-jlimit_clause_opt(A) ::= .                                                        { A = NULL; }
+jlimit_clause_opt(A) ::= . [JLIMIT]                                               { A = NULL; }
 jlimit_clause_opt(A) ::= JLIMIT unsigned_integer(B).                              { A = createLimitNode(pCxt, B, NULL); }
 
 /************************************************ query_specification *************************************************/