GEOMESA-3565 FSDS - Standardize query threads parameter

docs/user/filesystem/usage.rst

@@ -18,11 +18,11 @@ Parameter                          Type   Description
 ``fs.config.file``                 String The name of a file containing storage configuration properties, in Java properties
                                           format. See :ref:`fsds_config_props` and :ref:`fsds_metadata` for available properties.
                                           Environment variables in property values will be interpolated using ``${...}`` syntax
-``fs.encoding``                    String The file storage to use, defaults to ``parquet``. Provided implementations are
+``fs.encoding``                    String The file format to use, defaults to ``parquet``. Provided implementations are
                                           ``parquet`` and ``converter``
-``fs.read-threads``                Int    The number of threads used for each query
 ``fs.writer.partition.timeout``    String Timeout for closing a partition file after write, e.g. '60 seconds'. This is to
                                           prevent too many open files during large write operations
+``geomesa.query.threads``          Int    The number of threads used for each query, defaults to ``4``
 ``geomesa.query.timeout``          String The max time a query will be allowed to run before being killed. The
                                           timeout is specified as a duration, e.g. ``1 minute`` or ``60 seconds``
 ``geomesa.security.auths``         String  Comma-delimited superset of authorizations that will be used for queries. See

geomesa-fs/geomesa-fs-datastore/src/main/scala/org/locationtech/geomesa/fs/data/FileSystemDataStoreFactory.scala

@@ -100,7 +100,7 @@ class FileSystemDataStoreFactory extends DataStoreFactorySpi with LazyLogging {
     // However, if you are doing lots of filtering it appears that bumping the threads up high
     // can be very useful. Seems possibly numcores/2 might is a good setting (which is a standard idea)
 
-    val readThreads = ReadThreadsParam.lookup(params)
+    val readThreads = QueryThreadsParam.lookup(params)
     val writeTimeout = WriteTimeoutParam.lookup(params)
     val queryTimeout = QueryTimeoutParam.lookupOpt(params).filter(_.isFinite)
 
@@ -147,8 +147,8 @@ object FileSystemDataStoreFactory extends GeoMesaDataStoreInfo {
       org.locationtech.geomesa.fs.data.FileSystemDataStoreParams.MetadataTypeParam,
       org.locationtech.geomesa.fs.data.FileSystemDataStoreParams.ConfigParam,
       org.locationtech.geomesa.fs.data.FileSystemDataStoreParams.ConfigFileParam,
-      org.locationtech.geomesa.fs.data.FileSystemDataStoreParams.ReadThreadsParam,
       org.locationtech.geomesa.fs.data.FileSystemDataStoreParams.WriteTimeoutParam,
+      org.locationtech.geomesa.fs.data.FileSystemDataStoreParams.QueryThreadsParam,
       org.locationtech.geomesa.fs.data.FileSystemDataStoreParams.QueryTimeoutParam,
       org.locationtech.geomesa.fs.data.FileSystemDataStoreParams.AuthProviderParam,
       org.locationtech.geomesa.fs.data.FileSystemDataStoreParams.AuthsParam,

geomesa-fs/geomesa-fs-datastore/src/main/scala/org/locationtech/geomesa/fs/data/FileSystemDataStoreParams.scala

@@ -71,13 +71,15 @@ trait FileSystemDataStoreParams extends SecurityParams with NamespaceParams {
       readWrite = ReadWriteFlag.ReadWrite,
     )
 
-  val ReadThreadsParam =
+  val QueryThreadsParam =
     new GeoMesaParam[Integer](
-      "fs.read-threads",
-      "Read Threads",
-      default = 4,
-      supportsNiFiExpressions = true,
-      readWrite = ReadWriteFlag.ReadOnly
+      GeoMesaDataStoreFactory.QueryThreadsParam.key,
+      GeoMesaDataStoreFactory.QueryThreadsParam.description.toString,
+      default = Int.box(4),
+      deprecatedKeys = Seq("fs.read-threads"),
+      systemProperty = GeoMesaDataStoreFactory.QueryThreadsParam.systemProperty,
+      supportsNiFiExpressions = GeoMesaDataStoreFactory.QueryThreadsParam.supportsNiFiExpressions,
+      readWrite = GeoMesaDataStoreFactory.QueryThreadsParam.readWrite
     )
 
   val WriteTimeoutParam =

geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/export/FsExportCommand.scala

@@ -21,7 +21,7 @@ class FsExportCommand extends ExportCommand[FileSystemDataStore] with FsDistribu
   override val params = new FsExportParams
 
   override def connection: Map[String, String] =
-    super.connection + (FileSystemDataStoreParams.ReadThreadsParam.getName -> params.threads.toString)
+    super.connection + (FileSystemDataStoreParams.QueryThreadsParam.getName -> params.threads.toString)
 }
 
 object FsExportCommand {

geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/export/FsPlaybackCommand.scala

@@ -21,7 +21,7 @@ class FsPlaybackCommand extends PlaybackCommand[FileSystemDataStore] with FsDist
   override val params = new FsPlaybackParams
 
   override def connection: Map[String, String] =
-    super.connection + (FileSystemDataStoreParams.ReadThreadsParam.getName -> params.threads.toString)
+    super.connection + (FileSystemDataStoreParams.QueryThreadsParam.getName -> params.threads.toString)
 }
 
 object FsPlaybackCommand {