Revert "Add configuration property for max characters on alias column"

This reverts commit 8fce268.
trinodb · Sep 4, 2023 · 4346680 · 4346680
1 parent 356a829
commit 4346680
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 35 deletions.
diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ColumnWithAliasFormatter.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/ColumnWithAliasFormatter.java
@@ -15,11 +15,8 @@
 
 import io.trino.spi.connector.ConnectorSession;
 
-import java.util.Optional;
-
 import static com.google.common.base.Splitter.fixedLength;
 import static com.google.common.base.Strings.padStart;
-import static io.trino.plugin.jdbc.JdbcMetadataSessionProperties.COLUMN_ALIAS_MAX_CHARS;
 
 public class ColumnWithAliasFormatter
 {
@@ -28,9 +25,7 @@ public class ColumnWithAliasFormatter
 
     public JdbcColumnHandle format(ConnectorSession session, JdbcColumnHandle column, int nextSyntheticColumnId)
     {
-        Integer property = Optional.ofNullable(session.getProperty(COLUMN_ALIAS_MAX_CHARS, Integer.class))
-                .orElse(DEFAULT_COLUMN_ALIAS_LENGTH);
-        int sequentialNumberLength = property - ORIGINAL_COLUMN_NAME_LENGTH - 1;
+        int sequentialNumberLength = DEFAULT_COLUMN_ALIAS_LENGTH - ORIGINAL_COLUMN_NAME_LENGTH - 1;
 
         String originalColumnNameTruncated = fixedLength(ORIGINAL_COLUMN_NAME_LENGTH)
                 .split(column.getColumnName())

diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcMetadataConfig.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcMetadataConfig.java
@@ -41,8 +41,6 @@ public class JdbcMetadataConfig
     // between performance and pushdown capabilities
     private int domainCompactionThreshold = 32;
 
-    private int columnAliasMaxChars = 30;
-
     public boolean isComplexExpressionPushdownEnabled()
     {
         return complexExpressionPushdownEnabled;
@@ -102,11 +100,6 @@ public int getDomainCompactionThreshold()
         return domainCompactionThreshold;
     }
 
-    public int getColumnAliasMaxChars()
-    {
-        return this.columnAliasMaxChars;
-    }
-
     @Config("domain-compaction-threshold")
     @ConfigDescription("Maximum ranges to allow in a tuple domain without compacting it")
     public JdbcMetadataConfig setDomainCompactionThreshold(int domainCompactionThreshold)

diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcMetadataSessionProperties.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcMetadataSessionProperties.java
@@ -36,7 +36,6 @@ public class JdbcMetadataSessionProperties
     public static final String AGGREGATION_PUSHDOWN_ENABLED = "aggregation_pushdown_enabled";
     public static final String TOPN_PUSHDOWN_ENABLED = "topn_pushdown_enabled";
     public static final String DOMAIN_COMPACTION_THRESHOLD = "domain_compaction_threshold";
-    public static final String COLUMN_ALIAS_MAX_CHARS = "column_alias_max_chars";
 
     private final List<PropertyMetadata<?>> properties;
 
@@ -71,11 +70,6 @@ public JdbcMetadataSessionProperties(JdbcMetadataConfig jdbcMetadataConfig, @Max
                         "Enable TopN pushdown",
                         jdbcMetadataConfig.isTopNPushdownEnabled(),
                         false))
-                .add(integerProperty(
-                        COLUMN_ALIAS_MAX_CHARS,
-                        "Maximum number of characters allowed in a column alias",
-                        jdbcMetadataConfig.getColumnAliasMaxChars(),
-                        false))
                 .build();
     }
 

diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestColumnWithAliasFormatter.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestColumnWithAliasFormatter.java
@@ -13,37 +13,22 @@
  */
 package io.trino.plugin.jdbc;
 
-import com.google.common.collect.ImmutableList;
 import com.google.inject.Inject;
-import io.trino.spi.session.PropertyMetadata;
 import io.trino.testing.TestingConnectorSession;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
-import static io.trino.plugin.jdbc.JdbcMetadataSessionProperties.COLUMN_ALIAS_MAX_CHARS;
 import static io.trino.plugin.jdbc.TestingJdbcTypeHandle.JDBC_VARCHAR;
-import static io.trino.spi.session.PropertyMetadata.integerProperty;
 import static io.trino.spi.type.VarcharType.VARCHAR;
-import static java.util.Collections.singletonMap;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Guice(modules = ColumnWithAliasFormatterModule.class)
 public class TestColumnWithAliasFormatter
 {
-    private static final ImmutableList<PropertyMetadata<?>> PROPERTY_METADATA = ImmutableList.of(
-            integerProperty(
-                    COLUMN_ALIAS_MAX_CHARS,
-                    "Column Alias max characters",
-                    null,
-                    false));
-
     @Inject
     private ColumnWithAliasFormatter actor;
 
-    private final TestingConnectorSession session = TestingConnectorSession.builder()
-            .setPropertyMetadata(PROPERTY_METADATA)
-            .setPropertyValues(singletonMap(COLUMN_ALIAS_MAX_CHARS, 30))
-            .build();
+    private final TestingConnectorSession session = TestingConnectorSession.builder().build();
 
     @Test
     public void testTooLongName()