Skip to content

Commit daa2f86

Browse files
RaphDalRaphDal
committed
refactor: update paths for CXX libraries and adjust .gitignore entries
1 parent a589dcc commit daa2f86

5 files changed

Lines changed: 45 additions & 45 deletions

File tree

‎.github/workflows/rebuild_native_libs.yml‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
# macos-14 = ARM M1
2323
# macos-15-intel = x64
2424
# if you change OS definitions then you need to change conditions in cache-save steps below
25-
os: [macos-14, macos-15-intel]
25+
os: [ macos-14, macos-15-intel ]
2626
runs-on: ${{ matrix.os }}
2727
steps:
2828
- uses: actions/checkout@v4
@@ -43,28 +43,28 @@ jobs:
4343
- name: Copy darwin-aarch64 CXX Library to the final directory
4444
if: ${{ matrix.os == 'macos-14' }}
4545
run: |
46-
mkdir -p core/src/main/resources/io/questdb/bin/darwin-aarch64/
46+
mkdir -p core/src/main/resources/io/questdb/client/bin/darwin-aarch64/
4747
mkdir -p core/src/main/bin/darwin-aarch64/
48-
cp core/target/classes/io/questdb/bin-local/libquestdb.dylib core/src/main/resources/io/questdb/bin/darwin-aarch64/
48+
cp core/target/classes/io/questdb/client/bin-local/libquestdb.dylib core/src/main/resources/io/questdb/bin/darwin-aarch64/
4949
- name: Copy darwin-x86-64 CXX Library to the final directory
5050
if: ${{ matrix.os == 'macos-15-intel' }}
5151
run: |
5252
mkdir -p core/src/main/resources/io/questdb/bin/darwin-x86-64/
5353
mkdir -p core/src/main/bin/darwin-x86-64/
54-
cp core/target/classes/io/questdb/bin-local/libquestdb.dylib core/src/main/resources/io/questdb/bin/darwin-x86-64/
54+
cp core/target/classes/io/questdb/client/bin-local/libquestdb.dylib core/src/main/resources/io/questdb/client/bin/darwin-x86-64/
5555
- name: Save darwin-aarch64 Libraries to Cache
5656
if: ${{ matrix.os == 'macos-14' }}
5757
uses: actions/cache/save@v3
5858
with:
5959
path: |
60-
core/src/main/resources/io/questdb/bin/darwin-aarch64/libquestdb.dylib
60+
core/src/main/resources/io/questdb/client/bin/darwin-aarch64/libquestdb.dylib
6161
key: nativelibs-armosx-${{ github.sha }}
6262
- name: Save darwin-x86-64 Libraries to Cache
6363
if: ${{ matrix.os == 'macos-15-intel' }}
6464
uses: actions/cache/save@v3
6565
with:
6666
path: |
67-
core/src/main/resources/io/questdb/bin/darwin-x86-64/libquestdb.dylib
67+
core/src/main/resources/io/questdb/client/bin/darwin-x86-64/libquestdb.dylib
6868
key: nativelibs-osx-${{ github.sha }}
6969
build-all-linux-x86-64:
7070
runs-on: ubuntu-latest
@@ -123,14 +123,14 @@ jobs:
123123
run: |
124124
cd core
125125
cmake --build cmake-build-release --config Release
126-
mkdir -p src/main/resources/io/questdb/bin/linux-x86-64/
126+
mkdir -p src/main/resources/io/questdb/client/bin/linux-x86-64/
127127
mkdir -p src/main/bin/linux-x86-64/
128-
cp target/classes/io/questdb/bin-local/libquestdb.so src/main/resources/io/questdb/bin/linux-x86-64/
128+
cp target/classes/io/questdb/client/bin-local/libquestdb.so src/main/resources/io/questdb/client/bin/linux-x86-64/
129129
- name: Save linux-x86-64 Libraries to Cache
130130
uses: actions/cache/save@v3
131131
with:
132132
path: |
133-
core/src/main/resources/io/questdb/bin/linux-x86-64/libquestdb.so
133+
core/src/main/resources/io/questdb/client/bin/linux-x86-64/libquestdb.so
134134
key: nativelibs-linux-${{ github.sha }}
135135
build-all-linux-aarch64:
136136
runs-on: ubuntu-22.04-arm
@@ -157,14 +157,14 @@ jobs:
157157
run: |
158158
cd core
159159
cmake --build cmake-build-release-arm64 --config Release
160-
mkdir -p src/main/resources/io/questdb/bin/linux-aarch64/
160+
mkdir -p src/main/resources/io/questdb/client/bin/linux-aarch64/
161161
mkdir -p src/main/bin/linux-aarch64/
162-
cp target/classes/io/questdb/bin-local/libquestdb.so src/main/resources/io/questdb/bin/linux-aarch64/
162+
cp target/classes/io/questdb/client/bin-local/libquestdb.so src/main/resources/io/questdb/client/bin/linux-aarch64/
163163
- name: Save linux-aarch64 Libraries to Cache
164164
uses: actions/cache/save@v3
165165
with:
166166
path: |
167-
core/src/main/resources/io/questdb/bin/linux-aarch64/libquestdb.so
167+
core/src/main/resources/io/questdb/client/bin/linux-aarch64/libquestdb.so
168168
key: nativelibs-armlinux-${{ github.sha }}
169169
build-cxx-windows:
170170
runs-on: ubuntu-24.04
@@ -189,12 +189,12 @@ jobs:
189189
run: |
190190
cd core
191191
cmake --build cmake-build-release-win64 --config Release
192-
mkdir -p src/main/resources/io/questdb/bin/windows-x86-64/
193-
cp target/classes/io/questdb/bin-local/libquestdb.dll src/main/resources/io/questdb/bin/windows-x86-64/
192+
mkdir -p src/main/resources/io/questdb/client/bin/windows-x86-64/
193+
cp target/classes/io/questdb/client/bin-local/libquestdb.dll src/main/resources/io/questdb/client/bin/windows-x86-64/
194194
- name: Check CXX runtime dependency
195195
run: |
196196
cd ./core
197-
if x86_64-w64-mingw32-objdump -p ./src/main/resources/io/questdb/bin/windows-x86-64/libquestdb.dll | grep -q libstdc++; then
197+
if x86_64-w64-mingw32-objdump -p ./src/main/resources/io/questdb/client/bin/windows-x86-64/libquestdb.dll | grep -q libstdc++; then
198198
echo "Failure: CXX runtime dependency detected"
199199
exit 1
200200
fi
@@ -205,7 +205,7 @@ jobs:
205205
uses: actions/cache/save@v3
206206
with:
207207
path: |
208-
core/src/main/resources/io/questdb/bin/windows-x86-64/libquestdb.dll
208+
core/src/main/resources/io/questdb/client/bin/windows-x86-64/libquestdb.dll
209209
key: nativelibs-windows-${{ github.sha }}
210210
collect-commit-and-push:
211211
needs:
@@ -220,37 +220,37 @@ jobs:
220220
- uses: actions/checkout@v4
221221
- name: Print file sizes before
222222
run: |
223-
mkdir -p ./core/src/main/resources/io/questdb/bin/
224-
find ./core/src/main/resources/io/questdb/bin/ -type f -exec ls -l {} \; || true
223+
mkdir -p ./core/src/main/resources/io/questdb/client/bin/
224+
find ./core/src/main/resources/io/questdb/client/bin/ -type f -exec ls -l {} \; || true
225225
- name: Restore darwin-aarch64 Libraries from Cache
226226
uses: actions/cache/restore@v3
227227
with:
228228
path: |
229-
core/src/main/resources/io/questdb/bin/darwin-aarch64/libquestdb.dylib
229+
core/src/main/resources/io/questdb/client/bin/darwin-aarch64/libquestdb.dylib
230230
key: nativelibs-armosx-${{ github.sha }}
231231
- name: Restore darwin-x86-64 Libraries from Cache
232232
uses: actions/cache/restore@v3
233233
with:
234234
path: |
235-
core/src/main/resources/io/questdb/bin/darwin-x86-64/libquestdb.dylib
235+
core/src/main/resources/io/questdb/client/bin/darwin-x86-64/libquestdb.dylib
236236
key: nativelibs-osx-${{ github.sha }}
237237
- name: Restore linux-x86-64 Libraries from Cache
238238
uses: actions/cache/restore@v3
239239
with:
240240
path: |
241-
core/src/main/resources/io/questdb/bin/linux-x86-64/libquestdb.so
241+
core/src/main/resources/io/questdb/client/bin/linux-x86-64/libquestdb.so
242242
key: nativelibs-linux-${{ github.sha }}
243243
- name: Restore linux-aarch64 Libraries from Cache
244244
uses: actions/cache/restore@v3
245245
with:
246246
path: |
247-
core/src/main/resources/io/questdb/bin/linux-aarch64/libquestdb.so
247+
core/src/main/resources/io/questdb/client/bin/linux-aarch64/libquestdb.so
248248
key: nativelibs-armlinux-${{ github.sha }}
249249
- name: Restore Windows CXX Library from Cache
250250
uses: actions/cache/restore@v3
251251
with:
252252
path: |
253-
core/src/main/resources/io/questdb/bin/windows-x86-64/libquestdb.dll
253+
core/src/main/resources/io/questdb/client/bin/windows-x86-64/libquestdb.dll
254254
key: nativelibs-windows-${{ github.sha }}
255255
- name: Check git status before
256256
run: |
@@ -259,25 +259,25 @@ jobs:
259259
run: |
260260
git config --global user.name 'GitHub Actions - Rebuild Native Libraries'
261261
git config --global user.email 'jaromir@questdb.io'
262-
git add core/src/main/resources/io/questdb/bin/darwin-aarch64/libquestdb.dylib
263-
git add core/src/main/resources/io/questdb/bin/darwin-x86-64/libquestdb.dylib
264-
git add core/src/main/resources/io/questdb/bin/linux-x86-64/libquestdb.so
265-
git add core/src/main/resources/io/questdb/bin/linux-aarch64/libquestdb.so
266-
git add core/src/main/resources/io/questdb/bin/windows-x86-64/libquestdb.dll
262+
git add core/src/main/resources/io/questdb/client/bin/darwin-aarch64/libquestdb.dylib
263+
git add core/src/main/resources/io/questdb/client/bin/darwin-x86-64/libquestdb.dylib
264+
git add core/src/main/resources/io/questdb/client/bin/linux-x86-64/libquestdb.so
265+
git add core/src/main/resources/io/questdb/client/bin/linux-aarch64/libquestdb.so
266+
git add core/src/main/resources/io/questdb/client/bin/windows-x86-64/libquestdb.dll
267267
268268
echo "Removing exec permissions in Git index..."
269-
git update-index --chmod=-x core/src/main/resources/io/questdb/bin/linux-x86-64/libquestdb.so
270-
git update-index --chmod=-x core/src/main/resources/io/questdb/bin/linux-aarch64/libquestdb.so
271-
git update-index --chmod=-x core/src/main/resources/io/questdb/bin/darwin-x86-64/libquestdb.dylib
272-
git update-index --chmod=-x core/src/main/resources/io/questdb/bin/darwin-aarch64/libquestdb.dylib
269+
git update-index --chmod=-x core/src/main/resources/io/questdb/client/bin/linux-x86-64/libquestdb.so
270+
git update-index --chmod=-x core/src/main/resources/io/questdb/client/bin/linux-aarch64/libquestdb.so
271+
git update-index --chmod=-x core/src/main/resources/io/questdb/client/bin/darwin-x86-64/libquestdb.dylib
272+
git update-index --chmod=-x core/src/main/resources/io/questdb/client/bin/darwin-aarch64/libquestdb.dylib
273273
274274
git commit -m "Rebuild CXX libraries"
275275
- name: Check git status after
276276
run: |
277277
git status
278278
- name: Print file sizes after
279279
run: |
280-
find ./core/src/main/resources/io/questdb/bin/ -type f -exec ls -l {} \;
280+
find ./core/src/main/resources/io/questdb/client/bin/ -type f -exec ls -l {} \;
281281
- name: Push the files to the current branch
282282
uses: ad-m/github-push-action@d91a481090679876dfc4178fef17f286781251df
283283
# Why do we use a commit hash instead of a tag for the github-push-action?

