Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rewrite some Tsfile C++ interface #304

Merged
merged 28 commits into from
Dec 18, 2024
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5372068
rewrite some Tsfile C++ interface
zwhzzz0821 Nov 18, 2024
62b0a19
fix format
zwhzzz0821 Nov 18, 2024
36ae884
fix the problem in test/CMakeLists
zwhzzz0821 Nov 19, 2024
e30d562
add algorith and memory in tablet.h
zwhzzz0821 Nov 19, 2024
9d55a19
add some header file
zwhzzz0821 Nov 19, 2024
fe2a217
fix memory leak
zwhzzz0821 Nov 19, 2024
0d2ad42
fix for CWrapper and timeFilte
zwhzzz0821 Nov 26, 2024
243eb7a
Merge remote-tracking branch 'upstream/develop' into cppTsfileRewrite
zwhzzz0821 Nov 26, 2024
b10f548
fix for ut
zwhzzz0821 Nov 28, 2024
bd55cda
Add parser for path and fix for get device name
zwhzzz0821 Dec 10, 2024
2ee042e
fix complie error for ubuntu and windows
zwhzzz0821 Dec 10, 2024
49c368c
add path test add fix complie error
zwhzzz0821 Dec 10, 2024
0245a2d
Remove redundant tests
zwhzzz0821 Dec 10, 2024
57a4834
fix for windows
zwhzzz0821 Dec 11, 2024
ddad7f9
fix bug for complie when using mingw and change name parser/generated
zwhzzz0821 Dec 12, 2024
ed0700a
fix include name
zwhzzz0821 Dec 12, 2024
42c185b
add download uuid in linux autoly
zwhzzz0821 Dec 13, 2024
36f862a
fix warning
zwhzzz0821 Dec 13, 2024
216f170
fix bug in ubuntu
zwhzzz0821 Dec 13, 2024
b35551c
try to fix link bug in windows
zwhzzz0821 Dec 13, 2024
e283d68
try to fix bug in windows
zwhzzz0821 Dec 13, 2024
188a86f
output debug detail
zwhzzz0821 Dec 14, 2024
879f41e
Removed unnecessary include
zwhzzz0821 Dec 15, 2024
7171512
link static lib instead of shared lib
zwhzzz0821 Dec 15, 2024
0cd45c6
remove static crt
zwhzzz0821 Dec 15, 2024
1cdf7c2
debug detail
zwhzzz0821 Dec 16, 2024
f74258e
fix for bug in windows
zwhzzz0821 Dec 17, 2024
7e27a23
Add compilation details on windows in Readme
zwhzzz0821 Dec 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix bug for complie when using mingw and change name parser/generated
zwhzzz0821 committed Dec 12, 2024
commit ddad7f975bbc44bc68de4b794c4dced72c5930c8
12 changes: 5 additions & 7 deletions cpp/src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -51,13 +51,11 @@ set(SNAPPY_LIB_NAME "snappy")
set(LZ4_LIB_NAME "LZ4")
set(LZO_LIB_NAME "lzokay")
set(ZLIB_LIB_NAME "z")
set(ANTLR4_STATIC_LIB_PATH ${CMAKE_BINARY_DIR}/lib/libantlr4-runtime${CMAKE_STATIC_LIBRARY_SUFFIX})
set(ANTLR4_SHARED_LIB_PATH ${CMAKE_BINARY_DIR}/lib/libantlr4-runtime${CMAKE_SHARED_LIBRARY_SUFFIX})
target_link_libraries(parser_obj ${ANTLR4_STATIC_LIB_PATH} ${ANTLR4_SHARED_LIB_PATH})
target_link_libraries(compress_obj ${SNAPPY_LIB_NAME} ${LZ4_LIB_NAME} ${LZO_LIB_NAME} ${ZLIB_LIB_NAME})
target_link_libraries(common_obj ${SNAPPY_LIB_NAME} ${LZ4_LIB_NAME} ${LZO_LIB_NAME} ${ZLIB_LIB_NAME} ${ANTLR4_STATIC_LIB_PATH} ${ANTLR4_SHARED_LIB_PATH})
target_link_libraries(read_obj ${SNAPPY_LIB_NAME} ${LZ4_LIB_NAME} ${LZO_LIB_NAME} ${ZLIB_LIB_NAME})
target_link_libraries(write_obj ${SNAPPY_LIB_NAME} ${LZ4_LIB_NAME} ${LZO_LIB_NAME} ${ZLIB_LIB_NAME})
target_link_libraries(parser_obj antlr4_shared)
target_link_libraries(compress_obj ${SNAPPY_LIB_NAME} ${LZ4_LIB_NAME} ${LZO_LIB_NAME} ${ZLIB_LIB_NAME} antlr4_shared )
target_link_libraries(common_obj ${SNAPPY_LIB_NAME} ${LZ4_LIB_NAME} ${LZO_LIB_NAME} ${ZLIB_LIB_NAME} antlr4_shared )
target_link_libraries(read_obj ${SNAPPY_LIB_NAME} ${LZ4_LIB_NAME} ${LZO_LIB_NAME} ${ZLIB_LIB_NAME} antlr4_shared )
target_link_libraries(write_obj ${SNAPPY_LIB_NAME} ${LZ4_LIB_NAME} ${LZO_LIB_NAME} ${ZLIB_LIB_NAME} antlr4_shared )
# set(CMAKE_PREFIX_PATH ../../third-party/lz4-dev/lib)
# set(LZ4_LIB_DIR ../../third-party/lz4-dev/lib)
# find_library(my_lz4_lib NAMES lz4 PATHS ${LZ4_LIB_DIR} NO_DEFAULT_PATH REQUIRED)
2 changes: 1 addition & 1 deletion cpp/src/common/path.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
#define COMMON_READ_COMMON_PATH_H

