Repository: calcite Updated Branches: refs/heads/master 8f202e918 -> 59b76701d
http://git-wip-us.apache.org/repos/asf/calcite/blob/295ab13e/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRules.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRules.java b/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRules.java index 3989768..53cb7b2 100644 --- a/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRules.java +++ b/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRules.java @@ -183,10 +183,10 @@ public abstract class SparkRules { JavaRowFormat.CUSTOM); final Type rowClass = physType.getJavaRowType(); - final List<Expression> expressions = new ArrayList<Expression>(); + final List<Expression> expressions = new ArrayList<>(); final List<RelDataTypeField> fields = rowType.getFieldList(); for (List<RexLiteral> tuple : tuples) { - final List<Expression> literals = new ArrayList<Expression>(); + final List<Expression> literals = new ArrayList<>(); for (Pair<RelDataTypeField, RexLiteral> pair : Pair.zip(fields, tuple)) { literals.add( http://git-wip-us.apache.org/repos/asf/calcite/blob/295ab13e/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkPushDownRule.java ---------------------------------------------------------------------- diff --git a/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkPushDownRule.java b/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkPushDownRule.java index 913f194..59acfb1 100644 --- a/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkPushDownRule.java +++ b/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkPushDownRule.java @@ -207,8 +207,7 @@ public class SplunkPushDownRule // handle bottom projection (ie choose a subset of the table fields) if (bottomProj != null) { - List<RelDataTypeField> tmp = - new ArrayList<RelDataTypeField>(); + List<RelDataTypeField> tmp = new ArrayList<>(); List<RelDataTypeField> dRow = bottomProj.getRowType().getFieldList(); for (RexNode rn : bottomProj.getProjects()) { RelDataTypeField rdtf; @@ -224,14 +223,13 @@ public class SplunkPushDownRule } // field renaming: to -> from - List<Pair<String, String>> renames = - new LinkedList<Pair<String, String>>(); + List<Pair<String, String>> renames = new LinkedList<>(); // handle top projection (ie reordering and renaming) List<RelDataTypeField> newFields = bottomFields; if (topProj != null) { LOGGER.debug("topProj: {}", String.valueOf(topProj.getPermutation())); - newFields = new ArrayList<RelDataTypeField>(); + newFields = new ArrayList<>(); int i = 0; for (RexNode rn : topProj.getProjects()) { RexInputRef rif = (RexInputRef) rn; http://git-wip-us.apache.org/repos/asf/calcite/blob/295ab13e/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkQuery.java ---------------------------------------------------------------------- diff --git a/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkQuery.java b/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkQuery.java index 170d9b6..cd236ef 100644 --- a/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkQuery.java +++ b/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkQuery.java @@ -64,7 +64,7 @@ public class SplunkQuery<T> extends AbstractEnumerable<T> { } private Map<String, String> getArgs() { - Map<String, String> args = new HashMap<String, String>(); + Map<String, String> args = new HashMap<>(); if (fieldList != null) { String fields = StringUtils.encodeList(fieldList, ',').toString(); http://git-wip-us.apache.org/repos/asf/calcite/blob/295ab13e/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkTable.java ---------------------------------------------------------------------- diff --git a/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkTable.java b/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkTable.java index 60906c4..72b0145 100644 --- a/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkTable.java +++ b/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkTable.java @@ -57,7 +57,7 @@ class SplunkTable extends AbstractQueryableTable implements TranslatableTable { public <T> Queryable<T> asQueryable(QueryProvider queryProvider, SchemaPlus schema, String tableName) { - return new SplunkTableQueryable<T>(queryProvider, schema, this, tableName); + return new SplunkTableQueryable<>(queryProvider, schema, this, tableName); } public RelNode toRel( @@ -93,7 +93,7 @@ class SplunkTable extends AbstractQueryableTable implements TranslatableTable { public SplunkQuery<T> createQuery(String search, String earliest, String latest, List<String> fieldList) { final SplunkSchema splunkSchema = schema.unwrap(SplunkSchema.class); - return new SplunkQuery<T>(splunkSchema.splunkConnection, search, + return new SplunkQuery<>(splunkSchema.splunkConnection, search, earliest, latest, fieldList); } } http://git-wip-us.apache.org/repos/asf/calcite/blob/295ab13e/splunk/src/main/java/org/apache/calcite/adapter/splunk/search/SplunkConnectionImpl.java ---------------------------------------------------------------------- diff --git a/splunk/src/main/java/org/apache/calcite/adapter/splunk/search/SplunkConnectionImpl.java b/splunk/src/main/java/org/apache/calcite/adapter/splunk/search/SplunkConnectionImpl.java index 9bf0e11..9664e92 100644 --- a/splunk/src/main/java/org/apache/calcite/adapter/splunk/search/SplunkConnectionImpl.java +++ b/splunk/src/main/java/org/apache/calcite/adapter/splunk/search/SplunkConnectionImpl.java @@ -64,7 +64,7 @@ public class SplunkConnectionImpl implements SplunkConnection { final String username; final String password; String sessionKey; - final Map<String, String> requestHeaders = new HashMap<String, String>(); + final Map<String, String> requestHeaders = new HashMap<>(); public SplunkConnectionImpl(String url, String username, String password) throws MalformedURLException { @@ -147,7 +147,7 @@ public class SplunkConnectionImpl implements SplunkConnection { url.getPort()); StringBuilder data = new StringBuilder(); - Map<String, String> args = new LinkedHashMap<String, String>(); + Map<String, String> args = new LinkedHashMap<>(); if (otherArgs != null) { args.putAll(otherArgs); } @@ -242,7 +242,7 @@ public class SplunkConnectionImpl implements SplunkConnection { } public static void main(String[] args) throws MalformedURLException { - Map<String, String> argsMap = new HashMap<String, String>(); + Map<String, String> argsMap = new HashMap<>(); argsMap.put("uri", "https://localhost:8089";); argsMap.put("username", "admin"); argsMap.put("password", "changeme"); @@ -270,7 +270,7 @@ public class SplunkConnectionImpl implements SplunkConnection { argsMap.get("username"), argsMap.get("password")); - Map<String, String> searchArgs = new HashMap<String, String>(); + Map<String, String> searchArgs = new HashMap<>(); searchArgs.put("earliest_time", argsMap.get("earliest_time")); searchArgs.put("latest_time", argsMap.get("latest_time")); searchArgs.put( http://git-wip-us.apache.org/repos/asf/calcite/blob/295ab13e/splunk/src/main/java/org/apache/calcite/adapter/splunk/util/StringUtils.java ---------------------------------------------------------------------- diff --git a/splunk/src/main/java/org/apache/calcite/adapter/splunk/util/StringUtils.java b/splunk/src/main/java/org/apache/calcite/adapter/splunk/util/StringUtils.java index ac08949..a33095c 100644 --- a/splunk/src/main/java/org/apache/calcite/adapter/splunk/util/StringUtils.java +++ b/splunk/src/main/java/org/apache/calcite/adapter/splunk/util/StringUtils.java @@ -50,7 +50,7 @@ public class StringUtils { } public static List<String> decodeList(CharSequence encoded, char delim) { - List<String> list = new LinkedList<String>(); + List<String> list = new LinkedList<>(); int len = encoded.length(); int start = 0; int end = 0; @@ -132,7 +132,7 @@ public class StringUtils { public static void main(String[] args) { - List<String> list = new LinkedList<String>(); + List<String> list = new LinkedList<>(); list.add("test"); list.add("test,with,comma"); list.add("");