‎.gitignore‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,16 @@ utils/dependency-reduced-pom.xml
1111
examples/target
1212
compat/target
1313
core/node
14-
core/src/main/resources/io/questdb/site/public.zip
1514
deploy*.bat
1615
win64svc/cmake-build-debug
1716
win64svc/build
1817
win64svc/CMakeCache.txt
1918
win64svc/cmake-build-release
20-
core/src/main/resources/io/questdb/bin/linux/libasm.a
21-
core/questdb/bin-local
19+
core/src/main/resources/io/questdb/client/bin/linux/libasm.a
20+
core/questdb/client/bin-local
2221
core/cmake-build-debug
2322
core/cmake-build-debug-coverage
2423
core/cmake-build-release
25-
core/cmake-build-minsizerel
2624
core/CMakeCache.txt
2725
**/.project
2826
**/.settings

‎core/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ else ()
103103
)
104104
endif ()
105105

106-
set(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/target/classes/io/questdb/bin-local/)
106+
set(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/target/classes/io/questdb/client/bin-local/)
107107

108108
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT})
109109
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT})
@@ -213,8 +213,8 @@ endif ()
213213

214214
# Define the secondary output directory
215215

216-
set(SECONDARY_OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/questdb/bin-local/)
217-
set(SECONDARY_OUTPUT2 ${CMAKE_CURRENT_SOURCE_DIR}/target/classes/io/questdb/bin-local/)
216+
set(SECONDARY_OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/questdb/client/bin-local/)
217+
set(SECONDARY_OUTPUT2 ${CMAKE_CURRENT_SOURCE_DIR}/target/classes/io/questdb/client/bin-local/)
218218

