From fe9f10d609f122c635741c440898f34d76222b19 Mon Sep 17 00:00:00 2001
From: Theodore Tsirpanis <theodore.tsirpanis@tiledb.com>
Date: Mon, 22 Apr 2024 20:10:51 +0300
Subject: [PATCH 01/11] TileDB: migrate away from deprecated APIs

---
 frmts/tiledb/tiledbdense.cpp         |  33 ++++--
 frmts/tiledb/tiledbmultidimarray.cpp |  10 +-
 frmts/tiledb/tiledbsparse.cpp        | 155 ++++++++++++++++-----------
 3 files changed, 121 insertions(+), 77 deletions(-)

diff --git a/frmts/tiledb/tiledbdense.cpp b/frmts/tiledb/tiledbdense.cpp
index b213e3ca2ab5..cb159630c509 100644
--- a/frmts/tiledb/tiledbdense.cpp
+++ b/frmts/tiledb/tiledbdense.cpp
@@ -374,12 +374,16 @@ CPLErr TileDBRasterBand::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
 
         if (poGDS->m_array->schema().domain().ndim() == 3)
         {
-            poQuery->set_subarray(oaSubarray);
+            tiledb::Subarray subarray(*poGDS->m_roCtx, *poGDS->m_roArray);
+            subarray.set_subarray(oaSubarray);
+            poQuery->set_subarray(subarray);
         }
         else
         {
-            poQuery->set_subarray(std::vector<uint64_t>(oaSubarray.cbegin() + 2,
+            tiledb::Subarray subarray(*poGDS->m_roCtx, *poGDS->m_roArray);
+            subarray.set_subarray(std::vector<uint64_t>(oaSubarray.cbegin() + 2,
                                                         oaSubarray.cend()));
+            poQuery->set_subarray(subarray);
         }
 
         SetBuffer(poQuery.get(), eDataType, osAttrName, pData, nXSize * nYSize);
@@ -576,7 +580,9 @@ CPLErr TileDBRasterDataset::IRasterIO(
 
         if (poQuery != nullptr)
         {
-            poQuery->set_subarray(oaSubarray);
+            tiledb::Subarray subarray(*m_roCtx, *m_array);
+            subarray.set_subarray(oaSubarray);
+            poQuery->set_subarray(subarray);
 
             for (int b = 0; b < nBandCount; b++)
             {
@@ -781,7 +787,8 @@ CPLErr TileDBRasterDataset::TrySaveXML()
             if (nTimestamp)
             {
                 auto oMeta = std::unique_ptr<tiledb::Array>(new tiledb::Array(
-                    *m_ctx, m_array->uri(), TILEDB_WRITE, nTimestamp));
+                    *m_ctx, m_array->uri(), TILEDB_WRITE,
+                    tiledb::TemporalPolicy(tiledb::TimeTravel, nTimestamp)));
                 oMeta->put_metadata(GDAL_ATTRIBUTE_NAME, TILEDB_UINT8,
                                     static_cast<int>(strlen(pszTree)), pszTree);
                 oMeta->close();
@@ -1177,12 +1184,14 @@ GDALDataset *TileDBRasterDataset::Open(GDALOpenInfo *poOpenInfo)
         if (eMode == TILEDB_READ)
         {
             poDS->m_array.reset(new tiledb::Array(
-                *poDS->m_ctx, osArrayPath, TILEDB_READ, poDS->nTimestamp));
+                *poDS->m_ctx, osArrayPath, TILEDB_READ,
+                tiledb::TemporalPolicy(tiledb::TimeTravel, poDS->nTimestamp)));
         }
         else
         {
             poDS->m_array.reset(new tiledb::Array(
-                *poDS->m_ctx, osArrayPath, TILEDB_WRITE, poDS->nTimestamp));
+                *poDS->m_ctx, osArrayPath, TILEDB_WRITE,
+                tiledb::TemporalPolicy(tiledb::TimeTravel, poDS->nTimestamp)));
         }
     }
     else
@@ -2081,9 +2090,10 @@ CPLErr TileDBRasterDataset::CopySubDatasets(GDALDataset *poSrcDS,
 
         if (poDstDS->nTimestamp)
         {
-            poDstDS->m_array.reset(
-                new tiledb::Array(*poDstDS->m_ctx, poDstDS->GetDescription(),
-                                  TILEDB_WRITE, poDstDS->nTimestamp));
+            poDstDS->m_array.reset(new tiledb::Array(
+                *poDstDS->m_ctx, poDstDS->GetDescription(), TILEDB_WRITE,
+                tiledb::TemporalPolicy(tiledb::TimeTravel,
+                                       poDstDS->nTimestamp)));
         }
         else
             poDstDS->m_array.reset(new tiledb::Array(
@@ -2196,8 +2206,9 @@ GDALDataset *TileDBRasterDataset::Create(const char *pszFilename, int nXSize,
     tiledb::Array::create(osArrayPath, *poDS->m_schema);
 
     if (poDS->nTimestamp)
-        poDS->m_array.reset(new tiledb::Array(*poDS->m_ctx, osArrayPath,
-                                              TILEDB_WRITE, poDS->nTimestamp));
+        poDS->m_array.reset(new tiledb::Array(
+            *poDS->m_ctx, osArrayPath, TILEDB_WRITE,
+            tiledb::TemporalPolicy(tiledb::TimeTravel, poDS->nTimestamp)));
     else
         poDS->m_array.reset(
             new tiledb::Array(*poDS->m_ctx, osArrayPath, TILEDB_WRITE));
diff --git a/frmts/tiledb/tiledbmultidimarray.cpp b/frmts/tiledb/tiledbmultidimarray.cpp
index dc5c57db1e08..09649188d551 100644
--- a/frmts/tiledb/tiledbmultidimarray.cpp
+++ b/frmts/tiledb/tiledbmultidimarray.cpp
@@ -924,7 +924,10 @@ bool TileDBArray::IRead(const GUInt64 *arrayStartIdx, const size_t *count,
         {
             tiledb::Query query(m_poSharedResource->GetCtx(),
                                 *(m_poTileDBArray.get()));
-            query.set_subarray(anSubArray);
+            tiledb::Subarray subarray(m_poSharedResource->GetCtx(),
+                                      *(m_poTileDBArray.get()));
+            subarray.set_subarray(anSubArray);
+            query.set_subarray(subarray);
             query.set_data_buffer(m_osAttrName, pDstBuffer, nBufferSize);
 
             if (m_bStats)
@@ -995,7 +998,10 @@ bool TileDBArray::IWrite(const GUInt64 *arrayStartIdx, const size_t *count,
         {
             tiledb::Query query(m_poSharedResource->GetCtx(),
                                 *(m_poTileDBArray.get()));
-            query.set_subarray(anSubArray);
+            tiledb::Subarray subarray(m_poSharedResource->GetCtx(),
+                                      *(m_poTileDBArray.get()));
+            subarray.set_subarray(anSubArray);
+            query.set_subarray(subarray);
             query.set_data_buffer(m_osAttrName, const_cast<void *>(pSrcBuffer),
                                   nBufferSize);
 
diff --git a/frmts/tiledb/tiledbsparse.cpp b/frmts/tiledb/tiledbsparse.cpp
index eeea3f433b08..1d062d69d818 100644
--- a/frmts/tiledb/tiledbsparse.cpp
+++ b/frmts/tiledb/tiledbsparse.cpp
@@ -717,8 +717,9 @@ bool OGRTileDBLayer::InitFromStorage(tiledb::Context *poCtx,
     }
 
     if (m_nTimestamp)
-        m_array.reset(
-            new tiledb::Array(*m_ctx, m_osFilename, TILEDB_READ, m_nTimestamp));
+        m_array.reset(new tiledb::Array(
+            *m_ctx, m_osFilename, TILEDB_READ,
+            tiledb::TemporalPolicy(tiledb::TimeTravel, m_nTimestamp)));
     else
         m_array.reset(new tiledb::Array(*m_ctx, m_osFilename, TILEDB_READ));
 
@@ -1238,7 +1239,7 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
     m_anFIDs->resize(m_nBatchSize);
     if (!m_osFIDColumn.empty())
     {
-        m_query->set_buffer(m_osFIDColumn, *(m_anFIDs));
+        m_query->set_data_buffer(m_osFIDColumn, *(m_anFIDs));
     }
 
     if (!m_poFeatureDefn->GetGeomFieldDefn(0)->IsIgnored())
@@ -1254,16 +1255,19 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
             const auto colType = m_schema->attribute(pszGeomColName).type();
             if (colType == TILEDB_UINT8)
             {
-                m_query->set_buffer(pszGeomColName, *m_anGeometryOffsets,
-                                    *m_abyGeometries);
+                m_query->set_data_buffer(pszGeomColName, *m_abyGeometries);
+                m_query->set_offsets_buffer(pszGeomColName,
+                                            *m_anGeometryOffsets);
             }
             else if (colType == TILEDB_BLOB)
             {
-                m_query->set_buffer(
-                    pszGeomColName, m_anGeometryOffsets->data(),
-                    m_anGeometryOffsets->size(),
+                m_query->set_data_buffer(
+                    pszGeomColName,
                     reinterpret_cast<std::byte *>(m_abyGeometries->data()),
                     m_abyGeometries->size());
+                m_query->set_offsets_buffer(pszGeomColName,
+                                            m_anGeometryOffsets->data(),
+                                            m_anGeometryOffsets->size());
             }
             else
             {
@@ -1273,15 +1277,15 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
         else
         {
             m_adfXs->resize(m_nBatchSize);
-            m_query->set_buffer(m_osXDim, *m_adfXs);
+            m_query->set_data_buffer(m_osXDim, *m_adfXs);
 
             m_adfYs->resize(m_nBatchSize);
-            m_query->set_buffer(m_osYDim, *m_adfYs);
+            m_query->set_data_buffer(m_osYDim, *m_adfYs);
 
             if (!m_osZDim.empty())
             {
                 m_adfZs->resize(m_nBatchSize);
-                m_query->set_buffer(m_osZDim, *m_adfZs);
+                m_query->set_data_buffer(m_osZDim, *m_adfZs);
             }
         }
     }
@@ -1313,9 +1317,9 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
                         std::get<std::shared_ptr<VECTOR_OF_BOOL>>(fieldValues));
                     v.resize(m_nBatchSize);
 #ifdef VECTOR_OF_BOOL_IS_NOT_UINT8_T
-                    m_query->set_buffer(pszFieldName, v.data(), v.size());
+                    m_query->set_data_buffer(pszFieldName, v.data(), v.size());
 #else
-                    m_query->set_buffer(pszFieldName, v);
+                    m_query->set_data_buffer(pszFieldName, v);
 #endif
                 }
                 else
@@ -1325,21 +1329,21 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
                     auto &v = *(std::get<std::shared_ptr<std::vector<int16_t>>>(
                         fieldValues));
                     v.resize(m_nBatchSize);
-                    m_query->set_buffer(pszFieldName, v);
+                    m_query->set_data_buffer(pszFieldName, v);
                 }
                 else if (m_aeFieldTypes[i] == TILEDB_INT32)
                 {
                     auto &v = *(std::get<std::shared_ptr<std::vector<int32_t>>>(
                         fieldValues));
                     v.resize(m_nBatchSize);
-                    m_query->set_buffer(pszFieldName, v);
+                    m_query->set_data_buffer(pszFieldName, v);
                 }
                 else if (m_aeFieldTypes[i] == TILEDB_UINT8)
                 {
                     auto &v = *(std::get<std::shared_ptr<std::vector<uint8_t>>>(
                         fieldValues));
                     v.resize(m_nBatchSize);
-                    m_query->set_buffer(pszFieldName, v);
+                    m_query->set_data_buffer(pszFieldName, v);
                 }
                 else if (m_aeFieldTypes[i] == TILEDB_UINT16)
                 {
@@ -1347,7 +1351,7 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
                         *(std::get<std::shared_ptr<std::vector<uint16_t>>>(
                             fieldValues));
                     v.resize(m_nBatchSize);
-                    m_query->set_buffer(pszFieldName, v);
+                    m_query->set_data_buffer(pszFieldName, v);
                 }
                 else
                 {
@@ -1390,7 +1394,8 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
                         pszFieldName, m_anFieldValuesCapacity[i], nMulFactor));
                     m_anFieldValuesCapacity[i] = v.capacity();
                     anOffsets.resize(m_nBatchSize);
-                    m_query->set_buffer(pszFieldName, anOffsets, v);
+                    m_query->set_data_buffer(pszFieldName, v);
+                    m_query->set_offsets_buffer(pszFieldName, anOffsets);
                 }
                 else if (m_aeFieldTypes[i] == TILEDB_INT32)
                 {
@@ -1400,7 +1405,8 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
                         pszFieldName, m_anFieldValuesCapacity[i], nMulFactor));
                     m_anFieldValuesCapacity[i] = v.capacity();
                     anOffsets.resize(m_nBatchSize);
-                    m_query->set_buffer(pszFieldName, anOffsets, v);
+                    m_query->set_data_buffer(pszFieldName, v);
+                    m_query->set_offsets_buffer(pszFieldName, anOffsets);
                 }
                 else if (m_aeFieldTypes[i] == TILEDB_UINT8)
                 {
@@ -1410,7 +1416,8 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
                         pszFieldName, m_anFieldValuesCapacity[i], nMulFactor));
                     m_anFieldValuesCapacity[i] = v.capacity();
                     anOffsets.resize(m_nBatchSize);
-                    m_query->set_buffer(pszFieldName, anOffsets, v);
+                    m_query->set_data_buffer(pszFieldName, v);
+                    m_query->set_offsets_buffer(pszFieldName, anOffsets);
                 }
                 else if (m_aeFieldTypes[i] == TILEDB_UINT16)
                 {
@@ -1421,7 +1428,8 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
                         pszFieldName, m_anFieldValuesCapacity[i], nMulFactor));
                     m_anFieldValuesCapacity[i] = v.capacity();
                     anOffsets.resize(m_nBatchSize);
