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.

Sign up for GitHub

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

Jump to bottom

fix:use vgstatus before if rebalance #22684

Merged
merged 14 commits into from
Sep 7, 2023
Merged

fix:use vgstatus before if rebalance #22684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b8f041f
fix:use vgstatus before if rebalance
wangmm0220 Sep 1, 2023
f0fbe08
fix:core dump if tmq is null
wangmm0220 Sep 1, 2023
02ac3ea
fix:logic error
wangmm0220 Sep 1, 2023
fd85d58
fix:add limit time for consume in 1 seconds
wangmm0220 Sep 1, 2023
90e938e
fix:set vg status idle if reveive poll callback
wangmm0220 Sep 4, 2023
9a2da3a
fix:set vg status idle if reveive poll callback
wangmm0220 Sep 4, 2023
53c4f4a
opti:commit logic
wangmm0220 Sep 5, 2023
4e46ce4
fix:wait pHandle idle if vnode receives subscribe msg
wangmm0220 Sep 5, 2023
ef87b9c
fix:conflicts from 3.0
wangmm0220 Sep 5, 2023
0e9adcd
fix:add error code 0x4012 to ignore list
wangmm0220 Sep 5, 2023
897fd5b
fix:tmq close error because of same committed offset
wangmm0220 Sep 6, 2023
cc62961
fix:heap use after free of pParamSet since the first commitCb is call…
wangmm0220 Sep 6, 2023
629de12
fix:do not return error if commit nothing
wangmm0220 Sep 6, 2023
f4ec830
opti:optimize code logic & fix python test case error
wangmm0220 Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 10 additions & 13 deletions include/client/taos.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,13 @@ typedef enum tmq_conf_res_t {
TMQ_CONF_OK = 0,
} tmq_conf_res_t;

typedef enum tmq_res_t {
TMQ_RES_INVALID = -1,
TMQ_RES_DATA = 1,
TMQ_RES_TABLE_META = 2,
TMQ_RES_METADATA = 3,
} tmq_res_t;

typedef struct tmq_topic_assignment {
int32_t vgId;
int64_t currentOffset;
Expand Down Expand Up @@ -302,41 +309,31 @@ DLL_EXPORT int32_t tmq_offset_seek(tmq_t *tmq, const char *pTopicName, int32_t
DLL_EXPORT int64_t tmq_position(tmq_t *tmq, const char *pTopicName, int32_t vgId); // The current offset is the offset of the last consumed message + 1
DLL_EXPORT int64_t tmq_committed(tmq_t *tmq, const char *pTopicName, int32_t vgId);

DLL_EXPORT const char *tmq_get_table_name(TAOS_RES *res);
DLL_EXPORT tmq_res_t tmq_get_res_type(TAOS_RES *res);
DLL_EXPORT const char *tmq_get_topic_name(TAOS_RES *res);
DLL_EXPORT const char *tmq_get_db_name(TAOS_RES *res);
DLL_EXPORT int32_t tmq_get_vgroup_id(TAOS_RES *res);
DLL_EXPORT int64_t tmq_get_vgroup_offset(TAOS_RES* res);
DLL_EXPORT const char *tmq_err2str(int32_t code);

/* ------------------------------ TAOSX -----------------------------------*/
// note: following apis are unstable
enum tmq_res_t {
TMQ_RES_INVALID = -1,
TMQ_RES_DATA = 1,
TMQ_RES_TABLE_META = 2,
TMQ_RES_METADATA = 3,
};

typedef struct tmq_raw_data {
void *raw;
uint32_t raw_len;
uint16_t raw_type;
} tmq_raw_data;

typedef enum tmq_res_t tmq_res_t;

DLL_EXPORT const char *tmq_get_table_name(TAOS_RES *res);
DLL_EXPORT tmq_res_t tmq_get_res_type(TAOS_RES *res);
DLL_EXPORT int32_t tmq_get_raw(TAOS_RES *res, tmq_raw_data *raw);
DLL_EXPORT int32_t tmq_write_raw(TAOS *taos, tmq_raw_data raw);
DLL_EXPORT int taos_write_raw_block(TAOS *taos, int numOfRows, char *pData, const char *tbname);
DLL_EXPORT int taos_write_raw_block_with_fields(TAOS *taos, int rows, char *pData, const char *tbname,
TAOS_FIELD *fields, int numFields);
DLL_EXPORT void tmq_free_raw(tmq_raw_data raw);

// Returning null means error. Returned result need to be freed by tmq_free_json_meta
DLL_EXPORT char *tmq_get_json_meta(TAOS_RES *res);
DLL_EXPORT void tmq_free_json_meta(char *jsonMeta);

/* ---------------------------- TAOSX END -------------------------------- */

typedef enum {
Expand Down