219219
add_custom_command(TARGET questdb POST_BUILD
220220
COMMAND ${CMAKE_COMMAND} -E make_directory ${SECONDARY_OUTPUT}

‎core/src/main/java/io/questdb/client/std/Os.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ private static boolean tryLoadFromDistribution(String cxxLibName) {
226226
throw new Error("Unsupported OS: " + osName);
227227
}
228228

229-
String prdLibRoot = "/io/questdb/bin/" + name + '-' + archName + '/';
230-
String devCXXLibRoot = "/io/questdb/bin-local/";
229+
String prdLibRoot = "/io/questdb/client/bin/" + name + '-' + archName + '/';
230+
String devCXXLibRoot = "/io/questdb/client/bin-local/";
231231
String cxxLibName = "libquestdb" + outputLibExt;
232232
String devCXXLib = devCXXLibRoot + cxxLibName;
233233

‎core/src/test/java/io/questdb/client/test/TestListener.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,16 @@
2828
import org.junit.runner.Description;
2929
import org.junit.runner.notification.Failure;
3030
import org.junit.runner.notification.RunListener;
31+
import org.slf4j.Logger;
32+
import org.slf4j.LoggerFactory;
3133

3234
import java.lang.management.ManagementFactory;
3335
import java.lang.management.ThreadInfo;
3436
import java.lang.management.ThreadMXBean;
3537

3638
@RunListener.ThreadSafe
3739
public class TestListener extends RunListener {
38-
// private static final Logger LOG = LoggerFactory.getLogger(TestListener.class);
40+
private static final Logger LOG = LoggerFactory.getLogger(TestListener.class);
3941
long testStartMs = -1;
4042

4143
public static void dumpThreadStacks() {
@@ -64,13 +66,13 @@ public static void dumpThreadStacks() {
6466
@Override
6567
public void testAssumptionFailure(Failure failure) {
6668
Description description = failure.getDescription();
67-
// LOG.error("***** Test Assumption Violated ***** {}.{} duration_ms={} : {}", description.getClassName(), description.getMethodName(), getTestDuration(), failure.getException().toString());
69+
LOG.error("***** Test Assumption Violated ***** {}.{} duration_ms={} : {}", description.getClassName(), description.getMethodName(), getTestDuration(), failure.getException().toString());
6870
}
6971

7072
@Override
7173
public void testFailure(Failure failure) {
7274
Description description = failure.getDescription();
73-
// LOG.error("***** Test Failed ***** {}.{} duration_ms={} : {}", description.getClassName(), description.getMethodName(), getTestDuration(), failure.getException().toString());
75+
LOG.error("***** Test Failed ***** {}.{} duration_ms={} : {}", description.getClassName(), description.getMethodName(), getTestDuration(), failure.getException().toString());
7476
}
7577

7678
@Override

0 commit comments

Comments
 (0)