-                    m_query->set_buffer(pszFieldName, anOffsets, v);
+                    m_query->set_data_buffer(pszFieldName, v);
+                    m_query->set_offsets_buffer(pszFieldName, anOffsets);
                 }
                 else
                 {
@@ -1438,7 +1446,7 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
                 auto &v = *(std::get<std::shared_ptr<std::vector<int64_t>>>(
                     fieldValues));
                 v.resize(m_nBatchSize);
-                m_query->set_buffer(pszFieldName, v);
+                m_query->set_data_buffer(pszFieldName, v);
                 break;
             }
 
@@ -1456,7 +1464,8 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
                                       nMulFactor));
                 m_anFieldValuesCapacity[i] = v.capacity();
                 anOffsets.resize(m_nBatchSize);
-                m_query->set_buffer(pszFieldName, anOffsets, v);
+                m_query->set_data_buffer(pszFieldName, v);
+                m_query->set_offsets_buffer(pszFieldName, anOffsets);
                 break;
             }
 
@@ -1467,14 +1476,14 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
                     auto &v = *(std::get<std::shared_ptr<std::vector<float>>>(
                         fieldValues));
                     v.resize(m_nBatchSize);
-                    m_query->set_buffer(pszFieldName, v);
+                    m_query->set_data_buffer(pszFieldName, v);
                 }
                 else
                 {
                     auto &v = *(std::get<std::shared_ptr<std::vector<double>>>(
                         fieldValues));
                     v.resize(m_nBatchSize);
-                    m_query->set_buffer(pszFieldName, v);
+                    m_query->set_data_buffer(pszFieldName, v);
                 }
                 break;
             }
@@ -1495,7 +1504,8 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
                     v.resize(GetValueSize(
                         pszFieldName, m_anFieldValuesCapacity[i], nMulFactor));
                     m_anFieldValuesCapacity[i] = v.capacity();
-                    m_query->set_buffer(pszFieldName, anOffsets, v);
+                    m_query->set_data_buffer(pszFieldName, v);
+                    m_query->set_offsets_buffer(pszFieldName, anOffsets);
                 }
                 else
                 {
@@ -1504,7 +1514,8 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
                     v.resize(GetValueSize(
                         pszFieldName, m_anFieldValuesCapacity[i], nMulFactor));
                     m_anFieldValuesCapacity[i] = v.capacity();
-                    m_query->set_buffer(pszFieldName, anOffsets, v);
+                    m_query->set_data_buffer(pszFieldName, v);
+                    m_query->set_offsets_buffer(pszFieldName, anOffsets);
                 }
                 break;
             }
@@ -1520,7 +1531,8 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
                                           : 8));
                 m_anFieldValuesCapacity[i] = v.capacity();
                 anOffsets.resize(m_nBatchSize);
-                m_query->set_buffer(pszFieldName, anOffsets, v);
+                m_query->set_data_buffer(pszFieldName, v);
+                m_query->set_offsets_buffer(pszFieldName, anOffsets);
                 break;
             }
 
