(polaris-tools) 09/15: Revert "Configurable StorageConfigInfo for Polaris benchmark (#20)"

[pingtimeout]

This is an automated email from the ASF dual-hosted git repository.

pingtimeout pushed a commit to branch benchmarks-ppc
in repository https://gitbox.apache.org/repos/asf/polaris-tools.git

commit e7205935b54fef5f9a6a67a5101f7232dff82704
Author: Pierre Laporte <pie...@pingtimeout.fr>
AuthorDate: Wed May 7 17:10:23 2025 +0200

    Revert "Configurable StorageConfigInfo for Polaris benchmark (#20)"
    
    This reverts commit 8f45b5179f432cf0432ca1a955dea4262a146651.
---
 benchmarks/README.md                                              | 1 -
 benchmarks/src/gatling/resources/benchmark-defaults.conf          | 4 ----
 .../org/apache/polaris/benchmarks/actions/CatalogActions.scala    | 8 +++++---
 .../apache/polaris/benchmarks/parameters/BenchmarkConfig.scala    | 3 +--
 .../apache/polaris/benchmarks/parameters/DatasetParameters.scala  | 4 +---
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/benchmarks/README.md b/benchmarks/README.md
index fa6a27c..ca388fb 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -233,7 +233,6 @@ The data set size can be adjusted as well. Each namespace 
is associated with an
 
 The diagram below shows sample catalog, namespace and table definition given 
the following properties:
 
--   storage-config-info: `{"storageType": "FILE"}`
 -   Default base location: `file:///tmp/polaris`
 -   Number of namespace properties: `100`
 -   Number of columns per table: `999`
diff --git a/benchmarks/src/gatling/resources/benchmark-defaults.conf 
b/benchmarks/src/gatling/resources/benchmark-defaults.conf
index 584a4e0..91c768b 100644
--- a/benchmarks/src/gatling/resources/benchmark-defaults.conf
+++ b/benchmarks/src/gatling/resources/benchmark-defaults.conf
@@ -37,10 +37,6 @@ auth {
 
 # Dataset tree structure configuration
 dataset.tree {
-  # JSON to supply as a StorageConfigInfo when creating a catalog
-  # Default: {"storageType": "FILE"}
-  storage-config-info = """{"storageType": "FILE"}"""
-
   # Number of catalogs to create. Only the first catalog (C_0) will contain 
the test dataset.
   # Default: 1
   num-catalogs = 1
diff --git 
a/benchmarks/src/gatling/scala/org/apache/polaris/benchmarks/actions/CatalogActions.scala
 
b/benchmarks/src/gatling/scala/org/apache/polaris/benchmarks/actions/CatalogActions.scala
index 0584868..8878b5a 100644
--- 
a/benchmarks/src/gatling/scala/org/apache/polaris/benchmarks/actions/CatalogActions.scala
+++ 
b/benchmarks/src/gatling/scala/org/apache/polaris/benchmarks/actions/CatalogActions.scala
@@ -62,8 +62,7 @@ case class CatalogActions(
       val catalogName = s"C_$i"
       Map(
         "catalogName" -> catalogName,
-        "defaultBaseLocation" -> s"${dp.defaultBaseLocation}/$catalogName",
-        "storageConfigInfo" -> dp.storageConfigInfo
+        "defaultBaseLocation" -> s"${dp.defaultBaseLocation}/$catalogName"
       )
     }
     .take(dp.numCatalogs)
@@ -91,7 +90,9 @@ case class CatalogActions(
               |    "properties": {
               |      "default-base-location": "#{defaultBaseLocation}"
               |    },
-              |    "storageConfigInfo": #{storageConfigInfo}
+              |    "storageConfigInfo": {
+              |      "storageType": "FILE"
+              |    }
               |  }
               |}""".stripMargin
           )
@@ -116,6 +117,7 @@ case class CatalogActions(
       .check(jsonPath("$.type").is("INTERNAL"))
       .check(jsonPath("$.name").is("#{catalogName}"))
       
.check(jsonPath("$.properties.default-base-location").is("#{defaultBaseLocation}"))
+      .check(jsonPath("$.storageConfigInfo.storageType").is("FILE"))
       
.check(jsonPath("$.storageConfigInfo.allowedLocations[0]").is("#{defaultBaseLocation}"))
   )
 
diff --git 
a/benchmarks/src/gatling/scala/org/apache/polaris/benchmarks/parameters/BenchmarkConfig.scala
 
b/benchmarks/src/gatling/scala/org/apache/polaris/benchmarks/parameters/BenchmarkConfig.scala
index fc820ce..97b23b9 100644
--- 
a/benchmarks/src/gatling/scala/org/apache/polaris/benchmarks/parameters/BenchmarkConfig.scala
+++ 
b/benchmarks/src/gatling/scala/org/apache/polaris/benchmarks/parameters/BenchmarkConfig.scala
@@ -80,8 +80,7 @@ object BenchmarkConfig {
       dataset.getInt("views-per-namespace"),
       dataset.getInt("max-views"),
       dataset.getInt("columns-per-view"),
-      dataset.getInt("view-properties"),
-      dataset.getString("storage-config-info")
+      dataset.getInt("view-properties")
     )
 
     BenchmarkConfig(connectionParams, workloadParams, datasetParams)
diff --git 
a/benchmarks/src/gatling/scala/org/apache/polaris/benchmarks/parameters/DatasetParameters.scala
 
b/benchmarks/src/gatling/scala/org/apache/polaris/benchmarks/parameters/DatasetParameters.scala
index e2daf48..894cee2 100644
--- 
a/benchmarks/src/gatling/scala/org/apache/polaris/benchmarks/parameters/DatasetParameters.scala
+++ 
b/benchmarks/src/gatling/scala/org/apache/polaris/benchmarks/parameters/DatasetParameters.scala
@@ -37,7 +37,6 @@ import org.apache.polaris.benchmarks.NAryTreeBuilder
  * @param numViewsMax The maximum number of views to create. If set to -1, all 
views are created.
  * @param numColumnsPerView The number of columns per view to create.
  * @param numViewProperties The number of view properties to create.
- * @param storageConfigInfo The JSON to supply when creating a new 
StorageConfigInfo for a catalog.
  */
 case class DatasetParameters(
     numCatalogs: Int,
@@ -52,8 +51,7 @@ case class DatasetParameters(
     numViewsPerNs: Int,
     numViewsMax: Int,
     numColumnsPerView: Int,
-    numViewProperties: Int,
-    storageConfigInfo: String
+    numViewProperties: Int
 ) {
   val nAryTree: NAryTreeBuilder = NAryTreeBuilder(nsWidth, nsDepth)
   private val maxPossibleTables = nAryTree.numberOfLastLevelElements * 
numTablesPerNs