Skip to content

Remove unused RuntimeConfig options #567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gartens wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove unused RuntimeConfig options #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 2 additions & 93 deletions core/src/main/java/org/polypheny/db/config/RuntimeConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,46 +50,20 @@ public enum RuntimeConfig {
ConfigType.ENUM
),

APPROXIMATE_DISTINCT_COUNT(
"runtime/approximateDistinctCount",
"Whether approximate results from \"COUNT(DISTINCT ...)\" aggregate functions are acceptable.",
false,
ConfigType.BOOLEAN
), // Druid

APPROXIMATE_TOP_N(
"runtime/approximateTopN",
"Whether approximate results from \"Top N\" queries (\"ORDER BY aggFun DESC LIMIT n\") are acceptable.",
false,
ConfigType.BOOLEAN
), // Druid

APPROXIMATE_DECIMAL(
"runtime/approximateDecimal",
"Whether approximate results from aggregate functions on DECIMAL types are acceptable.",
false,
ConfigType.BOOLEAN
), // Druid

NULL_EQUAL_TO_EMPTY(
"runtime/nullEqualToEmpty",
"Whether to treat empty strings as null for Druid Adapter.",
true,
ConfigType.BOOLEAN
), // Druid

RELATIONAL_NAMESPACE_DEFAULT_CASE_SENSITIVE(
"runtime/relationalCaseSensitive",
"Whether a relational namespace is case-sensitive if not specified otherwise.",
false,
ConfigType.BOOLEAN
),

DOCUMENT_NAMESPACE_DEFAULT_CASE_SENSITIVE(
"runtime/documentCaseSensitive",
"Whether a document namespace is case-sensitive if not specified otherwise.",
false,
ConfigType.BOOLEAN
),

