refactor: moving packages to io.questdb.client.

Author: RaphDal

core/pom.xml

@@ -41,7 +41,7 @@
 
     <version>9.3.2-SNAPSHOT</version>
     <groupId>org.questdb</groupId>
-    <artifactId>questdb</artifactId>
+    <artifactId>client</artifactId>
     <packaging>jar</packaging>
 
     <url>https://questdb.io/</url>
@@ -105,7 +105,6 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>io.questdb.ServerMain</mainClass>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
                         <manifestEntries>
@@ -386,7 +385,7 @@
                 <java.enforce.version>17</java.enforce.version>
                 <questdb.artifactid>questdb</questdb.artifactid>
                 <compilerArg1>--add-exports</compilerArg1>
-                <compilerArg2>java.base/jdk.internal.math=io.questdb</compilerArg2>
+                <compilerArg2>java.base/jdk.internal.math=io.questdb.client</compilerArg2>
                 <excludePattern1>nothing-to-exclude-dummy-value-include-all-java11plus</excludePattern1>
                 <excludeTestPattern1>nothing-to-exclude-dummy-value-include-all-java11plus</excludeTestPattern1>
                 <javac.compile.source>${javac.target}</javac.compile.source>

core/src/main/c/freebsd/kqueue.c

@@ -31,57 +31,57 @@
 #include "jni.h"
 #include "../share/sysutil.h"
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getEvfiltRead
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getEvfiltRead
         (JNIEnv *e, jclass cl) {
     return EVFILT_READ;
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getEvfiltWrite
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getEvfiltWrite
         (JNIEnv *e, jclass cl) {
     return EVFILT_WRITE;
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getSizeofKevent
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getSizeofKevent
         (JNIEnv *e, jclass cl) {
     return (short) sizeof(struct kevent);
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getFdOffset
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getFdOffset
         (JNIEnv *e, jclass cl) {
     return (short) offsetof(struct kevent, ident);
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getFilterOffset
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getFilterOffset
         (JNIEnv *e, jclass cl) {
     return (short) offsetof(struct kevent, filter);
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getDataOffset
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getDataOffset
         (JNIEnv *e, jclass cl) {
     return (short) offsetof(struct kevent, udata);
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getFlagsOffset
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getFlagsOffset
         (JNIEnv *e, jclass cl) {
     return (short) offsetof(struct kevent, flags);
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getEvAdd
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getEvAdd
         (JNIEnv *e, jclass cl) {
     return EV_ADD;
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getEvOneshot
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getEvOneshot
         (JNIEnv *e, jclass cl) {
     return EV_ONESHOT;
 }
 
-JNIEXPORT jint JNICALL Java_io_questdb_KqueueAccessor_kqueue
+JNIEXPORT jint JNICALL Java_io_questdb_client_KqueueAccessor_kqueue
         (JNIEnv *e, jclass cl) {
     return kqueue();
 }
 
-JNIEXPORT jint JNICALL Java_io_questdb_KqueueAccessor_kevent
+JNIEXPORT jint JNICALL Java_io_questdb_client_KqueueAccessor_kevent
         (JNIEnv *e, jclass cl, jint kq, jlong changelist, jint nChanges, jlong eventlist, jint nEvents, jint timeout) {
     int tv_sec = timeout / 1000;
     struct timespec _timeout = {tv_sec, (timeout - tv_sec * 1000) * 1000 * 1000};

core/src/main/c/linux/epoll.c

@@ -30,74 +30,74 @@
 #include "../share/sysutil.h"
 
 
-JNIEXPORT jint JNICALL Java_io_questdb_network_EpollAccessor_epollCreate
+JNIEXPORT jint JNICALL Java_io_questdb_client_network_EpollAccessor_epollCreate
         (JNIEnv *e, jclass cl) {
     return epoll_create1(0);
 }
 
-JNIEXPORT jint JNICALL Java_io_questdb_network_EpollAccessor_epollCtl
+JNIEXPORT jint JNICALL Java_io_questdb_client_network_EpollAccessor_epollCtl
         (JNIEnv *e, jclass cl, jint epfd, jint op, jint fd, jlong event) {
     return epoll_ctl((int) epfd, op, (int) fd, (struct epoll_event *) event);
 }
 
-JNIEXPORT jint JNICALL Java_io_questdb_network_EpollAccessor_epollWait
+JNIEXPORT jint JNICALL Java_io_questdb_client_network_EpollAccessor_epollWait
         (JNIEnv *e, jclass cl, jint epfd, jlong eventPtr, jint eventCount, jint timeout) {
     int res;
     RESTARTABLE(epoll_wait((int) epfd, (struct epoll_event *) eventPtr, eventCount, timeout), res);
     return res;
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_network_EpollAccessor_getDataOffset
+JNIEXPORT jshort JNICALL Java_io_questdb_client_network_EpollAccessor_getDataOffset
         (JNIEnv *e, jclass cl) {
     return (jshort) offsetof(struct epoll_event, data);
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_network_EpollAccessor_getEventsOffset
+JNIEXPORT jshort JNICALL Java_io_questdb_client_network_EpollAccessor_getEventsOffset
         (JNIEnv *e, jclass cl) {
     return (jshort) offsetof(struct epoll_event, events);
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_network_EpollAccessor_getEventSize
+JNIEXPORT jshort JNICALL Java_io_questdb_client_network_EpollAccessor_getEventSize
         (JNIEnv *e, jclass cl) {
     return sizeof(struct epoll_event);
 }
 
-JNIEXPORT jint JNICALL Java_io_questdb_network_EpollAccessor_getEPOLLIN
+JNIEXPORT jint JNICALL Java_io_questdb_client_network_EpollAccessor_getEPOLLIN
         (JNIEnv *e, jclass cl) {
     return EPOLLIN;
 }
 
-JNIEXPORT jint JNICALL Java_io_questdb_network_EpollAccessor_getEPOLLET
+JNIEXPORT jint JNICALL Java_io_questdb_client_network_EpollAccessor_getEPOLLET
         (JNIEnv *e, jclass cl) {
     return EPOLLET;
 }
 
-JNIEXPORT jint JNICALL Java_io_questdb_network_EpollAccessor_getEPOLLOUT
+JNIEXPORT jint JNICALL Java_io_questdb_client_network_EpollAccessor_getEPOLLOUT
         (JNIEnv *e, jclass cl) {
     return EPOLLOUT;
 }
 
-JNIEXPORT jint JNICALL Java_io_questdb_network_EpollAccessor_getEPOLLONESHOT
+JNIEXPORT jint JNICALL Java_io_questdb_client_network_EpollAccessor_getEPOLLONESHOT
         (JNIEnv *e, jclass cl) {
     return EPOLLONESHOT;
 }
 
-JNIEXPORT jint JNICALL Java_io_questdb_network_EpollAccessor_getCtlAdd
+JNIEXPORT jint JNICALL Java_io_questdb_client_network_EpollAccessor_getCtlAdd
         (JNIEnv *e, jclass cl) {
     return EPOLL_CTL_ADD;
 }
 
-JNIEXPORT jint JNICALL Java_io_questdb_network_EpollAccessor_getCtlMod
+JNIEXPORT jint JNICALL Java_io_questdb_client_network_EpollAccessor_getCtlMod
         (JNIEnv *e, jclass cl) {
     return EPOLL_CTL_MOD;
 }
 
-JNIEXPORT jint JNICALL Java_io_questdb_network_EpollAccessor_eventFd
+JNIEXPORT jint JNICALL Java_io_questdb_client_network_EpollAccessor_eventFd
         (JNIEnv *e, jclass cl) {
     return eventfd(0, EFD_NONBLOCK);
 }
 
-JNIEXPORT jlong JNICALL Java_io_questdb_network_EpollAccessor_readEventFd
+JNIEXPORT jlong JNICALL Java_io_questdb_client_network_EpollAccessor_readEventFd
         (JNIEnv *e, jclass cl, jint fd) {
     uint64_t u;
     ssize_t s;
@@ -108,7 +108,7 @@ JNIEXPORT jlong JNICALL Java_io_questdb_network_EpollAccessor_readEventFd
     return (jlong) u;
 }
 
-JNIEXPORT jint JNICALL Java_io_questdb_network_EpollAccessor_writeEventFd
+JNIEXPORT jint JNICALL Java_io_questdb_client_network_EpollAccessor_writeEventFd
         (JNIEnv *e, jclass cl, jint fd) {
     uint64_t u;
     ssize_t s;

core/src/main/c/linux/recvmmsg.c

@@ -30,7 +30,7 @@
 #include <stddef.h>
 #include <string.h>
 
-JNIEXPORT jlong JNICALL Java_io_questdb_network_Net_msgHeaders
+JNIEXPORT jlong JNICALL Java_io_questdb_client_network_Net_msgHeaders
         (JNIEnv *e, jclass cl, jint blockSize, jint blockCount) {
     struct mmsghdr *msgs = malloc(sizeof(struct mmsghdr) * blockCount);
     struct iovec *iovecs = malloc(sizeof(struct iovec) * blockCount);
@@ -48,22 +48,22 @@ JNIEXPORT jlong JNICALL Java_io_questdb_network_Net_msgHeaders
     return (jlong) msgs;
 }
 
-JNIEXPORT jlong JNICALL Java_io_questdb_network_Net_getMsgHeaderSize
+JNIEXPORT jlong JNICALL Java_io_questdb_client_network_Net_getMsgHeaderSize
         (JNIEnv *e, jclass cl) {
     return sizeof(struct mmsghdr);
 }
 
-JNIEXPORT jlong JNICALL Java_io_questdb_network_Net_getMsgHeaderBufferAddressOffset
+JNIEXPORT jlong JNICALL Java_io_questdb_client_network_Net_getMsgHeaderBufferAddressOffset
         (JNIEnv *e, jclass cl) {
     return offsetof(struct mmsghdr, msg_hdr) + offsetof(struct msghdr, msg_iov);
 }
 
-JNIEXPORT jlong JNICALL Java_io_questdb_network_Net_getMsgHeaderBufferLengthOffset
+JNIEXPORT jlong JNICALL Java_io_questdb_client_network_Net_getMsgHeaderBufferLengthOffset
         (JNIEnv *e, jclass cl) {
     return (jint) offsetof(struct mmsghdr, msg_len);
 }
 
-JNIEXPORT void JNICALL Java_io_questdb_network_Net_freeMsgHeaders
+JNIEXPORT void JNICALL Java_io_questdb_client_network_Net_freeMsgHeaders
         (JNIEnv *e, jclass cl, jlong address) {
     struct mmsghdr *msgs = (struct mmsghdr *) address;
     free(msgs[0].msg_hdr.msg_iov->iov_base);

core/src/main/c/osx/kqueue.c

@@ -31,57 +31,57 @@
 #include "jni.h"
 #include "../share/sysutil.h"
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getEvfiltRead
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getEvfiltRead
         (JNIEnv *e, jclass cl) {
     return EVFILT_READ;
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getEvfiltWrite
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getEvfiltWrite
         (JNIEnv *e, jclass cl) {
     return EVFILT_WRITE;
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getSizeofKevent
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getSizeofKevent
         (JNIEnv *e, jclass cl) {
     return (short) sizeof(struct kevent);
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getFdOffset
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getFdOffset
         (JNIEnv *e, jclass cl) {
     return (short) offsetof(struct kevent, ident);
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getFilterOffset
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getFilterOffset
         (JNIEnv *e, jclass cl) {
     return (short) offsetof(struct kevent, filter);
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getDataOffset
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getDataOffset
         (JNIEnv *e, jclass cl) {
     return (short) offsetof(struct kevent, udata);
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getFlagsOffset
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getFlagsOffset
         (JNIEnv *e, jclass cl) {
     return (short) offsetof(struct kevent, flags);
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getEvAdd
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getEvAdd
         (JNIEnv *e, jclass cl) {
     return EV_ADD;
 }
 
-JNIEXPORT jshort JNICALL Java_io_questdb_KqueueAccessor_getEvOneshot
+JNIEXPORT jshort JNICALL Java_io_questdb_client_KqueueAccessor_getEvOneshot
         (JNIEnv *e, jclass cl) {
     return EV_ONESHOT;
 }
 
-JNIEXPORT jint JNICALL Java_io_questdb_KqueueAccessor_kqueue
+JNIEXPORT jint JNICALL Java_io_questdb_client_KqueueAccessor_kqueue
         (JNIEnv *e, jclass cl) {
     return kqueue();
 }
 
-JNIEXPORT jint JNICALL Java_io_questdb_KqueueAccessor_kevent
+JNIEXPORT jint JNICALL Java_io_questdb_client_KqueueAccessor_kevent
         (JNIEnv *e, jclass cl, jint kq, jlong changelist, jint nChanges, jlong eventlist, jint nEvents, jint timeout_msec) {
     long MILLION = 1000 * 1000;
     long BILLION = 1000 * MILLION;

core/src/main/c/share/byte_sink.cpp

@@ -132,38 +132,38 @@ std::byte* questdb_byte_sink_book(questdb_byte_sink_t* sink, size_t min_len) {
 }
 
 extern "C" {
-    JNIEXPORT jlong JNICALL Java_io_questdb_std_bytes_DirectByteSink_implCreate(
+    JNIEXPORT jlong JNICALL Java_io_questdb_client_std_bytes_DirectByteSink_implCreate(
             JNIEnv *env,
             jclass cl,
             jlong capacity);
 
-    JNIEXPORT void JNICALL Java_io_questdb_std_bytes_DirectByteSink_implDestroy(
+    JNIEXPORT void JNICALL Java_io_questdb_client_std_bytes_DirectByteSink_implDestroy(
             JNIEnv *env,
             jclass cl,
             jlong impl);
 
-    JNIEXPORT jlong JNICALL Java_io_questdb_std_bytes_DirectByteSink_implBook(
+    JNIEXPORT jlong JNICALL Java_io_questdb_client_std_bytes_DirectByteSink_implBook(
             JNIEnv *env,
             jclass cl,
             jlong impl,
             jlong min_len);
 }
 
-JNIEXPORT jlong JNICALL Java_io_questdb_std_bytes_DirectByteSink_implCreate(
+JNIEXPORT jlong JNICALL Java_io_questdb_client_std_bytes_DirectByteSink_implCreate(
         JNIEnv *env,
         jclass cl,
         jlong capacity) {
     return (jlong) create(capacity);
 }
 
-JNIEXPORT void JNICALL Java_io_questdb_std_bytes_DirectByteSink_implDestroy(
+JNIEXPORT void JNICALL Java_io_questdb_client_std_bytes_DirectByteSink_implDestroy(
         JNIEnv *env,
         jclass cl,
         jlong impl) {
     destroy((questdb_byte_sink_t*) impl);
 }
 
-JNIEXPORT jlong JNICALL Java_io_questdb_std_bytes_DirectByteSink_implBook(
+JNIEXPORT jlong JNICALL Java_io_questdb_client_std_bytes_DirectByteSink_implBook(
         JNIEnv *env,
         jclass cl,
         jlong impl,

core/src/main/c/share/files.c

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include "files.h"
 
-JNIEXPORT jint JNICALL Java_io_questdb_std_Files_close0
+JNIEXPORT jint JNICALL Java_io_questdb_client_std_Files_close0
         (JNIEnv *e, jclass cl, jint fd) {
     return close((int) fd);
 }