#include "utils/errno_define.h"
#include "parser/generator/PathParser.h"
#include "parser/generated/PathParser.h"
#include "parser/path_nodes_generator.h"

#include <string>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions cpp/src/parser/path_nodes_generator.cpp
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@

#include "path_nodes_generator.h"
#include "utils/errno_define.h"
#include "generator/PathLexer.h"
#include "generator/PathParser.h"
#include "generated/PathLexer.h"
#include "generated/PathParser.h"
#include "path_parser_error.h"
#include "path_visitor.h"

4 changes: 2 additions & 2 deletions cpp/src/parser/path_visitor.h
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@
#ifndef PATH_VISITOR_H
#define PATH_VISITOR_H

#include "generator/PathParserBaseVisitor.h"
#include "generator/PathParser.h"
#include "generated/PathParserBaseVisitor.h"
#include "generated/PathParser.h"
#include "common/constant/tsfile_constant.h"

namespace storage
Original file line number Diff line number Diff line change
@@ -31,8 +31,6 @@ using namespace antlr4;
using namespace antlr4::atn;
using namespace antlrcpp;

LexerATNSimulator::SimState::~SimState() {
}

void LexerATNSimulator::SimState::reset() {
index = INVALID_INDEX;
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ namespace atn {
protected:
class SimState {
public:
virtual ~SimState();
virtual ~SimState() {(void)0;}

protected:
size_t index;
@@ -95,7 +95,7 @@ namespace atn {

LexerATNSimulator(const ATN &atn, std::vector<dfa::DFA> &decisionToDFA, PredictionContextCache &sharedContextCache);
LexerATNSimulator(Lexer *recog, const ATN &atn, std::vector<dfa::DFA> &decisionToDFA, PredictionContextCache &sharedContextCache);
virtual ~LexerATNSimulator () {}
virtual ~LexerATNSimulator () {(void)0;}

virtual void copyState(LexerATNSimulator *simulator);
virtual size_t match(CharStream *input, size_t mode);