Apache/druid
1
0
Fork 0
mirror of https://github.com/apache/druid.git synced 2025-02-16 23:15:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

modify access to protected SQLMetadataConnector methods to allow extensions to create SQL metadata tables using implementation specific constructs (payload type, serial type, etc) (#10573)

Browse Source
This commit is contained in:
Clint Wylie 2020-11-12 09:50:01 -08:00 committed by GitHub
parent f1b5745eb6
commit 6563599de4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extensions-contrib/sqlserver-metadata-storage/src/main/java/org/apache/druid/metadata/storage/sqlserver/SQLServerConnector.java
View File

@ -179,13 +179,13 @@ public class SQLServerConnector extends SQLMetadataConnector
}
@Override
protected String getPayloadType()
public String getPayloadType()
{
return PAYLOAD_TYPE;
}
@Override
protected String getSerialType()
public String getSerialType()
{
return SERIAL_TYPE;
}
@ -197,7 +197,7 @@ public class SQLServerConnector extends SQLMetadataConnector
}
@Override
protected int getStreamingFetchSize()
public int getStreamingFetchSize()
{
return DEFAULT_STREAMING_RESULT_SIZE;
}

8
extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/mysql/MySQLConnector.java
View File

@ -148,19 +148,19 @@ public class MySQLConnector extends SQLMetadataConnector
}
@Override
protected String getPayloadType()
public String getPayloadType()
{
return PAYLOAD_TYPE;
}
@Override
protected String getSerialType()
public String getSerialType()
{
return SERIAL_TYPE;
}
@Override
protected String getCollation()
public String getCollation()
{
return COLLATION;
}
@ -172,7 +172,7 @@ public class MySQLConnector extends SQLMetadataConnector
}
@Override
protected int getStreamingFetchSize()
public int getStreamingFetchSize()
{
// this is MySQL's way of indicating you want results streamed back
// see http://dev.mysql.com/doc/connector-j/5.1/en/connector-j-reference-implementation-notes.html

6
extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnector.java
View File

@ -121,13 +121,13 @@ public class PostgreSQLConnector extends SQLMetadataConnector
}
@Override
protected String getPayloadType()
public String getPayloadType()
{
return PAYLOAD_TYPE;
}
@Override
protected String getSerialType()
public String getSerialType()
{
return SERIAL_TYPE;
}
@ -139,7 +139,7 @@ public class PostgreSQLConnector extends SQLMetadataConnector
}
@Override
protected int getStreamingFetchSize()
public int getStreamingFetchSize()
{
return DEFAULT_STREAMING_RESULT_SIZE;
}

17
server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java
View File

@ -71,14 +71,7 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
{
this.config = config;
this.tablesConfigSupplier = tablesConfigSupplier;
this.shouldRetry = new Predicate<Throwable>()
{
@Override
public boolean apply(Throwable e)
{
return isTransientException(e);
}
};
this.shouldRetry = this::isTransientException;
}
/**
@ -90,7 +83,7 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
*
* @return String representing the SQL type
*/
protected String getPayloadType()
public String getPayloadType()
{
return PAYLOAD_TYPE;
}
@ -100,7 +93,7 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
*
* @return the collation for the character set
*/
protected String getCollation()
public String getCollation()
{
return COLLATION;
}
@ -114,7 +107,7 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
*
* @return String representing the SQL type and auto-increment statement
*/
protected abstract String getSerialType();
public abstract String getSerialType();
/**
* Returns the value that should be passed to statement.setFetchSize to ensure results
@ -122,7 +115,7 @@ public abstract class SQLMetadataConnector implements MetadataStorageConnector
*
* @return optimal fetch size to stream results back
*/
protected abstract int getStreamingFetchSize();
public abstract int getStreamingFetchSize();
/**
* @return the string that should be used to quote string fields

4
server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java
View File

@ -84,7 +84,7 @@ public class DerbyConnector extends SQLMetadataConnector
}
@Override
protected String getSerialType()
public String getSerialType()
{
return SERIAL_TYPE;
}
@ -102,7 +102,7 @@ public class DerbyConnector extends SQLMetadataConnector
}
@Override
protected int getStreamingFetchSize()
public int getStreamingFetchSize()
{
// Derby only supports fetch size of 1
return 1;

4
server/src/test/java/org/apache/druid/metadata/SQLMetadataConnectorTest.java
View File

@ -159,13 +159,13 @@ public class SQLMetadataConnectorTest
}
@Override
protected String getSerialType()
public String getSerialType()
{
return null;
}
@Override
protected int getStreamingFetchSize()
public int getStreamingFetchSize()
{
return 0;
}