GRAPH_NAMESPACE_DEFAULT_CASE_SENSITIVE(
"runtime/graphCaseSensitive",
"Whether a graph (namespace) is case-sensitive if not specified otherwise.",
Expand Down Expand Up @@ -170,14 +144,6 @@ public enum RuntimeConfig {
ConfigType.BOOLEAN,
"planningGroup" ),

VALIDATE_MM_CONTENT_TYPE(
"validation/validateMultimediaContentType",
"Validate multimedia data by checking its content-type.",
true,
ConfigType.BOOLEAN,
"validationGroup"
),

TWO_PC_MODE(
"runtime/twoPcMode",
"Use two-phase commit protocol for committing queries on data stores.",
Expand Down Expand Up @@ -220,13 +186,6 @@ public enum RuntimeConfig {
ConfigType.INTEGER,
"statisticSettingsGroup" ),

UNIQUE_VALUES(
"statistics/maxCharUniqueVal",
"Maximum character of unique values",
10,
ConfigType.INTEGER,
"statisticSettingsGroup" ),

STATISTIC_RATE(
"statistics/passiveTrackingRate",
"Rate of passive tracking of statistics.",
Expand All @@ -239,27 +198,13 @@ public enum RuntimeConfig {
TaskSchedulingType.EVERY_SECOND_FIXED,
ConfigType.ENUM ),

EXPLORE_BY_EXAMPLE_TO_SQL(
"exploreByExample/classificationToSQL",
"Build SQL query from classification.",
true,
ConfigType.BOOLEAN,
"uiSettings" ),

UI_PAGE_SIZE(
"ui/pageSize",
"Number of rows per page in the data view.",
10,
ConfigType.INTEGER,
"uiSettingsDataViewGroup" ),

UI_NODE_AMOUNT(
"ui/nodeAmount",
"Number of nodes in the graph data view.",
300,
ConfigType.INTEGER,
"uiSettingsDataViewGroup" ),

UI_UPLOAD_SIZE_MB(
"ui/uploadSizeMB",
"Maximum size of a file upload for multimedia data in the UI, in MB. "
Expand All @@ -268,29 +213,6 @@ public enum RuntimeConfig {
ConfigType.INTEGER,
"uiSettingsDataViewGroup" ),

UI_USE_HARDLINKS(
"ui/useHardlinks",
"Whether or not to use hardlinks for temporal files in the UI. If false, softlinks are used. This config has only an effect when one or multiple file stores are deployed. "
+ "With hardlinks, the data you see is the correct data that was selected during the transaction. "
+ "But with multiple file stores on different file systems, hardlinks won't work. "
+ "In this case you can use softlinks, but you might see data that is more recent.",
true,
ConfigType.BOOLEAN,
"uiSettingsDataViewGroup" ),

HUB_IMPORT_BATCH_SIZE(
"hub/hubImportBatchSize",
"Number of rows that should be inserted at a time when importing a dataset from Polypheny-Hub.",
1000,
ConfigType.INTEGER,
"uiSettingsDataViewGroup" ),

SCHEMA_CACHING(
"runtime/schemaCaching",
"Cache polypheny-db schema",
true,
ConfigType.BOOLEAN ),

QUERY_PLAN_CACHING(
"runtime/queryPlanCaching",
"Cache planned and optimized query plans.",
Expand Down Expand Up @@ -479,13 +401,6 @@ public enum RuntimeConfig {
ConfigType.ENUM,
"temperaturePartitionProcessingSettingsGroup" ),

CATALOG_DEBUG_MESSAGES(
"runtime/catalogDebugMessages",
"Enable output of catalog debug messages on the monitoring page.",
false,
ConfigType.BOOLEAN,
"monitoringGroup" ),

AVAILABLE_PLUGINS(
"runtime/availablePlugins",
"All plugins, which are available, be it active, only loaded or unloaded.",
Expand Down Expand Up @@ -546,12 +461,6 @@ public enum RuntimeConfig {
"runtime/serialization",
"How big the buffersize for catalog objects should be.",
2_000_000,
ConfigType.INTEGER ),

LOCKING_MAX_TIMEOUT_SECONDS(
"runtime/maxTimeout",
"How long a transactions should wait for a lock until it is aborted",
90,
ConfigType.INTEGER );


Expand Down
60 changes: 0 additions & 60 deletions dbms/src/main/java/org/polypheny/db/processing/shuttles/ParameterValueValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,66 +112,6 @@ public RexNode visitDynamicParam( RexDynamicParam dynamicParam ) {
break;
case MULTIMEDIA:
return super.visitDynamicParam( dynamicParam );
/*if ( polyType == PolyType.FILE || !RuntimeConfig.VALIDATE_MM_CONTENT_TYPE.getBoolean() ) {
if ( o.isBlob() )//instanceof byte[] || o instanceof InputStream || o instanceof File || o instanceof FileInputHandle ) {
return super.visitDynamicParam( dynamicParam );
} else {
throw new InvalidParameterValueException( String.format( "Parameter value '%s' of type %s does not match the PolyType %s", o.toString(), o.getClass().getSimpleName(), polyType ) );
}
}
/*ContentInfoUtil util = new ContentInfoUtil();
ContentInfo info;
if ( o instanceof byte[] ) {
info = util.findMatch( (byte[]) o );
} else if ( o instanceof InputStream ) {
PushbackInputStream pbis = new PushbackInputStream( (InputStream) o, ContentInfoUtil.DEFAULT_READ_SIZE );
byte[] buffer = new byte[ContentInfoUtil.DEFAULT_READ_SIZE];
try {
pbis.read( buffer );
info = util.findMatch( buffer );
pbis.unread( buffer );
map.put( index, pbis );
} catch ( IOException e ) {
throw new InvalidParameterValueException( "Exception while trying to determine file content type", e );
}
} else if ( o instanceof File ) {
try {
info = util.findMatch( (File) o );
} catch ( IOException e ) {
throw new InvalidParameterValueException( "Exception while trying to determine file content type", e );
}
} else if ( o instanceof FileInputHandle ) {
try {
info = ((FileInputHandle) o).getContentType( util );
} catch ( IOException e ) {
throw new InvalidParameterValueException( "Exception while trying to determine file content type", e );
}
} else {
throw new InvalidParameterValueException( "Multimedia object in unexpected form " + o.getClass().getSimpleName() );
}
if ( info == null ) {
throw new InvalidParameterValueException( String.format( "The content type of the %s file could not be determined and is thus invalid", polyType ) );
}
ContentType[] imageTypes = new ContentType[]{ ContentType.APPLE_QUICKTIME_IMAGE, ContentType.BMP, ContentType.GIF, ContentType.JPEG, ContentType.JPEG_2000, ContentType.PBM, ContentType.PGM, ContentType.PNG, ContentType.PPM, ContentType.SVG, ContentType.TIFF };
ContentType[] videoTypes = new ContentType[]{ ContentType.APPLE_QUICKTIME_MOVIE, ContentType.AVI, ContentType.MNG, ContentType.MP4A, ContentType.MP4V, ContentType.VIDEO_MPEG };
ContentType[] soundTypes = new ContentType[]{ ContentType.AIFF, ContentType.AUDIO_MPEG, ContentType.MIDI, ContentType.REAL_AUDIO, ContentType.WAV };
switch ( polyType ) {
case IMAGE:
valid = Arrays.asList( imageTypes ).contains( info.getContentType() );
break;
case VIDEO:
valid = Arrays.asList( videoTypes ).contains( info.getContentType() );
break;
case AUDIO:
valid = Arrays.asList( soundTypes ).contains( info.getContentType() );
break;
//case File:
//break;
}
if ( !valid ) {
throw new InvalidParameterValueException( String.format( "The %s file has the content type '%s' which is not valid for the %s PolyType", polyType.toString().toLowerCase(), polyType ) );
}
break;*/
}
if ( !valid ) {
break;
Expand Down
Loading