-
Notifications
You must be signed in to change notification settings - Fork 24.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into zen2_replace_inmemorystate
- Loading branch information
Showing
1,476 changed files
with
23,915 additions
and
13,425 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
benchmarks/src/main/java/org/elasticsearch/benchmark/time/DateFormatterBenchmark.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.elasticsearch.benchmark.time; | ||
|
|
||
| import org.elasticsearch.common.joda.Joda; | ||
| import org.elasticsearch.common.time.DateFormatter; | ||
| import org.openjdk.jmh.annotations.Benchmark; | ||
| import org.openjdk.jmh.annotations.BenchmarkMode; | ||
| import org.openjdk.jmh.annotations.Fork; | ||
| import org.openjdk.jmh.annotations.Measurement; | ||
| import org.openjdk.jmh.annotations.Mode; | ||
| import org.openjdk.jmh.annotations.OutputTimeUnit; | ||
| import org.openjdk.jmh.annotations.Scope; | ||
| import org.openjdk.jmh.annotations.State; | ||
| import org.openjdk.jmh.annotations.Warmup; | ||
|
|
||
| import java.time.temporal.TemporalAccessor; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| @Fork(3) | ||
| @Warmup(iterations = 10) | ||
| @Measurement(iterations = 10) | ||
| @BenchmarkMode(Mode.AverageTime) | ||
| @OutputTimeUnit(TimeUnit.NANOSECONDS) | ||
| @State(Scope.Benchmark) | ||
| @SuppressWarnings("unused") //invoked by benchmarking framework | ||
| public class DateFormatterBenchmark { | ||
|
|
||
| private final DateFormatter javaFormatter = DateFormatter.forPattern("8year_month_day||ordinal_date||epoch_millis"); | ||
| private final DateFormatter jodaFormatter = Joda.forPattern("year_month_day||ordinal_date||epoch_millis"); | ||
|
|
||
| @Benchmark | ||
| public TemporalAccessor parseJavaDate() { | ||
| return javaFormatter.parse("1234567890"); | ||
| } | ||
|
|
||
| @Benchmark | ||
| public TemporalAccessor parseJodaDate() { | ||
| return jodaFormatter.parse("1234567890"); | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
99 changes: 99 additions & 0 deletions
99
buildSrc/src/main/java/org/elasticsearch/gradle/precommit/TestingConventionRule.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.elasticsearch.gradle.precommit; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.util.Collection; | ||
| import java.util.HashSet; | ||
| import java.util.Objects; | ||
| import java.util.Set; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| /** | ||
| * Represent rules for tests enforced by the @{link {@link TestingConventionsTasks}} | ||
| * | ||
| * Rules are identified by name, tests must have this name as a suffix and implement one of the base classes | ||
| * and be part of all the specified tasks. | ||
| */ | ||
| public class TestingConventionRule implements Serializable { | ||
|
|
||
| private final String suffix; | ||
|
|
||
| private Set<String> baseClasses = new HashSet<>(); | ||
|
|
||
| private Set<Pattern> taskNames = new HashSet<>(); | ||
|
|
||
| public TestingConventionRule(String suffix) { | ||
| this.suffix = suffix; | ||
| } | ||
|
|
||
| public String getSuffix() { | ||
| return suffix; | ||
| } | ||
|
|
||
| /** | ||
| * Alias for @{link getSuffix} as Gradle requires a name property | ||
| * | ||
| */ | ||
| public String getName() { | ||
| return suffix; | ||
| } | ||
|
|
||
| public void baseClass(String clazz) { | ||
| baseClasses.add(clazz); | ||
| } | ||
|
|
||
| public void setBaseClasses(Collection<String> baseClasses) { | ||
| this.baseClasses.clear(); | ||
| this.baseClasses.addAll(baseClasses); | ||
| } | ||
|
|
||
| public void taskName(Pattern expression) { | ||
| taskNames.add(expression); | ||
| } | ||
| public void taskName(String expression) { | ||
| taskNames.add(Pattern.compile(expression)); | ||
| } | ||
|
|
||
| public void setTaskNames(Collection<Pattern> expressions) { | ||
| taskNames.clear(); | ||
| taskNames.addAll(expressions); | ||
| } | ||
|
|
||
| public Set<String> getBaseClasses() { | ||
| return baseClasses; | ||
| } | ||
|
|
||
| public Set<Pattern> getTaskNames() { | ||
| return taskNames; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
| TestingConventionRule that = (TestingConventionRule) o; | ||
| return Objects.equals(suffix, that.suffix); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(suffix); | ||
| } | ||
| } |
Oops, something went wrong.