@@ -1538,13 +1550,16 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
                 anOffsets.resize(m_nBatchSize);
                 if (eType == TILEDB_UINT8)
                 {
-                    m_query->set_buffer(pszFieldName, anOffsets, v);
+                    m_query->set_data_buffer(pszFieldName, v);
+                    m_query->set_offsets_buffer(pszFieldName, anOffsets);
                 }
                 else if (eType == TILEDB_BLOB)
                 {
-                    m_query->set_buffer(
-                        pszFieldName, anOffsets.data(), anOffsets.size(),
-                        reinterpret_cast<std::byte *>(v.data()), v.size());
+                    m_query->set_data_buffer(
+                        pszFieldName, reinterpret_cast<std::byte *>(v.data()),
+                        v.size());
+                    m_query->set_offsets_buffer(pszFieldName, anOffsets.data(),
+                                                anOffsets.size());
                 }
                 else
                 {
@@ -2193,8 +2208,9 @@ void OGRTileDBLayer::SwitchToReadingMode()
         try
         {
             if (m_nTimestamp)
-                m_array.reset(new tiledb::Array(*m_ctx, m_osFilename,
-                                                TILEDB_READ, m_nTimestamp));
+                m_array.reset(new tiledb::Array(
+                    *m_ctx, m_osFilename, TILEDB_READ,
+                    tiledb::TemporalPolicy(tiledb::TimeTravel, m_nTimestamp)));
             else
                 m_array.reset(
                     new tiledb::Array(*m_ctx, m_osFilename, TILEDB_READ));
@@ -3747,8 +3763,9 @@ void OGRTileDBLayer::InitializeSchemaAndArray()
 #endif
 
         if (m_nTimestamp)
-            m_array.reset(new tiledb::Array(*m_ctx, m_osFilename, TILEDB_WRITE,
-                                            m_nTimestamp));
+            m_array.reset(new tiledb::Array(
+                *m_ctx, m_osFilename, TILEDB_WRITE,
+                tiledb::TemporalPolicy(tiledb::TimeTravel, m_nTimestamp)));
         else
             m_array.reset(
                 new tiledb::Array(*m_ctx, m_osFilename, TILEDB_WRITE));
@@ -3864,8 +3881,9 @@ void OGRTileDBLayer::SwitchToWritingMode()
         try
         {
             if (m_nTimestamp)
-                m_array.reset(new tiledb::Array(*m_ctx, m_osFilename,
-                                                TILEDB_WRITE, m_nTimestamp));
+                m_array.reset(new tiledb::Array(
+                    *m_ctx, m_osFilename, TILEDB_WRITE,
+                    tiledb::TemporalPolicy(tiledb::TimeTravel, m_nTimestamp)));
             else
                 m_array.reset(
                     new tiledb::Array(*m_ctx, m_osFilename, TILEDB_WRITE));
@@ -4275,11 +4293,11 @@ void OGRTileDBLayer::FlushArrays()
         tiledb::Query query(*m_ctx, *m_array);
         query.set_layout(TILEDB_UNORDERED);
         if (!m_osFIDColumn.empty())
-            query.set_buffer(m_osFIDColumn, *m_anFIDs);
-        query.set_buffer(m_osXDim, *m_adfXs);
-        query.set_buffer(m_osYDim, *m_adfYs);
+            query.set_data_buffer(m_osFIDColumn, *m_anFIDs);
+        query.set_data_buffer(m_osXDim, *m_adfXs);
+        query.set_data_buffer(m_osYDim, *m_adfYs);
         if (!m_osZDim.empty())
-            query.set_buffer(m_osZDim, *m_adfZs);
+            query.set_data_buffer(m_osZDim, *m_adfZs);
 
         const char *pszGeomColName = GetDatabaseGeomColName();
         if (pszGeomColName)
@@ -4287,16 +4305,18 @@ void OGRTileDBLayer::FlushArrays()
             m_anGeometryOffsets->pop_back();
             if (m_schema->attribute(pszGeomColName).type() == TILEDB_UINT8)
             {
-                query.set_buffer(pszGeomColName, *m_anGeometryOffsets,
-                                 *m_abyGeometries);
+                query.set_data_buffer(pszGeomColName, *m_abyGeometries);
+                query.set_offsets_buffer(pszGeomColName, *m_anGeometryOffsets);
             }
             else if (m_schema->attribute(pszGeomColName).type() == TILEDB_BLOB)
             {
-                query.set_buffer(
-                    pszGeomColName, m_anGeometryOffsets->data(),
-                    m_anGeometryOffsets->size(),
+                query.set_data_buffer(
+                    pszGeomColName,
                     reinterpret_cast<std::byte *>(m_abyGeometries->data()),
                     m_abyGeometries->size());
+                query.set_offsets_buffer(pszGeomColName,
+                                         m_anGeometryOffsets->data(),
+                                         m_anGeometryOffsets->size());
             }
             else
             {
@@ -4332,9 +4352,9 @@ void OGRTileDBLayer::FlushArrays()
                         auto &v = *(std::get<std::shared_ptr<VECTOR_OF_BOOL>>(
                             fieldValues));
 #ifdef VECTOR_OF_BOOL_IS_NOT_UINT8_T
-                        query.set_buffer(pszFieldName, v.data(), v.size());
+                        query.set_data_buffer(pszFieldName, v.data(), v.size());
 #else
-                        query.set_buffer(pszFieldName, v);
+                        query.set_data_buffer(pszFieldName, v);
 #endif
                     }
                     else
@@ -4372,7 +4392,7 @@ void OGRTileDBLayer::FlushArrays()
 
                 case OFTInteger64:
                 {
-                    query.set_buffer(
+                    query.set_data_buffer(
                         pszFieldName,
                         *std::get<std::shared_ptr<std::vector<int64_t>>>(
                             fieldValues));
@@ -4382,10 +4402,11 @@ void OGRTileDBLayer::FlushArrays()
                 case OFTInteger64List:
                 {
                     anOffsets.pop_back();
-                    query.set_buffer(
-                        pszFieldName, anOffsets,
+                    query.set_data_buffer(
+                        pszFieldName,
                         *std::get<std::shared_ptr<std::vector<int64_t>>>(
                             fieldValues));
+                    query.set_offsets_buffer(pszFieldName, anOffsets);
                     break;
                 }
 
@@ -4393,14 +4414,14 @@ void OGRTileDBLayer::FlushArrays()
                 {
                     if (poFieldDefn->GetSubType() == OFSTFloat32)
                     {
-                        query.set_buffer(
+                        query.set_data_buffer(
                             pszFieldName,
                             *std::get<std::shared_ptr<std::vector<float>>>(
                                 fieldValues));
                     }
                     else
                     {
-                        query.set_buffer(
+                        query.set_data_buffer(
                             pszFieldName,
                             *std::get<std::shared_ptr<std::vector<double>>>(
                                 fieldValues));
@@ -4413,17 +4434,19 @@ void OGRTileDBLayer::FlushArrays()
                     anOffsets.pop_back();
                     if (poFieldDefn->GetSubType() == OFSTFloat32)
                     {
-                        query.set_buffer(
-                            pszFieldName, anOffsets,
+                        query.set_data_buffer(
+                            pszFieldName,
                             *std::get<std::shared_ptr<std::vector<float>>>(
                                 fieldValues));
+                        query.set_offsets_buffer(pszFieldName, anOffsets);
                     }
                     else
                     {
-                        query.set_buffer(
-                            pszFieldName, anOffsets,
+                        query.set_data_buffer(
+                            pszFieldName,
                             *std::get<std::shared_ptr<std::vector<double>>>(
                                 fieldValues));
+                        query.set_offsets_buffer(pszFieldName, anOffsets);
                     }
                     break;
                 }
@@ -4431,9 +4454,10 @@ void OGRTileDBLayer::FlushArrays()
                 case OFTString:
                 {
                     anOffsets.pop_back();
-                    query.set_buffer(
-                        pszFieldName, anOffsets,
+                    query.set_data_buffer(
+                        pszFieldName,
                         *std::get<std::shared_ptr<std::string>>(fieldValues));
+                    query.set_offsets_buffer(pszFieldName, anOffsets);
                     break;
                 }
 
@@ -4444,13 +4468,16 @@ void OGRTileDBLayer::FlushArrays()
                         fieldValues));
                     if (m_aeFieldTypes[i] == TILEDB_UINT8)
                     {
-                        query.set_buffer(pszFieldName, anOffsets, v);
+                        query.set_data_buffer(pszFieldName, v);
+                        query.set_offsets_buffer(pszFieldName, anOffsets);
                     }
                     else if (m_aeFieldTypes[i] == TILEDB_BLOB)
                     {
-                        query.set_buffer(
-                            pszFieldName, anOffsets.data(), anOffsets.size(),
+                        query.set_data_buffer(
+                            pszFieldName,
                             reinterpret_cast<std::byte *>(v.data()), v.size());
+                        query.set_offsets_buffer(pszFieldName, anOffsets.data(),
+                                                 anOffsets.size());
                     }
                     else
                     {
@@ -4463,7 +4490,7 @@ void OGRTileDBLayer::FlushArrays()
                 case OFTDateTime:
                 case OFTTime:
                 {
-                    query.set_buffer(
+                    query.set_data_buffer(
                         pszFieldName,
                         *std::get<std::shared_ptr<std::vector<int64_t>>>(
                             fieldValues));

From dad01e672a8956bc95c33d72762d4a63183ad6ec Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 22 Apr 2024 21:54:09 +0200
Subject: [PATCH 02/11] TileDB: fix crash in previous commit

---
 frmts/tiledb/tiledbdense.cpp | 88 +++++++++++++++---------------------
 1 file changed, 37 insertions(+), 51 deletions(-)

diff --git a/frmts/tiledb/tiledbdense.cpp b/frmts/tiledb/tiledbdense.cpp
index cb159630c509..3090bc670e77 100644
--- a/frmts/tiledb/tiledbdense.cpp
+++ b/frmts/tiledb/tiledbdense.cpp
@@ -351,7 +351,6 @@ CPLErr TileDBRasterBand::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
         nBufferDTSize > 0 && (nPixelSpace % nBufferDTSize) == 0 &&
         (nLineSpace % nBufferDTSize) == 0)
     {
-        std::unique_ptr<tiledb::Query> poQuery;
         const uint64_t nBandIdx = poGDS->nBandStart + nBand - 1;
         std::vector<uint64_t> oaSubarray = {
             nBandIdx,        nBandIdx,
@@ -361,30 +360,25 @@ CPLErr TileDBRasterBand::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
             std::rotate(oaSubarray.begin(), oaSubarray.begin() + 2,
                         oaSubarray.end());
 
-        if ((eRWFlag == GF_Read) &&
-            ((eAccess == GA_Update) && (poGDS->m_roArray)))
-        {
-            poQuery.reset(
-                new tiledb::Query(*poGDS->m_roCtx, *poGDS->m_roArray));
-        }
-        else
-        {
-            poQuery.reset(new tiledb::Query(*poGDS->m_ctx, *poGDS->m_array));
-        }
+        const bool bUseReadOnlyObjs =
+            ((eRWFlag == GF_Read) && (eAccess == GA_Update) &&
+             (poGDS->m_roArray));
+        const auto &oCtxt = bUseReadOnlyObjs ? *poGDS->m_roCtx : *poGDS->m_ctx;
+        const auto &oArray =
+            bUseReadOnlyObjs ? *poGDS->m_roArray : *poGDS->m_array;
 
+        auto poQuery = std::make_unique<tiledb::Query>(oCtxt, oArray);
+        tiledb::Subarray subarray(oCtxt, oArray);
         if (poGDS->m_array->schema().domain().ndim() == 3)
         {
-            tiledb::Subarray subarray(*poGDS->m_roCtx, *poGDS->m_roArray);
             subarray.set_subarray(oaSubarray);
-            poQuery->set_subarray(subarray);
         }
         else
         {
-            tiledb::Subarray subarray(*poGDS->m_roCtx, *poGDS->m_roArray);
             subarray.set_subarray(std::vector<uint64_t>(oaSubarray.cbegin() + 2,
                                                         oaSubarray.cend()));
-            poQuery->set_subarray(subarray);
         }
+        poQuery->set_subarray(subarray);
 
         SetBuffer(poQuery.get(), eDataType, osAttrName, pData, nXSize * nYSize);
 
@@ -564,52 +558,44 @@ CPLErr TileDBRasterDataset::IRasterIO(
         nBufferDTSize > 0 && (nPixelSpace % nBufferDTSize) == 0 &&
         (nLineSpace % nBufferDTSize) == 0)
     {
-        std::unique_ptr<tiledb::Query> poQuery;
         std::vector<uint64_t> oaSubarray = {
             (uint64_t)nYOff, (uint64_t)nYOff + nYSize - 1, (uint64_t)nXOff,
             (uint64_t)nXOff + nXSize - 1};
 
-        if ((eRWFlag == GF_Read) && (eAccess == GA_Update && m_roArray))
-        {
-            poQuery.reset(new tiledb::Query(*m_roCtx, *m_roArray));
-        }
-        else
-        {
-            poQuery.reset(new tiledb::Query(*m_ctx, *m_array));
-        }
-
-        if (poQuery != nullptr)
-        {
-            tiledb::Subarray subarray(*m_roCtx, *m_array);
-            subarray.set_subarray(oaSubarray);
-            poQuery->set_subarray(subarray);
+        const bool bUseReadOnlyObjs =
+            ((eRWFlag == GF_Read) && (eAccess == GA_Update) && (m_roArray));
+        const auto &oCtxt = bUseReadOnlyObjs ? *m_roCtx : *m_ctx;
+        const auto &oArray = bUseReadOnlyObjs ? *m_roArray : *m_array;
 
-            for (int b = 0; b < nBandCount; b++)
-            {
-                TileDBRasterBand *poBand =
-                    (TileDBRasterBand *)GetRasterBand(panBandMap[b]);
-                int nRegionSize = nBufXSize * nBufYSize * nBufferDTSize;
-                SetBuffer(poQuery.get(), eDataType, poBand->osAttrName,
-                          ((GByte *)pData) + b * nRegionSize, nRegionSize);
-            }
+        auto poQuery = std::make_unique<tiledb::Query>(oCtxt, oArray);
+        tiledb::Subarray subarray(oCtxt, oArray);
+        subarray.set_subarray(oaSubarray);
+        poQuery->set_subarray(subarray);
 
-            if (bStats)
-                tiledb::Stats::enable();
+        for (int b = 0; b < nBandCount; b++)
+        {
+            TileDBRasterBand *poBand =
+                (TileDBRasterBand *)GetRasterBand(panBandMap[b]);
+            int nRegionSize = nBufXSize * nBufYSize * nBufferDTSize;
+            SetBuffer(poQuery.get(), eDataType, poBand->osAttrName,
+                      ((GByte *)pData) + b * nRegionSize, nRegionSize);
+        }
 
-            auto status = poQuery->submit();
+        if (bStats)
+            tiledb::Stats::enable();
 
-            if (bStats)
-            {
-                tiledb::Stats::dump(stdout);
-                tiledb::Stats::disable();
-            }
+        auto status = poQuery->submit();
 
-            if (status == tiledb::Query::Status::FAILED)
-                return CE_Failure;
-            else
-                return CE_None;
+        if (bStats)
+        {
+            tiledb::Stats::dump(stdout);
+            tiledb::Stats::disable();
         }
-        return CE_Failure;
+
+        if (status == tiledb::Query::Status::FAILED)
+            return CE_Failure;
+        else
+            return CE_None;
     }
 
     return GDALPamDataset::IRasterIO(eRWFlag, nXOff, nYOff, nXSize, nYSize,

From 130560b919ef774d204f702fde533fe896eb4e0f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 22 Apr 2024 21:54:46 +0200
Subject: [PATCH 03/11] TileDB: remove TILEDB_DEPRECATED suppression

---
 frmts/tiledb/CMakeLists.txt   |  1 -
 frmts/tiledb/include_tiledb.h |  9 ---------
 frmts/tiledb/tiledbdense.cpp  | 10 ----------
 3 files changed, 20 deletions(-)

diff --git a/frmts/tiledb/CMakeLists.txt b/frmts/tiledb/CMakeLists.txt
index 2b68b39f7ef7..86fc626591c6 100644
--- a/frmts/tiledb/CMakeLists.txt
+++ b/frmts/tiledb/CMakeLists.txt
@@ -25,5 +25,4 @@ endif()
 gdal_standard_includes(gdal_TileDB)
 target_include_directories(gdal_TileDB PRIVATE
                            ${GDAL_RASTER_FORMAT_SOURCE_DIR}/mem)
-target_compile_definitions(gdal_TileDB PRIVATE -DTILEDB_DEPRECATED=)
 gdal_target_link_libraries(gdal_TileDB PRIVATE TileDB::tiledb_shared)
diff --git a/frmts/tiledb/include_tiledb.h b/frmts/tiledb/include_tiledb.h
index f721cb3c59cb..cec9844846ac 100644
--- a/frmts/tiledb/include_tiledb.h
+++ b/frmts/tiledb/include_tiledb.h
@@ -35,11 +35,6 @@
 #pragma GCC system_header
 #endif
 
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4996) /* XXXX was deprecated */
-#endif
-
 #ifdef INCLUDE_ONLY_TILEDB_VERSION
 #include "tiledb/tiledb_version.h"
 #else
@@ -47,10 +42,6 @@
 #include "tiledb/tiledb_experimental"
 #endif
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 #if TILEDB_VERSION_MAJOR > 2 ||                                                \
     (TILEDB_VERSION_MAJOR == 2 && TILEDB_VERSION_MINOR >= 9)
 #define HAS_TILEDB_GROUP
diff --git a/frmts/tiledb/tiledbdense.cpp b/frmts/tiledb/tiledbdense.cpp
index 3090bc670e77..e431faf60947 100644
--- a/frmts/tiledb/tiledbdense.cpp
+++ b/frmts/tiledb/tiledbdense.cpp
@@ -31,12 +31,6 @@
 
 #include "tiledbheaders.h"
 
-#ifdef _MSC_VER
-#pragma warning(push)
-// 'tiledb::Array::Array': was declared deprecated
-#pragma warning(disable : 4996) /* XXXX was deprecated */
-#endif
-
 constexpr const char *RASTER_DATASET_TYPE = "raster";
 
 /************************************************************************/
@@ -2412,7 +2406,3 @@ GDALDataset *TileDBRasterDataset::CreateCopy(const char *pszFilename,
     }
     return nullptr;
 }
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif

From e440870001312795fa05b894195910e47adf3e51 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Apr 2024 19:41:00 +0200
Subject: [PATCH 04/11] CMake: require TileDB >= 2.15

---
 cmake/helpers/CheckDependentLibraries.cmake     | 2 +-
 doc/source/development/building_from_source.rst | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmake/helpers/CheckDependentLibraries.cmake b/cmake/helpers/CheckDependentLibraries.cmake
index 6eeb5d880066..fd06585acf00 100644
--- a/cmake/helpers/CheckDependentLibraries.cmake
+++ b/cmake/helpers/CheckDependentLibraries.cmake
@@ -751,7 +751,7 @@ gdal_check_package(Crnlib "enable gdal_DDS driver" CAN_DISABLE)
 gdal_check_package(basisu "Enable BASISU driver" CONFIG CAN_DISABLE)
 gdal_check_package(IDB "enable ogr_IDB driver" CAN_DISABLE)
 gdal_check_package(rdb "enable RIEGL RDB library" CONFIG CAN_DISABLE)
-gdal_check_package(TileDB "enable TileDB driver" CONFIG CAN_DISABLE VERSION "2.7")
+gdal_check_package(TileDB "enable TileDB driver" CONFIG CAN_DISABLE VERSION "2.15")
 
 gdal_check_package(OpenEXR "OpenEXR >=2.2" CAN_DISABLE)
 gdal_check_package(MONGOCXX "Enable MongoDBV3 driver" CAN_DISABLE)
diff --git a/doc/source/development/building_from_source.rst b/doc/source/development/building_from_source.rst
index bed99ec09c82..af4eaa44fef6 100644
--- a/doc/source/development/building_from_source.rst
+++ b/doc/source/development/building_from_source.rst
@@ -1907,6 +1907,8 @@ TileDB
 The `TileDB <https://github.com/TileDB-Inc/TileDB>` library is required for the :ref:`raster.tiledb` driver.
 Specify install prefix in the ``CMAKE_PREFIX_PATH`` variable.
 
+TileDB >= 2.15 is required since GDAL 3.9
+
 .. option:: GDAL_USE_TILEDB=ON/OFF
 
     Control whether to use TileDB. Defaults to ON when TileDB is found.

From e4e71a89cae863a9d84b476679245680e71ecbbc Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Apr 2024 20:10:54 +0200
Subject: [PATCH 05/11] TileDB: cleanups related to requiring TileDB >= 2.7

---
 frmts/tiledb/tiledbdense.cpp | 137 +----------------------------------
 1 file changed, 2 insertions(+), 135 deletions(-)

diff --git a/frmts/tiledb/tiledbdense.cpp b/frmts/tiledb/tiledbdense.cpp
index e431faf60947..40565fb2e812 100644
--- a/frmts/tiledb/tiledbdense.cpp
+++ b/frmts/tiledb/tiledbdense.cpp
@@ -107,8 +107,6 @@ static const char *index_type_name(TILEDB_INTERLEAVE_MODE eMode)
 /*                             SetBuffer()                              */
 /************************************************************************/
 
-#if ((TILEDB_VERSION_MAJOR > 2) ||                                             \
-     (TILEDB_VERSION_MAJOR == 2 && TILEDB_VERSION_MINOR >= 4))
 static CPLErr SetBuffer(tiledb::Query *poQuery, GDALDataType eType,
                         const CPLString &osAttrName, void *pImage, int nSize)
 {
@@ -175,74 +173,6 @@ static CPLErr SetBuffer(tiledb::Query *poQuery, GDALDataType eType,
     }
     return CE_None;
 }
-#else
-static CPLErr SetBuffer(tiledb::Query *poQuery, GDALDataType eType,
-                        const CPLString &osAttrName, void *pImage, int nSize)
-{
-    switch (eType)
-    {
-        case GDT_Byte:
-            poQuery->set_buffer(
-                osAttrName, reinterpret_cast<unsigned char *>(pImage), nSize);
-            break;
-        case GDT_Int8:
-            poQuery->set_buffer(osAttrName, reinterpret_cast<int8_t *>(pImage),
-                                nSize);
-            break;
-        case GDT_UInt16:
-            poQuery->set_buffer(
-                osAttrName, reinterpret_cast<unsigned short *>(pImage), nSize);
-            break;
-        case GDT_UInt32:
-            poQuery->set_buffer(
-                osAttrName, reinterpret_cast<unsigned int *>(pImage), nSize);
-            break;
-        case GDT_UInt64:
-            poQuery->set_buffer(osAttrName,
-                                reinterpret_cast<uint64_t *>(pImage), nSize);
-            break;
-        case GDT_Int16:
-            poQuery->set_buffer(osAttrName, reinterpret_cast<short *>(pImage),
-                                nSize);
-            break;
-        case GDT_Int32:
-            poQuery->set_buffer(osAttrName, reinterpret_cast<int *>(pImage),
-                                nSize);
-            break;
-        case GDT_Int64:
-            poQuery->set_buffer(osAttrName, reinterpret_cast<int64_t *>(pImage),
-                                nSize);
-            break;
-        case GDT_Float32:
-            poQuery->set_buffer(osAttrName, reinterpret_cast<float *>(pImage),
-                                nSize);
-            break;
-        case GDT_Float64:
-            poQuery->set_buffer(osAttrName, reinterpret_cast<double *>(pImage),
-                                nSize);
-            break;
-        case GDT_CInt16:
-            poQuery->set_buffer(osAttrName, reinterpret_cast<short *>(pImage),
-                                nSize * 2);
-            break;
-        case GDT_CInt32:
-            poQuery->set_buffer(osAttrName, reinterpret_cast<int *>(pImage),
-                                nSize * 2);
-            break;
-        case GDT_CFloat32:
-            poQuery->set_buffer(osAttrName, reinterpret_cast<float *>(pImage),
-                                nSize * 2);
-            break;
-        case GDT_CFloat64:
-            poQuery->set_buffer(osAttrName, reinterpret_cast<double *>(pImage),
-                                nSize * 2);
-            break;
-        default:
-            return CE_Failure;
-    }
-    return CE_None;
-}
-#endif
 
 /************************************************************************/
 /*                          TileDBRasterBand()                          */
@@ -683,11 +613,7 @@ CPLErr TileDBRasterDataset::TrySaveXML()
         if (psTree == nullptr)
         {
             /* If we have unset all metadata, we have to delete the PAM file */
-#if TILEDB_VERSION_MAJOR == 1 && TILEDB_VERSION_MINOR < 7
-            vfs.remove_file(psPam->pszPamFilename);
-#else
             m_array->delete_metadata(GDAL_ATTRIBUTE_NAME);
-#endif
             return CE_None;
         }
 
@@ -757,11 +683,9 @@ CPLErr TileDBRasterDataset::TrySaveXML()
         /*      Try saving the auxiliary metadata. */
         /* --------------------------------------------------------------------
          */
-        bool bSaved = false;
         CPLErrorHandlerPusher oQuietError(CPLQuietErrorHandler);
         char *pszTree = CPLSerializeXMLTree(psTree);
 
-#if TILEDB_VERSION_MAJOR > 1 || TILEDB_VERSION_MINOR >= 7
         if (eAccess == GA_ReadOnly)
         {
             if (nTimestamp)
@@ -791,64 +715,8 @@ CPLErr TileDBRasterDataset::TrySaveXML()
                                   static_cast<int>(strlen(pszTree)), pszTree);
         }
 
-        bSaved = true;
-#endif
-
-        // cppcheck-suppress knownConditionTrueFalse
-        if (!bSaved)
-        {
-            vfs.touch(psPam->pszPamFilename);
-            tiledb::VFS::filebuf fbuf(vfs);
-            fbuf.open(psPam->pszPamFilename, std::ios::out);
-            std::ostream os(&fbuf);
-
-            if (os.good())
-            {
-                os.write(pszTree, strlen(pszTree));
-                bSaved = true;
-            }
-
-            fbuf.close();
-        }
-
         CPLFree(pszTree);
 
-        /* --------------------------------------------------------------------
-         */
-        /*      If it fails, check if we have a proxy directory for auxiliary */
-        /*      metadata to be stored in, and try to save there. */
-        /* --------------------------------------------------------------------
-         */
-        CPLErr eErr = CE_None;
-
-        if (bSaved)
-            eErr = CE_None;
-        else
-        {
-            const char *pszBasename = GetDescription();
-
-            if (psPam->osPhysicalFilename.length() > 0)
-                pszBasename = psPam->osPhysicalFilename;
-
-            const char *pszNewPam = nullptr;
-            if (PamGetProxy(pszBasename) == nullptr &&
-                ((pszNewPam = PamAllocateProxy(pszBasename)) != nullptr))
-            {
-                CPLErrorReset();
-                CPLFree(psPam->pszPamFilename);
-                psPam->pszPamFilename = CPLStrdup(pszNewPam);
-                eErr = TrySaveXML();
-            }
-            /* No way we can save into a /vsicurl resource */
-            else if (!VSISupportsSequentialWrite(psPam->pszPamFilename, false))
-            {
-                CPLError(CE_Warning, CPLE_AppDefined,
-                         "Unable to save auxiliary information in %s.",
-                         psPam->pszPamFilename);
-                eErr = CE_Warning;
-            }
-        }
-
         /* --------------------------------------------------------------------
          */
         /*      Cleanup */
@@ -857,7 +725,7 @@ CPLErr TileDBRasterDataset::TrySaveXML()
         if (psTree)
             CPLDestroyXMLNode(psTree);
 
-        return eErr;
+        return CE_None;
     }
     catch (const std::exception &e)
     {
@@ -927,7 +795,6 @@ CPLErr TileDBRasterDataset::TryLoadCachedXML(char ** /*papszSiblingFiles*/,
         {
             CPLErrorHandlerPusher oQuietError(CPLQuietErrorHandler);
 
-#if TILEDB_VERSION_MAJOR > 1 || TILEDB_VERSION_MINOR >= 7
             if (bReload)
             {
                 tiledb_datatype_t v_type =
@@ -957,7 +824,7 @@ CPLErr TileDBRasterDataset::TryLoadCachedXML(char ** /*papszSiblingFiles*/,
                 }
                 psTree = CPLParseXMLString(osMetaDoc);
             }
-#endif
+
             if (bReload && psTree == nullptr &&
                 vfs.is_file(psPam->pszPamFilename))
             {

From 0a202ae4ca0cbdb68b9febb50a24e582c67da4d5 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Apr 2024 19:42:53 +0200
Subject: [PATCH 06/11] TileDB: cleanups related to requiring TileDB >= 2.9

---
 autotest/ogr/ogr_tiledb.py        |  5 -----
 frmts/tiledb/include_tiledb.h     |  5 -----
 frmts/tiledb/tiledbcommon.cpp     |  4 ----
 frmts/tiledb/tiledbdrivercore.cpp |  2 --
 frmts/tiledb/tiledbsparse.cpp     | 14 --------------
 5 files changed, 30 deletions(-)

diff --git a/autotest/ogr/ogr_tiledb.py b/autotest/ogr/ogr_tiledb.py
index e9fcf1f2c2bd..2311a3f6f962 100644
--- a/autotest/ogr/ogr_tiledb.py
+++ b/autotest/ogr/ogr_tiledb.py
@@ -1029,11 +1029,6 @@ def test_ogr_tiledb_switch_between_read_and_write():
 
 def test_ogr_tiledb_create_group():
 
-    if "CREATE_GROUP" not in gdal.GetDriverByName("TileDB").GetMetadataItem(
-        gdal.DMD_CREATIONOPTIONLIST
-    ):
-        pytest.skip("CREATE_GROUP not supported in TileDB < 2.9")
-
     if os.path.exists("tmp/test.tiledb"):
         shutil.rmtree("tmp/test.tiledb")
 
diff --git a/frmts/tiledb/include_tiledb.h b/frmts/tiledb/include_tiledb.h
index cec9844846ac..9eecd245d561 100644
--- a/frmts/tiledb/include_tiledb.h
+++ b/frmts/tiledb/include_tiledb.h
@@ -42,11 +42,6 @@
 #include "tiledb/tiledb_experimental"
 #endif
 
-#if TILEDB_VERSION_MAJOR > 2 ||                                                \
-    (TILEDB_VERSION_MAJOR == 2 && TILEDB_VERSION_MINOR >= 9)
-#define HAS_TILEDB_GROUP
-#endif
-
 #if TILEDB_VERSION_MAJOR > 2 ||                                                \
     (TILEDB_VERSION_MAJOR == 2 && TILEDB_VERSION_MINOR >= 10)
 #define HAS_TILEDB_BOOL
diff --git a/frmts/tiledb/tiledbcommon.cpp b/frmts/tiledb/tiledbcommon.cpp
index 5679a6f5b9eb..eb38195c9424 100644
--- a/frmts/tiledb/tiledbcommon.cpp
+++ b/frmts/tiledb/tiledbcommon.cpp
@@ -150,14 +150,12 @@ int TileDBDataset::Identify(GDALOpenInfo *poOpenInfo)
             CPLString osArrayPath =
                 TileDBDataset::VSI_to_tiledb_uri(poOpenInfo->pszFilename);
             const auto eType = tiledb::Object::object(ctx, osArrayPath).type();
-#ifdef HAS_TILEDB_GROUP
             if ((poOpenInfo->nOpenFlags & GDAL_OF_VECTOR) != 0)
             {
                 if (eType == tiledb::Object::Type::Array ||
                     eType == tiledb::Object::Type::Group)
                     return true;
             }
-#endif
 #ifdef HAS_TILEDB_MULTIDIM
             if ((poOpenInfo->nOpenFlags & GDAL_OF_MULTIDIM_RASTER) != 0)
             {
@@ -259,7 +257,6 @@ GDALDataset *TileDBDataset::Open(GDALOpenInfo *poOpenInfo)
                 TileDBDataset::VSI_to_tiledb_uri(poOpenInfo->pszFilename);
 
             const auto eType = tiledb::Object::object(oCtx, osPath).type();
-#ifdef HAS_TILEDB_GROUP
             if ((poOpenInfo->nOpenFlags & GDAL_OF_VECTOR) != 0 &&
                 eType == tiledb::Object::Type::Group)
             {
@@ -314,7 +311,6 @@ GDALDataset *TileDBDataset::Open(GDALOpenInfo *poOpenInfo)
                 }
                 return nullptr;
             }
-#endif
 #endif
 
             tiledb::ArraySchema schema(oCtx, osPath);
diff --git a/frmts/tiledb/tiledbdrivercore.cpp b/frmts/tiledb/tiledbdrivercore.cpp
index d9ae98c5da1d..b83b94e45370 100644
--- a/frmts/tiledb/tiledbdrivercore.cpp
+++ b/frmts/tiledb/tiledbdrivercore.cpp
@@ -149,11 +149,9 @@ void TileDBDriverSetCommonMetadata(GDALDriver *poDriver)
         "   <Option name='BOUNDS' scope='raster' type='string' "
         "description='Specify "
         "bounds for sparse array, minx, miny, maxx, maxy'/>\n"
-#ifdef HAS_TILEDB_GROUP
         "   <Option name='CREATE_GROUP' scope='vector' type='boolean' "
         "description='Whether to create a group for multiple layer support' "
         "default='NO'/>"
-#endif
         "</CreationOptionList>\n");
 
     // clang-format off
diff --git a/frmts/tiledb/tiledbsparse.cpp b/frmts/tiledb/tiledbsparse.cpp
index 1d062d69d818..37f7827f6a2e 100644
--- a/frmts/tiledb/tiledbsparse.cpp
+++ b/frmts/tiledb/tiledbsparse.cpp
@@ -274,7 +274,6 @@ GDALDataset *OGRTileDBDataset::Open(GDALOpenInfo *poOpenInfo,
     };
 
     CPL_IGNORE_RET_VAL(objectType);
-#ifdef HAS_TILEDB_GROUP
     if (objectType == tiledb::Object::Type::Group)
     {
         poDS->m_osGroupName = osFilename;
@@ -293,7 +292,6 @@ GDALDataset *OGRTileDBDataset::Open(GDALOpenInfo *poOpenInfo,
         }
     }
     else
-#endif
     {
         if (!AddLayer(osFilename))
             return nullptr;
@@ -347,7 +345,6 @@ OGRTileDBDataset::ICreateLayer(const char *pszName,
         return nullptr;
     }
 
-#ifdef HAS_TILEDB_GROUP
     if (!m_osGroupName.empty() && strchr(pszName, '/'))
     {
         // Otherwise a layer name wit ha slash when groups are enabled causes
@@ -357,7 +354,6 @@ OGRTileDBDataset::ICreateLayer(const char *pszName,
                  "Slash is not supported in layer name");
         return nullptr;
     }
-#endif
 
     const auto eGType = poGeomFieldDefn ? poGeomFieldDefn->GetType() : wkbNone;
     const auto poSpatialRef =
@@ -365,17 +361,11 @@ OGRTileDBDataset::ICreateLayer(const char *pszName,
 
     if (m_osGroupName.empty() && !m_apoLayers.empty())
     {
-#ifdef HAS_TILEDB_GROUP
         CPLError(CE_Failure, CPLE_NotSupported,
                  "CreateLayer() failed: no more than one layer per dataset "
                  "supported on a array object. Create a dataset with the "
                  "CREATE_GROUP=YES creation option or open such group "
                  "to enable multiple layer creation.");
-#else
-        CPLError(CE_Failure, CPLE_NotSupported,
-                 "CreateLayer() failed: no more than one layer per dataset "
-                 "supported on a array object.");
-#endif
         return nullptr;
     }
 
@@ -565,7 +555,6 @@ GDALDataset *OGRTileDBDataset::Create(const char *pszFilename,
         poDS->m_ctx.reset(new tiledb::Context());
     }
 
-#ifdef HAS_TILEDB_GROUP
     if (CPLTestBool(CSLFetchNameValueDef(papszOptions, "CREATE_GROUP", "NO")))
     {
         try
@@ -579,7 +568,6 @@ GDALDataset *OGRTileDBDataset::Create(const char *pszFilename,
         }
         poDS->m_osGroupName = poDS->GetDescription();
     }
-#endif
 
     return poDS.release();
 }
@@ -3754,13 +3742,11 @@ void OGRTileDBLayer::InitializeSchemaAndArray()
 
         tiledb::Array::create(m_osFilename, *m_schema);
 
-#ifdef HAS_TILEDB_GROUP
         if (!m_osGroupName.empty())
         {
             tiledb::Group group(*m_ctx, m_osGroupName, TILEDB_WRITE);
             group.add_member(m_osFilename, false, GetDescription());
         }
-#endif
 
         if (m_nTimestamp)
             m_array.reset(new tiledb::Array(

From 98001f5533056ec745a0935a4685c1388db0c8d2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Apr 2024 19:49:40 +0200
Subject: [PATCH 07/11] TileDB: cleanups related to requiring TileDB >= 2.10

---
 autotest/ogr/ogr_tiledb.py        | 60 +++++++++---------------
 frmts/tiledb/include_tiledb.h     |  5 --
 frmts/tiledb/tiledbdrivercore.cpp |  7 +--
 frmts/tiledb/tiledbsparse.cpp     | 77 ++++++-------------------------
 4 files changed, 38 insertions(+), 111 deletions(-)

diff --git a/autotest/ogr/ogr_tiledb.py b/autotest/ogr/ogr_tiledb.py
index 2311a3f6f962..ae41ed3fb492 100644
--- a/autotest/ogr/ogr_tiledb.py
+++ b/autotest/ogr/ogr_tiledb.py
@@ -45,7 +45,7 @@
 ###############################################################################
 
 
-def create_tiledb_dataset(nullable, batch_size, include_bool, extra_feature=False):
+def create_tiledb_dataset(nullable, batch_size, extra_feature=False):
 
     ds = ogr.GetDriverByName("TileDB").CreateDataSource("tmp/test.tiledb")
     srs = osr.SpatialReference()
@@ -79,11 +79,10 @@ def create_tiledb_dataset(nullable, batch_size, include_bool, extra_feature=Fals
     with gdal.config_option("TILEDB_INT_TYPE", "UINT16"):
         lyr.CreateField(fld_defn)
 
-    if include_bool:
-        fld_defn = ogr.FieldDefn("boolfield", ogr.OFTInteger)
-        fld_defn.SetNullable(nullable)
-        fld_defn.SetSubType(ogr.OFSTBoolean)
-        lyr.CreateField(fld_defn)
+    fld_defn = ogr.FieldDefn("boolfield", ogr.OFTInteger)
+    fld_defn.SetNullable(nullable)
+    fld_defn.SetSubType(ogr.OFSTBoolean)
+    lyr.CreateField(fld_defn)
 
     fld_defn = ogr.FieldDefn("int64field", ogr.OFTInteger64)
     fld_defn.SetNullable(nullable)
@@ -111,11 +110,10 @@ def create_tiledb_dataset(nullable, batch_size, include_bool, extra_feature=Fals
     fld_defn.SetSubType(ogr.OFSTInt16)
     lyr.CreateField(fld_defn)
 
-    if include_bool:
-        fld_defn = ogr.FieldDefn("boollistfield", ogr.OFTIntegerList)
-        fld_defn.SetNullable(nullable)
-        fld_defn.SetSubType(ogr.OFSTBoolean)
-        lyr.CreateField(fld_defn)
+    fld_defn = ogr.FieldDefn("boollistfield", ogr.OFTIntegerList)
+    fld_defn.SetNullable(nullable)
+    fld_defn.SetSubType(ogr.OFSTBoolean)
+    lyr.CreateField(fld_defn)
 
     fld_defn = ogr.FieldDefn("doublelistfield", ogr.OFTRealList)
     fld_defn.SetNullable(nullable)
@@ -148,8 +146,7 @@ def create_tiledb_dataset(nullable, batch_size, include_bool, extra_feature=Fals
     f["strfield"] = "foo"
     f["intfield"] = -123456789
     f["int16field"] = -32768
-    if include_bool:
-        f["boolfield"] = True
+    f["boolfield"] = True
     f["uint8field"] = 0
     f["uint16field"] = 0
     f["int64field"] = -1234567890123456
@@ -158,8 +155,7 @@ def create_tiledb_dataset(nullable, batch_size, include_bool, extra_feature=Fals
     f["binaryfield"] = b"\xDE\xAD\xBE\xEF"
     f["intlistfield"] = [-123456789, 123]
     f["int16listfield"] = [-32768, 32767]
-    if include_bool:
-        f["boollistfield"] = [True, False]
+    f["boollistfield"] = [True, False]
     f["doublelistfield"] = [1.2345, -1.2345]
     f["floatlistfield"] = [1.5, -1.5, 0]
     f["datetimefield"] = "2023-04-07T12:34:56.789Z"
@@ -184,8 +180,7 @@ def create_tiledb_dataset(nullable, batch_size, include_bool, extra_feature=Fals
     f["strfield"] = "barbaz"
     f["intfield"] = 123456789
     f["int16field"] = 32767
-    if include_bool:
-        f["boolfield"] = False
+    f["boolfield"] = False
     f["uint8field"] = 255
     f["uint16field"] = 65535
     f["int64field"] = 1234567890123456
@@ -194,8 +189,7 @@ def create_tiledb_dataset(nullable, batch_size, include_bool, extra_feature=Fals
     f["binaryfield"] = b"\xBE\xEF\xDE\xAD"
     f["intlistfield"] = [123456789, -123]
     f["int16listfield"] = [32767, -32768]
-    if include_bool:
-        f["boollistfield"] = [False, True]
+    f["boollistfield"] = [False, True]
     f["doublelistfield"] = [-1.2345, 1.2345]
     f["floatlistfield"] = [0.0, -1.5, 1.5]
     # Will be transformed to "2023/04/07 10:19:56.789+00"
@@ -212,8 +206,7 @@ def create_tiledb_dataset(nullable, batch_size, include_bool, extra_feature=Fals
         f["strfield"] = "something"
         f["intfield"] = 8765432
         f["int16field"] = 32767
-        if include_bool:
-            f["boolfield"] = False
+        f["boolfield"] = False
         f["uint8field"] = 255
         f["uint16field"] = 65535
         f["int64field"] = 9876543210123456
@@ -222,8 +215,7 @@ def create_tiledb_dataset(nullable, batch_size, include_bool, extra_feature=Fals
         f["binaryfield"] = b"\xDE\xAD\xBE\xEF"
         f["intlistfield"] = [-123456789, -123]
         f["int16listfield"] = [32767, -32768]
-        if include_bool:
-            f["boollistfield"] = [False, True]
+        f["boollistfield"] = [False, True]
         f["doublelistfield"] = [-1.2345, 1.2345]
         f["floatlistfield"] = [0.0, -1.5, 1.5]
         # Will be transformed to "2023/04/07 10:19:56.789+00"
@@ -248,7 +240,7 @@ def test_ogr_tiledb_basic(nullable, batch_size):
     if os.path.exists("tmp/test.tiledb"):
         shutil.rmtree("tmp/test.tiledb")
 
-    field_count, srs, options = create_tiledb_dataset(nullable, batch_size, True)
+    field_count, srs, options = create_tiledb_dataset(nullable, batch_size)
 
     ds = gdal.OpenEx("tmp/test.tiledb", open_options=options)
     lyr = ds.GetLayer(0)
@@ -1132,10 +1124,7 @@ def test_ogr_tiledb_arrow_stream_pyarrow(nullable, batch_size):
     if os.path.exists("tmp/test.tiledb"):
         shutil.rmtree("tmp/test.tiledb")
 
-    include_bool = "Boolean" in gdal.GetDriverByName("TileDB").GetMetadataItem(
-        gdal.DMD_CREATIONFIELDDATASUBTYPES
-    )
-    _, _, options = create_tiledb_dataset(nullable, batch_size, include_bool)
+    _, _, options = create_tiledb_dataset(nullable, batch_size)
 
     ds = gdal.OpenEx("tmp/test.tiledb", open_options=options)
     lyr = ds.GetLayer(0)
@@ -1173,11 +1162,10 @@ def test_ogr_tiledb_arrow_stream_pyarrow(nullable, batch_size):
             ("timefield", "time32[ms]"),
             ("intfieldextra", "int32"),
             ("wkb_geometry", "large_binary"),
+            ("boolfield", "bool"),
+            ("boollistfield", "large_list<item: bool not null>"),
         ]
     )
-    if include_bool:
-        expected_fields.add(("boolfield", "bool"))
-        expected_fields.add(("boollistfield", "large_list<item: bool not null>"))
     assert fields == expected_fields
 
     def check_batch(batch):
@@ -1243,10 +1231,7 @@ def test_ogr_tiledb_arrow_stream_numpy(nullable, batch_size):
     if os.path.exists("tmp/test.tiledb"):
         shutil.rmtree("tmp/test.tiledb")
 
-    include_bool = True
-    _, _, options = create_tiledb_dataset(
-        nullable, batch_size, include_bool, extra_feature=True
-    )
+    _, _, options = create_tiledb_dataset(nullable, batch_size, extra_feature=True)
 
     ds = gdal.OpenEx("tmp/test.tiledb", open_options=options)
     lyr = ds.GetLayer(0)
@@ -1342,10 +1327,9 @@ def check_batch(batch):
             "timefield",
             "intfieldextra",
             "wkb_geometry",
+            "boolfield",
+            "boollistfield",
         }
-        if include_bool:
-            expected_fields.add("boolfield")
-            expected_fields.add("boollistfield")
         assert batch.keys() == expected_fields
 
         check_batch(batch)
diff --git a/frmts/tiledb/include_tiledb.h b/frmts/tiledb/include_tiledb.h
index 9eecd245d561..ce720b7cc1a4 100644
--- a/frmts/tiledb/include_tiledb.h
+++ b/frmts/tiledb/include_tiledb.h
@@ -42,11 +42,6 @@
 #include "tiledb/tiledb_experimental"
 #endif
 
-#if TILEDB_VERSION_MAJOR > 2 ||                                                \
-    (TILEDB_VERSION_MAJOR == 2 && TILEDB_VERSION_MINOR >= 10)
-#define HAS_TILEDB_BOOL
-#endif
-
 #if TILEDB_VERSION_MAJOR > 2 ||                                                \
     (TILEDB_VERSION_MAJOR == 2 && TILEDB_VERSION_MINOR >= 11)
 #define HAS_TILEDB_WORKING_OR_FILTER
diff --git a/frmts/tiledb/tiledbdrivercore.cpp b/frmts/tiledb/tiledbdrivercore.cpp
index b83b94e45370..4c5fddddc512 100644
--- a/frmts/tiledb/tiledbdrivercore.cpp
+++ b/frmts/tiledb/tiledbdrivercore.cpp
@@ -102,12 +102,7 @@ void TileDBDriverSetCommonMetadata(GDALDriver *poDriver)
         "Integer Integer64 Real String Date Time DateTime "
         "IntegerList Integer64List RealList Binary");
     poDriver->SetMetadataItem(GDAL_DMD_CREATIONFIELDDATASUBTYPES,
-#ifdef HAS_TILEDB_BOOL
-                              "Boolean Int16 Float32"
-#else
-                              "Int16 Float32"
-#endif
-    );
+                              "Boolean Int16 Float32");
     poDriver->SetMetadataItem(
         GDAL_DMD_CREATIONOPTIONLIST,
         "<CreationOptionList>\n"
diff --git a/frmts/tiledb/tiledbsparse.cpp b/frmts/tiledb/tiledbsparse.cpp
index 37f7827f6a2e..823dffd20f35 100644
--- a/frmts/tiledb/tiledbsparse.cpp
+++ b/frmts/tiledb/tiledbsparse.cpp
@@ -73,12 +73,10 @@ template <> struct GetType<TILEDB_UINT16>
     using EltType = std::vector<uint16_t>;
 };
 
-#ifdef HAS_TILEDB_BOOL
 template <> struct GetType<TILEDB_BOOL>
 {
     using EltType = VECTOR_OF_BOOL;
 };
-#endif
 
 template <> struct GetType<TILEDB_INT64>
 {
@@ -143,11 +141,9 @@ template <template <class> class Func> struct ProcessField
             case TILEDB_UINT16:
                 Func<GetType<TILEDB_UINT16>::EltType>::exec(array);
                 break;
-#ifdef HAS_TILEDB_BOOL
             case TILEDB_BOOL:
                 Func<GetType<TILEDB_BOOL>::EltType>::exec(array);
                 break;
-#endif
             case TILEDB_INT64:
                 Func<GetType<TILEDB_INT64>::EltType>::exec(array);
                 break;
@@ -761,13 +757,11 @@ bool OGRTileDBLayer::InitFromStorage(tiledb::Context *poCtx,
                 eType = OFTString;
                 fieldValues.push_back(std::make_shared<std::string>());
                 break;
-#ifdef HAS_TILEDB_BOOL
             case TILEDB_BOOL:
                 eType = bIsSingle ? OFTInteger : OFTIntegerList;
                 eSubType = OFSTBoolean;
                 fieldValues.push_back(std::make_shared<VECTOR_OF_BOOL>());
                 break;
-#endif
             case TILEDB_DATETIME_DAY:
                 eType = OFTDate;
                 fieldValues.push_back(std::make_shared<std::vector<int64_t>>());
@@ -1298,7 +1292,6 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
         {
             case OFTInteger:
             {
-#ifdef HAS_TILEDB_BOOL
                 if (m_aeFieldTypes[i] == TILEDB_BOOL)
                 {
                     auto &v = *(
@@ -1310,9 +1303,7 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
                     m_query->set_data_buffer(pszFieldName, v);
 #endif
                 }
-                else
-#endif
-                    if (m_aeFieldTypes[i] == TILEDB_INT16)
+                else if (m_aeFieldTypes[i] == TILEDB_INT16)
                 {
                     auto &v = *(std::get<std::shared_ptr<std::vector<int16_t>>>(
                         fieldValues));
@@ -1356,7 +1347,6 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
                         ? static_cast<int>(
                               std::min<uint64_t>(1000, iter->second))
                         : 8;
-#ifdef HAS_TILEDB_BOOL
                 if (m_aeFieldTypes[i] == TILEDB_BOOL)
                 {
                     auto &v = *(
@@ -1372,9 +1362,7 @@ void OGRTileDBLayer::SetReadBuffers(bool bGrowVariableSizeArrays)
                     m_query->set_data_buffer(pszFieldName, v);
 #endif
                 }
-                else
-#endif
-                    if (m_aeFieldTypes[i] == TILEDB_INT16)
+                else if (m_aeFieldTypes[i] == TILEDB_INT16)
                 {
                     auto &v = *(std::get<std::shared_ptr<std::vector<int16_t>>>(
                         fieldValues));
@@ -1909,16 +1897,13 @@ bool OGRTileDBLayer::SetupQuery(tiledb::QueryCondition *queryCondition)
             {
                 case OFTInteger:
                 {
-#ifdef HAS_TILEDB_BOOL
                     if (m_aeFieldTypes[i] == TILEDB_BOOL)
                     {
                         auto &v = *(std::get<std::shared_ptr<VECTOR_OF_BOOL>>(
                             fieldValues));
                         v.resize(result.second);
                     }
-                    else
-#endif
-                        if (m_aeFieldTypes[i] == TILEDB_INT16)
+                    else if (m_aeFieldTypes[i] == TILEDB_INT16)
                     {
                         auto &v =
                             *(std::get<std::shared_ptr<std::vector<int16_t>>>(
@@ -1955,7 +1940,6 @@ bool OGRTileDBLayer::SetupQuery(tiledb::QueryCondition *queryCondition)
 
                 case OFTIntegerList:
                 {
-#ifdef HAS_TILEDB_BOOL
                     if (m_aeFieldTypes[i] == TILEDB_BOOL)
                     {
                         auto &v = *(std::get<std::shared_ptr<VECTOR_OF_BOOL>>(
@@ -1969,9 +1953,7 @@ bool OGRTileDBLayer::SetupQuery(tiledb::QueryCondition *queryCondition)
                             v.resize(static_cast<size_t>(result.second));
                         }
                     }
-                    else
-#endif
-                        if (m_aeFieldTypes[i] == TILEDB_INT16)
+                    else if (m_aeFieldTypes[i] == TILEDB_INT16)
                     {
                         auto &v =
                             *(std::get<std::shared_ptr<std::vector<int16_t>>>(
@@ -2457,7 +2439,7 @@ std::unique_ptr<tiledb::QueryCondition> OGRTileDBLayer::CreateQueryCondition(
                     CPLAssert(false);
                     return nullptr;
                 }
-#ifdef HAS_TILEDB_BOOL
+
                 if (m_aeFieldTypes[poColumn->field_index] == TILEDB_BOOL)
                 {
                     if (nVal == 0 || nVal == 1)
@@ -2478,9 +2460,7 @@ std::unique_ptr<tiledb::QueryCondition> OGRTileDBLayer::CreateQueryCondition(
                         return nullptr;
                     }
                 }
-                else
-#endif
-                    if (m_aeFieldTypes[poColumn->field_index] == TILEDB_INT16)
+                else if (m_aeFieldTypes[poColumn->field_index] == TILEDB_INT16)
                 {
                     return CreateQueryConditionForIntType<int16_t>(
                         *(m_ctx.get()), poFieldDefn, nVal, tiledb_op,
@@ -3017,7 +2997,6 @@ OGRFeature *OGRTileDBLayer::TranslateCurrentFeature()
         {
             case OFTInteger:
             {
-#ifdef HAS_TILEDB_BOOL
                 if (m_aeFieldTypes[i] == TILEDB_BOOL)
                 {
                     const auto &v = *(
@@ -3025,9 +3004,7 @@ OGRFeature *OGRTileDBLayer::TranslateCurrentFeature()
                     poFeature->SetFieldSameTypeUnsafe(i,
                                                       v[m_nOffsetInResultSet]);
                 }
-                else
-#endif
-                    if (m_aeFieldTypes[i] == TILEDB_INT16)
+                else if (m_aeFieldTypes[i] == TILEDB_INT16)
                 {
                     const auto &v =
                         *(std::get<std::shared_ptr<std::vector<int16_t>>>(
@@ -3068,7 +3045,6 @@ OGRFeature *OGRTileDBLayer::TranslateCurrentFeature()
 
             case OFTIntegerList:
             {
-#ifdef HAS_TILEDB_BOOL
                 if (m_aeFieldTypes[i] == TILEDB_BOOL)
                 {
                     const auto &v = *(
@@ -3085,9 +3061,7 @@ OGRFeature *OGRTileDBLayer::TranslateCurrentFeature()
                     poFeature->SetField(i, static_cast<int>(nEltCount),
                                         tmp.data());
                 }
-                else
-#endif
-                    if (m_aeFieldTypes[i] == TILEDB_INT16)
+                else if (m_aeFieldTypes[i] == TILEDB_INT16)
                 {
                     const auto &v =
                         *(std::get<std::shared_ptr<std::vector<int16_t>>>(
@@ -3586,16 +3560,13 @@ void OGRTileDBLayer::InitializeSchemaAndArray()
                 case OFTInteger:
                 case OFTIntegerList:
                 {
-#ifdef HAS_TILEDB_BOOL
                     if (poFieldDefn->GetSubType() == OFSTBoolean)
                     {
                         CreateAttr(TILEDB_BOOL, eType == OFTIntegerList);
                         aFieldValues.push_back(
                             std::make_shared<VECTOR_OF_BOOL>());
                     }
-                    else
-#endif
-                        if (poFieldDefn->GetSubType() == OFSTInt16)
+                    else if (poFieldDefn->GetSubType() == OFSTInt16)
                     {
                         CreateAttr(TILEDB_INT16, eType == OFTIntegerList);
                         aFieldValues.push_back(
@@ -3971,13 +3942,10 @@ OGRErr OGRTileDBLayer::ICreateFeature(OGRFeature *poFeature)
             {
                 const int nVal =
                     bFieldIsValid ? poFeature->GetFieldAsIntegerUnsafe(i) : 0;
-#ifdef HAS_TILEDB_BOOL
                 if (m_aeFieldTypes[i] == TILEDB_BOOL)
                     std::get<std::shared_ptr<VECTOR_OF_BOOL>>(fieldValues)
                         ->push_back(static_cast<uint8_t>(nVal));
-                else
-#endif
-                    if (m_aeFieldTypes[i] == TILEDB_INT16)
+                else if (m_aeFieldTypes[i] == TILEDB_INT16)
                     std::get<std::shared_ptr<std::vector<int16_t>>>(fieldValues)
                         ->push_back(static_cast<int16_t>(nVal));
                 else if (m_aeFieldTypes[i] == TILEDB_INT32)
@@ -4004,7 +3972,6 @@ OGRErr OGRTileDBLayer::ICreateFeature(OGRFeature *poFeature)
                     poFeature->GetFieldAsIntegerList(i, &nCount);
                 if (anOffsets.empty())
                     anOffsets.push_back(0);
-#ifdef HAS_TILEDB_BOOL
                 if (m_aeFieldTypes[i] == TILEDB_BOOL)
                 {
                     auto &v = *(
@@ -4014,9 +3981,7 @@ OGRErr OGRTileDBLayer::ICreateFeature(OGRFeature *poFeature)
                     anOffsets.push_back(anOffsets.back() +
                                         nCount * sizeof(v[0]));
                 }
-                else
-#endif
-                    if (m_aeFieldTypes[i] == TILEDB_INT16)
+                else if (m_aeFieldTypes[i] == TILEDB_INT16)
                 {
                     auto &v = *(std::get<std::shared_ptr<std::vector<int16_t>>>(
                         fieldValues));
@@ -4332,7 +4297,6 @@ void OGRTileDBLayer::FlushArrays()
                         query.set_offsets_buffer(pszFieldName, anOffsets);
                     }
 
-#ifdef HAS_TILEDB_BOOL
                     if (m_aeFieldTypes[i] == TILEDB_BOOL)
                     {
                         auto &v = *(std::get<std::shared_ptr<VECTOR_OF_BOOL>>(
@@ -4343,9 +4307,7 @@ void OGRTileDBLayer::FlushArrays()
                         query.set_data_buffer(pszFieldName, v);
 #endif
                     }
-                    else
-#endif
-                        if (m_aeFieldTypes[i] == TILEDB_INT16)
+                    else if (m_aeFieldTypes[i] == TILEDB_INT16)
                     {
                         auto &v =
                             *(std::get<std::shared_ptr<std::vector<int16_t>>>(
@@ -4619,12 +4581,9 @@ int OGRTileDBLayer::GetArrowSchema(struct ArrowArrayStream *out_stream,
                 eType == OFTInteger
                     ? out_schema->children[iSchemaChild]->format
                     : out_schema->children[iSchemaChild]->children[0]->format;
-#ifdef HAS_TILEDB_BOOL
             if (m_aeFieldTypes[i] == TILEDB_BOOL)
                 format = "b";
-            else
-#endif
-                if (m_aeFieldTypes[i] == TILEDB_INT16)
+            else if (m_aeFieldTypes[i] == TILEDB_INT16)
                 format = "s";
             else if (m_aeFieldTypes[i] == TILEDB_INT32)
                 format = "i";
@@ -5319,14 +5278,11 @@ int OGRTileDBLayer::GetNextArrowArray(struct ArrowArrayStream *stream,
             {
                 case OFTInteger:
                 {
-#ifdef HAS_TILEDB_BOOL
                     if (m_aeFieldTypes[i] == TILEDB_BOOL)
                     {
                         FillBoolArray(psChild, i, abyValidityFromFilters);
                     }
-                    else
-#endif
-                        if (m_aeFieldTypes[i] == TILEDB_INT16)
+                    else if (m_aeFieldTypes[i] == TILEDB_INT16)
                     {
                         FillPrimitiveArray<int16_t>(psChild, i,
                                                     abyValidityFromFilters);
@@ -5355,14 +5311,11 @@ int OGRTileDBLayer::GetNextArrowArray(struct ArrowArrayStream *stream,
 
                 case OFTIntegerList:
                 {
-#ifdef HAS_TILEDB_BOOL
                     if (m_aeFieldTypes[i] == TILEDB_BOOL)
                     {
                         FillBoolListArray(psChild, i, abyValidityFromFilters);
                     }
-                    else
-#endif
-                        if (m_aeFieldTypes[i] == TILEDB_INT16)
+                    else if (m_aeFieldTypes[i] == TILEDB_INT16)
                     {
                         FillPrimitiveListArray<int16_t>(psChild, i,
                                                         abyValidityFromFilters);

From 097431c49f1505cfb9880e061e1c61316167f146 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Apr 2024 19:51:34 +0200
Subject: [PATCH 08/11] TileDB: cleanups related to requiring TileDB >= 2.11

---
 autotest/ogr/ogr_tiledb.py        | 130 +++++++++++++-----------------
 frmts/tiledb/include_tiledb.h     |   5 --
 frmts/tiledb/tiledbdrivercore.cpp |   4 -
 frmts/tiledb/tiledbsparse.cpp     |   2 -
 4 files changed, 58 insertions(+), 83 deletions(-)

diff --git a/autotest/ogr/ogr_tiledb.py b/autotest/ogr/ogr_tiledb.py
index ae41ed3fb492..c88bef3ffb9b 100644
--- a/autotest/ogr/ogr_tiledb.py
+++ b/autotest/ogr/ogr_tiledb.py
@@ -578,38 +578,33 @@ def test_ogr_tiledb_basic(nullable, batch_size):
     assert set(f.GetFID() for f in lyr) == set([1])
 
     # Test OR
-    has_working_or_filter = (
-        gdal.GetDriverByName("TileDB").GetMetadataItem("HAS_TILEDB_WORKING_OR_FILTER")
-        != "NO"
-    )
-    if has_working_or_filter:
-        lyr.SetAttributeFilter("intfield = 321 OR intfield = -123456789")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
-        assert set(f.GetFID() for f in lyr) == set([1])
+    lyr.SetAttributeFilter("intfield = 321 OR intfield = -123456789")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
+    assert set(f.GetFID() for f in lyr) == set([1])
 
-        lyr.SetAttributeFilter("intfield = -123456789 OR intfield = 321")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
-        assert set(f.GetFID() for f in lyr) == set([1])
+    lyr.SetAttributeFilter("intfield = -123456789 OR intfield = 321")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
+    assert set(f.GetFID() for f in lyr) == set([1])
 
-        lyr.SetAttributeFilter("intfield = 321 OR intfield = 123")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
-        assert set(f.GetFID() for f in lyr) == set([])
+    lyr.SetAttributeFilter("intfield = 321 OR intfield = 123")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
+    assert set(f.GetFID() for f in lyr) == set([])
 
-        lyr.SetAttributeFilter("(1 = 1) OR intfield = -123456789")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "NONE"
-        assert set(f.GetFID() for f in lyr) == set([1, 2, 3])
+    lyr.SetAttributeFilter("(1 = 1) OR intfield = -123456789")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "NONE"
+    assert set(f.GetFID() for f in lyr) == set([1, 2, 3])
 
-        lyr.SetAttributeFilter("(1 = 0) OR intfield = -123456789")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "NONE"
-        assert set(f.GetFID() for f in lyr) == set([1])
+    lyr.SetAttributeFilter("(1 = 0) OR intfield = -123456789")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "NONE"
+    assert set(f.GetFID() for f in lyr) == set([1])
 
-        lyr.SetAttributeFilter("intfield = -123456789 OR (1 = 1)")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "NONE"
-        assert set(f.GetFID() for f in lyr) == set([1, 2, 3])
+    lyr.SetAttributeFilter("intfield = -123456789 OR (1 = 1)")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "NONE"
+    assert set(f.GetFID() for f in lyr) == set([1, 2, 3])
 
-        lyr.SetAttributeFilter("intfield = -123456789 OR (1 = 0)")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "NONE"
-        assert set(f.GetFID() for f in lyr) == set([1])
+    lyr.SetAttributeFilter("intfield = -123456789 OR (1 = 0)")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "NONE"
+    assert set(f.GetFID() for f in lyr) == set([1])
 
     # Test NOT
     lyr.SetAttributeFilter("NOT (intfield = -123456789)")
@@ -617,14 +612,13 @@ def test_ogr_tiledb_basic(nullable, batch_size):
     assert set(f.GetFID() for f in lyr) == (set([3]) if nullable else set([2, 3]))
 
     # Test IN
-    if has_working_or_filter:
-        lyr.SetAttributeFilter("intfield IN (321, -123456789)")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
-        assert set(f.GetFID() for f in lyr) == set([1])
+    lyr.SetAttributeFilter("intfield IN (321, -123456789)")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
+    assert set(f.GetFID() for f in lyr) == set([1])
 
-        lyr.SetAttributeFilter("intfield IN (-123456789, 321)")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
-        assert set(f.GetFID() for f in lyr) == set([1])
+    lyr.SetAttributeFilter("intfield IN (-123456789, 321)")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
+    assert set(f.GetFID() for f in lyr) == set([1])
 
     # Test IS NULL / IS NOT NULL
     lyr.SetAttributeFilter("strfield IS NULL")
@@ -688,54 +682,46 @@ def test_ogr_tiledb_basic(nullable, batch_size):
     assert set(f.GetFID() for f in lyr) == set()
 
     # Test IS NULL and OR (for always_false situations)
-    if has_working_or_filter:
-        lyr.SetAttributeFilter("intfield IS NULL OR intfieldextra <> 4")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
-        assert set(f.GetFID() for f in lyr) == set([1, 2, 3])
+    lyr.SetAttributeFilter("intfield IS NULL OR intfieldextra <> 4")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
+    assert set(f.GetFID() for f in lyr) == set([1, 2, 3])
 
-        lyr.SetAttributeFilter("intfield IS NULL OR intfield IS NULL")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
-        assert set(f.GetFID() for f in lyr) == (set([2]) if nullable else set())
+    lyr.SetAttributeFilter("intfield IS NULL OR intfield IS NULL")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
+    assert set(f.GetFID() for f in lyr) == (set([2]) if nullable else set())
 
-        lyr.SetAttributeFilter("intfieldextra <> 4 OR intfield IS NULL")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
-        assert set(f.GetFID() for f in lyr) == set([1, 2, 3])
+    lyr.SetAttributeFilter("intfieldextra <> 4 OR intfield IS NULL")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
+    assert set(f.GetFID() for f in lyr) == set([1, 2, 3])
 
-        lyr.SetAttributeFilter("intfield IS NULL OR intfieldextra = 4")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
-        assert set(f.GetFID() for f in lyr) == (set([2]) if nullable else set())
+    lyr.SetAttributeFilter("intfield IS NULL OR intfieldextra = 4")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
+    assert set(f.GetFID() for f in lyr) == (set([2]) if nullable else set())
 
-        lyr.SetAttributeFilter("intfieldextra = 4 OR intfield IS NULL")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
-        assert set(f.GetFID() for f in lyr) == (set([2]) if nullable else set())
+    lyr.SetAttributeFilter("intfieldextra = 4 OR intfield IS NULL")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
+    assert set(f.GetFID() for f in lyr) == (set([2]) if nullable else set())
 
     # Test IS NOT NULL and OR (for always_true situations)
-    if has_working_or_filter:
-        lyr.SetAttributeFilter("intfield IS NOT NULL OR intfieldextra <> 4")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
-        assert set(f.GetFID() for f in lyr) == set([1, 2, 3])
-
-        lyr.SetAttributeFilter("intfield IS NOT NULL OR intfield IS NOT NULL")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
-        assert set(f.GetFID() for f in lyr) == (
-            set([1, 3]) if nullable else set([1, 2, 3])
-        )
+    lyr.SetAttributeFilter("intfield IS NOT NULL OR intfieldextra <> 4")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
+    assert set(f.GetFID() for f in lyr) == set([1, 2, 3])
+
+    lyr.SetAttributeFilter("intfield IS NOT NULL OR intfield IS NOT NULL")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
+    assert set(f.GetFID() for f in lyr) == (set([1, 3]) if nullable else set([1, 2, 3]))
 
-        lyr.SetAttributeFilter("intfieldextra <> 4 OR intfield IS NOT NULL")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
-        assert set(f.GetFID() for f in lyr) == set([1, 2, 3])
+    lyr.SetAttributeFilter("intfieldextra <> 4 OR intfield IS NOT NULL")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
+    assert set(f.GetFID() for f in lyr) == set([1, 2, 3])
 
-        lyr.SetAttributeFilter("intfield IS NOT NULL OR intfieldextra = 4")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
-        assert set(f.GetFID() for f in lyr) == (
-            set([1, 3]) if nullable else set([1, 2, 3])
-        )
+    lyr.SetAttributeFilter("intfield IS NOT NULL OR intfieldextra = 4")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
+    assert set(f.GetFID() for f in lyr) == (set([1, 3]) if nullable else set([1, 2, 3]))
 
-        lyr.SetAttributeFilter("intfieldextra = 4 OR intfield IS NOT NULL")
-        assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
-        assert set(f.GetFID() for f in lyr) == (
-            set([1, 3]) if nullable else set([1, 2, 3])
-        )
+    lyr.SetAttributeFilter("intfieldextra = 4 OR intfield IS NOT NULL")
+    assert lyr.GetMetadataItem("ATTRIBUTE_FILTER_TRANSLATION", "_DEBUG_") == "WHOLE"
+    assert set(f.GetFID() for f in lyr) == (set([1, 3]) if nullable else set([1, 2, 3]))
 
     tiledb_md = json.loads(lyr.GetMetadata_List("json:TILEDB")[0])
     md = tiledb_md["array"]["metadata"]
diff --git a/frmts/tiledb/include_tiledb.h b/frmts/tiledb/include_tiledb.h
index ce720b7cc1a4..b2a0822d146c 100644
--- a/frmts/tiledb/include_tiledb.h
+++ b/frmts/tiledb/include_tiledb.h
@@ -42,11 +42,6 @@
 #include "tiledb/tiledb_experimental"
 #endif
 
-#if TILEDB_VERSION_MAJOR > 2 ||                                                \
-    (TILEDB_VERSION_MAJOR == 2 && TILEDB_VERSION_MINOR >= 11)
-#define HAS_TILEDB_WORKING_OR_FILTER
-#endif
-
 #if TILEDB_VERSION_MAJOR > 2 ||                                                \
     (TILEDB_VERSION_MAJOR == 2 && TILEDB_VERSION_MINOR >= 14)
 #define HAS_TILEDB_WORKING_UTF8_STRING_FILTER
diff --git a/frmts/tiledb/tiledbdrivercore.cpp b/frmts/tiledb/tiledbdrivercore.cpp
index 4c5fddddc512..35a0e83a05e0 100644
--- a/frmts/tiledb/tiledbdrivercore.cpp
+++ b/frmts/tiledb/tiledbdrivercore.cpp
@@ -286,10 +286,6 @@ void TileDBDriverSetCommonMetadata(GDALDriver *poDriver)
     poDriver->SetMetadataItem("HAS_TILEDB_WORKING_UTF8_STRING_FILTER", "NO");
 #endif
 
-#if !defined(HAS_TILEDB_WORKING_OR_FILTER)
-    poDriver->SetMetadataItem("HAS_TILEDB_WORKING_OR_FILTER", "NO");
-#endif
-
     poDriver->pfnIdentify = TileDBDriverIdentifySimplified;
     poDriver->SetMetadataItem(GDAL_DCAP_OPEN, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_CREATE, "YES");
diff --git a/frmts/tiledb/tiledbsparse.cpp b/frmts/tiledb/tiledbsparse.cpp
index 823dffd20f35..a73c7ec86ea9 100644
--- a/frmts/tiledb/tiledbsparse.cpp
+++ b/frmts/tiledb/tiledbsparse.cpp
@@ -2679,7 +2679,6 @@ OGRTileDBLayer::CreateQueryCondition(const swq_expr_node *poNode,
         return right;
     }
 
-#ifdef HAS_TILEDB_WORKING_OR_FILTER
     // A OR B
     else if (poNode->eNodeType == SNT_OPERATION &&
              poNode->nOperation == SWQ_OR && poNode->nSubExprCount == 2)
@@ -2761,7 +2760,6 @@ OGRTileDBLayer::CreateQueryCondition(const swq_expr_node *poNode,
             bAlwaysFalse = true;
         return cond;
     }
-#endif
 
     // field_name =/<>/</>/<=/>= constant (or the reverse)
     else if (poNode->eNodeType == SNT_OPERATION &&

From bdd2cbfa4df20a0f1f4d1b1e81553e4c67cb4741 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Apr 2024 19:53:27 +0200
Subject: [PATCH 09/11] TileDB: cleanups related to requiring TileDB >= 2.14

---
 frmts/tiledb/include_tiledb.h     |  5 -----
 frmts/tiledb/tiledbdrivercore.cpp |  8 --------
 frmts/tiledb/tiledbheaders.h      |  4 ----
 frmts/tiledb/tiledbsparse.cpp     | 21 ---------------------
 4 files changed, 38 deletions(-)

diff --git a/frmts/tiledb/include_tiledb.h b/frmts/tiledb/include_tiledb.h
index b2a0822d146c..d841f26c28b8 100644
--- a/frmts/tiledb/include_tiledb.h
+++ b/frmts/tiledb/include_tiledb.h
@@ -42,11 +42,6 @@
 #include "tiledb/tiledb_experimental"
 #endif
 
-#if TILEDB_VERSION_MAJOR > 2 ||                                                \
-    (TILEDB_VERSION_MAJOR == 2 && TILEDB_VERSION_MINOR >= 14)
-#define HAS_TILEDB_WORKING_UTF8_STRING_FILTER
-#endif
-
 #if TILEDB_VERSION_MAJOR > 2 ||                                                \
     (TILEDB_VERSION_MAJOR == 2 && TILEDB_VERSION_MINOR >= 15)
 #define HAS_TILEDB_DIMENSION_LABEL
diff --git a/frmts/tiledb/tiledbdrivercore.cpp b/frmts/tiledb/tiledbdrivercore.cpp
index 35a0e83a05e0..180f040047e8 100644
--- a/frmts/tiledb/tiledbdrivercore.cpp
+++ b/frmts/tiledb/tiledbdrivercore.cpp
@@ -218,11 +218,7 @@ void TileDBDriverSetCommonMetadata(GDALDriver *poDriver)
         "array at this timestamp, the timestamp should be > 0'/>"
         "   <Option name='TILEDB_STRING_TYPE' type='string-select' "
         "description='Which TileDB type to create string attributes' "
-#ifdef HAS_TILEDB_WORKING_UTF8_STRING_FILTER
        "default='UTF8'"
-#else
-       "default='ASCII'"
-#endif
         ">"
         "       <Value>UTF8</Value>"
         "       <Value>ASCII</Value>"
@@ -282,10 +278,6 @@ void TileDBDriverSetCommonMetadata(GDALDriver *poDriver)
         "</MultiDimArrayCreationOptionList>");
 #endif
 
-#if !defined(HAS_TILEDB_WORKING_UTF8_STRING_FILTER)
-    poDriver->SetMetadataItem("HAS_TILEDB_WORKING_UTF8_STRING_FILTER", "NO");
-#endif
-
     poDriver->pfnIdentify = TileDBDriverIdentifySimplified;
     poDriver->SetMetadataItem(GDAL_DCAP_OPEN, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_CREATE, "YES");
diff --git a/frmts/tiledb/tiledbheaders.h b/frmts/tiledb/tiledbheaders.h
index ccb8ecbbb08f..0068ed19e292 100644
--- a/frmts/tiledb/tiledbheaders.h
+++ b/frmts/tiledb/tiledbheaders.h
@@ -333,11 +333,7 @@ class OGRTileDBLayer final : public OGRLayer,
     uint64_t m_nRowCountInResultSet = 0;
     int m_nUseOptimizedAttributeFilter = -1;  // uninitialized
 
-#ifdef HAS_TILEDB_WORKING_UTF8_STRING_FILTER
     tiledb_datatype_t m_eTileDBStringType = TILEDB_STRING_UTF8;
-#else
-    tiledb_datatype_t m_eTileDBStringType = TILEDB_STRING_ASCII;
-#endif
 
     std::string m_osXDim = "_X";
     std::string m_osYDim = "_Y";
diff --git a/frmts/tiledb/tiledbsparse.cpp b/frmts/tiledb/tiledbsparse.cpp
index a73c7ec86ea9..8933c54a6578 100644
--- a/frmts/tiledb/tiledbsparse.cpp
+++ b/frmts/tiledb/tiledbsparse.cpp
@@ -2540,11 +2540,6 @@ std::unique_ptr<tiledb::QueryCondition> OGRTileDBLayer::CreateQueryCondition(
                     CPLAssert(false);
                     return nullptr;
                 }
-#if !defined(HAS_TILEDB_WORKING_UTF8_STRING_FILTER)
-                if (m_schema->attribute(poFieldDefn->GetNameRef()).type() !=
-                    TILEDB_STRING_ASCII)
-                    return nullptr;
-#endif
                 return std::make_unique<tiledb::QueryCondition>(
                     tiledb::QueryCondition::create(
                         *(m_ctx.get()), poFieldDefn->GetNameRef(),
@@ -2781,14 +2776,6 @@ OGRTileDBLayer::CreateQueryCondition(const swq_expr_node *poNode,
     {
         const OGRFieldDefn *poFieldDefn =
             m_poFeatureDefn->GetFieldDefn(poNode->papoSubExpr[0]->field_index);
-#if !defined(HAS_TILEDB_WORKING_UTF8_STRING_FILTER)
-        if (poFieldDefn->GetType() == OFTString &&
-            m_schema->attribute(poFieldDefn->GetNameRef()).type() !=
-                TILEDB_STRING_ASCII)
-        {
-            return nullptr;
-        }
-#endif
         if (!poFieldDefn->IsNullable())
         {
             bAlwaysFalse = true;
@@ -2810,14 +2797,6 @@ OGRTileDBLayer::CreateQueryCondition(const swq_expr_node *poNode,
     {
         const OGRFieldDefn *poFieldDefn = m_poFeatureDefn->GetFieldDefn(
             poNode->papoSubExpr[0]->papoSubExpr[0]->field_index);
-#if !defined(HAS_TILEDB_WORKING_UTF8_STRING_FILTER)
-        if (poFieldDefn->GetType() == OFTString &&
-            m_schema->attribute(poFieldDefn->GetNameRef()).type() !=
-                TILEDB_STRING_ASCII)
-        {
-            return nullptr;
-        }
-#endif
         if (!poFieldDefn->IsNullable())
         {
             bAlwaysTrue = true;

From bcf261528e9b94fb928aa548f5e1c524281b171f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Apr 2024 00:43:08 +0200
Subject: [PATCH 10/11] TileDB: make cppcheck happy

---
 frmts/tiledb/tiledbmultidim.h        | 6 ++++--
 frmts/tiledb/tiledbmultidimarray.cpp | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/frmts/tiledb/tiledbmultidim.h b/frmts/tiledb/tiledbmultidim.h
index 65af731fb66b..604e93bdcf52 100644
--- a/frmts/tiledb/tiledbmultidim.h
+++ b/frmts/tiledb/tiledbmultidim.h
@@ -596,7 +596,8 @@ class TileDBArrayGroup final : public GDALGroup
     std::vector<std::shared_ptr<GDALMDArray>> m_apoArrays;
 
   public:
-    TileDBArrayGroup(const std::vector<std::shared_ptr<GDALMDArray>> &apoArrays)
+    explicit TileDBArrayGroup(
+        const std::vector<std::shared_ptr<GDALMDArray>> &apoArrays)
         : GDALGroup(std::string(), "/"), m_apoArrays(apoArrays)
     {
     }
@@ -624,7 +625,8 @@ class TileDBMultiDimDataset final : public GDALDataset
     std::shared_ptr<GDALGroup> m_poRG{};
 
   public:
-    TileDBMultiDimDataset(const std::shared_ptr<GDALGroup> &poRG) : m_poRG(poRG)
+    explicit TileDBMultiDimDataset(const std::shared_ptr<GDALGroup> &poRG)
+        : m_poRG(poRG)
     {
     }
 
diff --git a/frmts/tiledb/tiledbmultidimarray.cpp b/frmts/tiledb/tiledbmultidimarray.cpp
index 09649188d551..a1b92634f349 100644
--- a/frmts/tiledb/tiledbmultidimarray.cpp
+++ b/frmts/tiledb/tiledbmultidimarray.cpp
@@ -1408,9 +1408,10 @@ std::shared_ptr<TileDBArray> TileDBArray::CreateOnDisk(
     {
         const auto osSanitizedName =
             TileDBSharedResource::SanitizeNameForPath(osName);
-        if (osSanitizedName.empty() || osName.find("./") == 0 ||
-            osName.find("../") == 0 || osName.find(".\\") == 0 ||
-            osName.find("..\\") == 0)
+        if (osSanitizedName.empty() || STARTS_WITH(osName.c_str(), "./") ||
+            STARTS_WITH(osName.c_str(), "../") ||
+            STARTS_WITH(osName.c_str(), ".\\") ||
+            STARTS_WITH(osName.c_str(), "..\\"))
         {
             CPLError(CE_Failure, CPLE_AppDefined, "Invalid array name");
             return nullptr;

From 848608b4dc2d8c12f83839c422dc5a8da3c481de Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Apr 2024 19:56:38 +0200
Subject: [PATCH 11/11] TileDB: cleanups related to requiring TileDB >= 2.15

---
 autotest/gdrivers/tiledb_multidim.py           | 13 +------------
 frmts/tiledb/include_tiledb.h                  |  9 ---------
 frmts/tiledb/tiledbcommon.cpp                  | 13 +------------
 frmts/tiledb/tiledbdrivercore.cpp              |  2 --
 frmts/tiledb/tiledbheaders.h                   |  3 +--
 frmts/tiledb/tiledbmultidim.cpp                |  4 ----
 frmts/tiledb/tiledbmultidim.h                  |  4 ----
 frmts/tiledb/tiledbmultidimarray.cpp           |  4 ----
 frmts/tiledb/tiledbmultidimattribute.cpp       |  4 ----
 frmts/tiledb/tiledbmultidimattributeholder.cpp |  4 ----
 frmts/tiledb/tiledbmultidimgroup.cpp           |  4 ----
 11 files changed, 3 insertions(+), 61 deletions(-)

diff --git a/autotest/gdrivers/tiledb_multidim.py b/autotest/gdrivers/tiledb_multidim.py
index 774a4c29f299..6e163a05d4e2 100755
--- a/autotest/gdrivers/tiledb_multidim.py
+++ b/autotest/gdrivers/tiledb_multidim.py
@@ -38,18 +38,7 @@
 
 from osgeo import gdal, osr
 
-
-def has_tiledb_multidim():
-    drv = gdal.GetDriverByName("TileDB")
-    if drv is None:
-        return False
-    return drv.GetMetadataItem(gdal.DCAP_CREATE_MULTIDIMENSIONAL) == "YES"
-
-
-pytestmark = [
-    pytest.mark.require_driver("TileDB"),
-    pytest.mark.skipif(not has_tiledb_multidim(), reason="TileDB >= 2.15 required"),
-]
+pytestmark = pytest.mark.require_driver("TileDB")
 
 
 def test_tiledb_multidim_basic():
diff --git a/frmts/tiledb/include_tiledb.h b/frmts/tiledb/include_tiledb.h
index d841f26c28b8..53efb201735e 100644
--- a/frmts/tiledb/include_tiledb.h
+++ b/frmts/tiledb/include_tiledb.h
@@ -42,15 +42,6 @@
 #include "tiledb/tiledb_experimental"
 #endif
 
-#if TILEDB_VERSION_MAJOR > 2 ||                                                \
-    (TILEDB_VERSION_MAJOR == 2 && TILEDB_VERSION_MINOR >= 15)
-#define HAS_TILEDB_DIMENSION_LABEL
-#endif
-
-#ifdef HAS_TILEDB_DIMENSION_LABEL
-#define HAS_TILEDB_MULTIDIM
-#endif
-
 #if TILEDB_VERSION_MAJOR > 2 ||                                                \
     (TILEDB_VERSION_MAJOR == 2 && TILEDB_VERSION_MINOR >= 21)
 #define HAS_TILEDB_GEOM_WKB_WKT
diff --git a/frmts/tiledb/tiledbcommon.cpp b/frmts/tiledb/tiledbcommon.cpp
index eb38195c9424..010ab1345f13 100644
--- a/frmts/tiledb/tiledbcommon.cpp
+++ b/frmts/tiledb/tiledbcommon.cpp
@@ -156,20 +156,17 @@ int TileDBDataset::Identify(GDALOpenInfo *poOpenInfo)
                     eType == tiledb::Object::Type::Group)
                     return true;
             }
-#ifdef HAS_TILEDB_MULTIDIM
+
             if ((poOpenInfo->nOpenFlags & GDAL_OF_MULTIDIM_RASTER) != 0)
             {
                 if (eType == tiledb::Object::Type::Array ||
                     eType == tiledb::Object::Type::Group)
                     return true;
             }
-#endif
             if ((poOpenInfo->nOpenFlags & GDAL_OF_RASTER) != 0)
             {
-#ifdef HAS_TILEDB_MULTIDIM
                 if (eType == tiledb::Object::Type::Group)
                     return GDAL_IDENTIFY_UNKNOWN;
-#endif
                 return eType == tiledb::Object::Type::Array;
             }
         }
@@ -231,12 +228,10 @@ GDALDataset *TileDBDataset::Open(GDALOpenInfo *poOpenInfo)
         }
         else
         {
-#ifdef HAS_TILEDB_MULTIDIM
             if ((poOpenInfo->nOpenFlags & GDAL_OF_MULTIDIM_RASTER) != 0)
             {
                 return TileDBDataset::OpenMultiDimensional(poOpenInfo);
             }
-#endif
 
             const char *pszConfig = CSLFetchNameValue(
                 poOpenInfo->papszOpenOptions, "TILEDB_CONFIG");
@@ -262,7 +257,6 @@ GDALDataset *TileDBDataset::Open(GDALOpenInfo *poOpenInfo)
             {
                 return OGRTileDBDataset::Open(poOpenInfo, eType);
             }
-#ifdef HAS_TILEDB_MULTIDIM
             else if ((poOpenInfo->nOpenFlags & GDAL_OF_RASTER) != 0 &&
                      eType == tiledb::Object::Type::Group)
             {
@@ -311,7 +305,6 @@ GDALDataset *TileDBDataset::Open(GDALOpenInfo *poOpenInfo)
                 }
                 return nullptr;
             }
-#endif
 
             tiledb::ArraySchema schema(oCtx, osPath);
 
@@ -364,7 +357,6 @@ GDALDataset *TileDBDataset::CreateCopy(const char *pszFilename,
                                        void *pProgressData)
 
 {
-#ifdef HAS_TILEDB_MULTIDIM
     if (poSrcDS->GetRootGroup())
     {
         auto poDrv = GDALDriver::FromHandle(GDALGetDriverByName("TileDB"));
@@ -375,7 +367,6 @@ GDALDataset *TileDBDataset::CreateCopy(const char *pszFilename,
                                             pProgressData);
         }
     }
-#endif
 
     try
     {
@@ -413,9 +404,7 @@ void GDALRegister_TileDB()
     poDriver->pfnCreate = TileDBDataset::Create;
     poDriver->pfnCreateCopy = TileDBDataset::CreateCopy;
     poDriver->pfnDelete = TileDBDataset::Delete;
-#ifdef HAS_TILEDB_MULTIDIM
     poDriver->pfnCreateMultiDimensional = TileDBDataset::CreateMultiDimensional;
-#endif
 
     GetGDALDriverManager()->RegisterDriver(poDriver);
 }
diff --git a/frmts/tiledb/tiledbdrivercore.cpp b/frmts/tiledb/tiledbdrivercore.cpp
index 180f040047e8..9d85d2ea5ec6 100644
--- a/frmts/tiledb/tiledbdrivercore.cpp
+++ b/frmts/tiledb/tiledbdrivercore.cpp
@@ -228,7 +228,6 @@ void TileDBDriverSetCommonMetadata(GDALDriver *poDriver)
         "</LayerCreationOptionList>");
     // clang-format on
 
-#ifdef HAS_TILEDB_MULTIDIM
     poDriver->SetMetadataItem(GDAL_DCAP_MULTIDIM_RASTER, "YES");
     poDriver->SetMetadataItem(GDAL_DCAP_CREATE_MULTIDIMENSIONAL, "YES");
 
@@ -276,7 +275,6 @@ void TileDBDriverSetCommonMetadata(GDALDriver *poDriver)
         "description='Whether the array should be only in-memory. Useful to "
         "create an indexing variable that is serialized as a dimension label'/>"
         "</MultiDimArrayCreationOptionList>");
-#endif
 
     poDriver->pfnIdentify = TileDBDriverIdentifySimplified;
     poDriver->SetMetadataItem(GDAL_DCAP_OPEN, "YES");
diff --git a/frmts/tiledb/tiledbheaders.h b/frmts/tiledb/tiledbheaders.h
index 0068ed19e292..536c6a74c7c7 100644
--- a/frmts/tiledb/tiledbheaders.h
+++ b/frmts/tiledb/tiledbheaders.h
@@ -190,13 +190,12 @@ class TileDBDataset : public GDALPamDataset
                                    char **papszOptions,
                                    GDALProgressFunc pfnProgress,
                                    void *pProgressData);
-#ifdef HAS_TILEDB_MULTIDIM
+
     static GDALDataset *OpenMultiDimensional(GDALOpenInfo *);
     static GDALDataset *
     CreateMultiDimensional(const char *pszFilename,
                            CSLConstList papszRootGroupOptions,
                            CSLConstList papszOptions);
-#endif
 };
 
 /************************************************************************/
diff --git a/frmts/tiledb/tiledbmultidim.cpp b/frmts/tiledb/tiledbmultidim.cpp
index b95d939963b5..b2841eed50d6 100644
--- a/frmts/tiledb/tiledbmultidim.cpp
+++ b/frmts/tiledb/tiledbmultidim.cpp
@@ -28,8 +28,6 @@
 
 #include "tiledbmultidim.h"
 
-#ifdef HAS_TILEDB_MULTIDIM
-
 /************************************************************************/
 /*              TileDBSingleArrayGroup::SanitizeNameForPath()           */
 /************************************************************************/
@@ -213,5 +211,3 @@ TileDBDataset::CreateMultiDimensional(const char *pszFilename,
     poDS->SetDescription(pszFilename);
     return poDS;
 }
-
-#endif  // HAS_TILEDB_MULTIDIM
diff --git a/frmts/tiledb/tiledbmultidim.h b/frmts/tiledb/tiledbmultidim.h
index 604e93bdcf52..391ba1880d22 100644
--- a/frmts/tiledb/tiledbmultidim.h
+++ b/frmts/tiledb/tiledbmultidim.h
@@ -31,8 +31,6 @@
 
 #include "tiledbheaders.h"
 
-#ifdef HAS_TILEDB_MULTIDIM
-
 constexpr const char *CRS_ATTRIBUTE_NAME = "_CRS";
 constexpr const char *UNIT_ATTRIBUTE_NAME = "_UNIT";
 constexpr const char *DIM_TYPE_ATTRIBUTE_NAME = "_DIM_TYPE";
@@ -636,6 +634,4 @@ class TileDBMultiDimDataset final : public GDALDataset
     }
 };
 
-#endif  // HAS_TILEDB_MULTIDIM
-
 #endif  // TILEDBMULTIDIM_H_INCLUDED
diff --git a/frmts/tiledb/tiledbmultidimarray.cpp b/frmts/tiledb/tiledbmultidimarray.cpp
index a1b92634f349..2d3d5f6ab847 100644
--- a/frmts/tiledb/tiledbmultidimarray.cpp
+++ b/frmts/tiledb/tiledbmultidimarray.cpp
@@ -31,8 +31,6 @@
 #include <algorithm>
 #include <limits>
 
-#ifdef HAS_TILEDB_MULTIDIM
-
 /************************************************************************/
 /*                   TileDBArray::TileDBArray()                         */
 /************************************************************************/
@@ -1576,5 +1574,3 @@ CSLConstList TileDBArray::GetStructuralInfo() const
 {
     return m_aosStructuralInfo.List();
 }
-
-#endif  // HAS_TILEDB_MULTIDIM
diff --git a/frmts/tiledb/tiledbmultidimattribute.cpp b/frmts/tiledb/tiledbmultidimattribute.cpp
index d111ce62ddb4..f84125ab6e3e 100644
--- a/frmts/tiledb/tiledbmultidimattribute.cpp
+++ b/frmts/tiledb/tiledbmultidimattribute.cpp
@@ -29,8 +29,6 @@
 #include "tiledbmultidim.h"
 #include "memmultidim.h"
 
-#ifdef HAS_TILEDB_MULTIDIM
-
 /************************************************************************/
 /*                TileDBAttribute::TileDBAttribute()                    */
 /************************************************************************/
@@ -199,5 +197,3 @@ bool TileDBAttribute::IWrite(const GUInt64 *arrayStartIdx, const size_t *count,
     return poParent->PutMetadata(m_osName, tiledb_dt, nValues,
                                  oRawResult.data());
 }
-
-#endif  // HAS_TILEDB_MULTIDIM
diff --git a/frmts/tiledb/tiledbmultidimattributeholder.cpp b/frmts/tiledb/tiledbmultidimattributeholder.cpp
index 2760f22ff50c..71dfbbcafe96 100644
--- a/frmts/tiledb/tiledbmultidimattributeholder.cpp
+++ b/frmts/tiledb/tiledbmultidimattributeholder.cpp
@@ -28,8 +28,6 @@
 
 #include "tiledbmultidim.h"
 
-#ifdef HAS_TILEDB_MULTIDIM
-
 /************************************************************************/
 /*           TileDBAttributeHolder::~TileDBAttributeHolder()            */
 /************************************************************************/
@@ -300,5 +298,3 @@ bool TileDBAttributeHolder::PutMetadata(const std::string &key,
         return false;
     }
 }
-
-#endif
diff --git a/frmts/tiledb/tiledbmultidimgroup.cpp b/frmts/tiledb/tiledbmultidimgroup.cpp
index aca83e3963a8..00cca02fe46d 100644
--- a/frmts/tiledb/tiledbmultidimgroup.cpp
+++ b/frmts/tiledb/tiledbmultidimgroup.cpp
@@ -28,8 +28,6 @@
 
 #include "tiledbmultidim.h"
 
-#ifdef HAS_TILEDB_MULTIDIM
-
 #include "memmultidim.h"
 
 /************************************************************************/
@@ -574,5 +572,3 @@ bool TileDBGroup::DeleteAttribute(const std::string &osName,
 {
     return DeleteAttributeImpl(osName, papszOptions);
 }
-
-#endif  // HAS_TILEDB_MULTIDIM