Merge pull request #22346 from lukecwik/22181

[#22181] Fix java package for SDK java core benchmark org.apache.beam.sdk.schemas -> org.apache.beam.sdk.jmh.schemas
apache · Jul 20, 2022 · 9352093 · 9352093
2 parents ba62704 + 203cb13
commit 9352093
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 16 deletions.
diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -1457,6 +1457,8 @@ class BeamModulePlugin implements Plugin<Project> {
           args '-f=0'
           args '-wf=0'
           args '-foe=true'
+          // Allow jmhTest to run concurrently with other jmhTest instances
+          systemProperties(['jmh.ignoreLock' : 'true'])
         }
         project.check.dependsOn jmhTest
       }

diff --git a/...s/GetterBasedSchemaProviderBenchmark.java → ...s/GetterBasedSchemaProviderBenchmark.java b/...s/GetterBasedSchemaProviderBenchmark.java → ...s/GetterBasedSchemaProviderBenchmark.java
@@ -15,20 +15,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.beam.sdk.schemas;
+package org.apache.beam.sdk.jmh.schemas;
 
-import org.apache.beam.sdk.schemas.RowBundles.ArrayOfNestedStringBundle;
-import org.apache.beam.sdk.schemas.RowBundles.ArrayOfStringBundle;
-import org.apache.beam.sdk.schemas.RowBundles.ByteBufferBundle;
-import org.apache.beam.sdk.schemas.RowBundles.BytesBundle;
-import org.apache.beam.sdk.schemas.RowBundles.DateTimeBundle;
-import org.apache.beam.sdk.schemas.RowBundles.IntBundle;
-import org.apache.beam.sdk.schemas.RowBundles.MapOfIntBundle;
-import org.apache.beam.sdk.schemas.RowBundles.MapOfNestedIntBundle;
-import org.apache.beam.sdk.schemas.RowBundles.NestedBytesBundle;
-import org.apache.beam.sdk.schemas.RowBundles.NestedIntBundle;
-import org.apache.beam.sdk.schemas.RowBundles.StringBuilderBundle;
-import org.apache.beam.sdk.schemas.RowBundles.StringBundle;
+import org.apache.beam.sdk.jmh.schemas.RowBundles.ArrayOfNestedStringBundle;
+import org.apache.beam.sdk.jmh.schemas.RowBundles.ArrayOfStringBundle;
+import org.apache.beam.sdk.jmh.schemas.RowBundles.ByteBufferBundle;
+import org.apache.beam.sdk.jmh.schemas.RowBundles.BytesBundle;
+import org.apache.beam.sdk.jmh.schemas.RowBundles.DateTimeBundle;
+import org.apache.beam.sdk.jmh.schemas.RowBundles.IntBundle;
+import org.apache.beam.sdk.jmh.schemas.RowBundles.MapOfIntBundle;
+import org.apache.beam.sdk.jmh.schemas.RowBundles.MapOfNestedIntBundle;
+import org.apache.beam.sdk.jmh.schemas.RowBundles.NestedBytesBundle;
+import org.apache.beam.sdk.jmh.schemas.RowBundles.NestedIntBundle;
+import org.apache.beam.sdk.jmh.schemas.RowBundles.StringBuilderBundle;
+import org.apache.beam.sdk.jmh.schemas.RowBundles.StringBundle;
+import org.apache.beam.sdk.schemas.GetterBasedSchemaProvider;
 import org.apache.beam.sdk.values.RowWithGetters;
 import org.apache.beam.sdk.values.TypeDescriptor;
 import org.openjdk.jmh.annotations.Benchmark;

diff --git a/...rg/apache/beam/sdk/schemas/RowBundle.java → ...pache/beam/sdk/jmh/schemas/RowBundle.java b/...rg/apache/beam/sdk/schemas/RowBundle.java → ...pache/beam/sdk/jmh/schemas/RowBundle.java
@@ -15,10 +15,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.beam.sdk.schemas;
+package org.apache.beam.sdk.jmh.schemas;
 
 import java.nio.charset.StandardCharsets;
+import org.apache.beam.sdk.schemas.Factory;
+import org.apache.beam.sdk.schemas.GetterBasedSchemaProvider;
+import org.apache.beam.sdk.schemas.NoSuchSchemaException;
+import org.apache.beam.sdk.schemas.Schema;
 import org.apache.beam.sdk.schemas.Schema.FieldType;
+import org.apache.beam.sdk.schemas.SchemaCoder;
+import org.apache.beam.sdk.schemas.SchemaRegistry;
 import org.apache.beam.sdk.transforms.SerializableFunction;
 import org.apache.beam.sdk.values.Row;
 import org.apache.beam.sdk.values.RowWithGetters;

diff --git a/...g/apache/beam/sdk/schemas/RowBundles.java → ...ache/beam/sdk/jmh/schemas/RowBundles.java b/...g/apache/beam/sdk/schemas/RowBundles.java → ...ache/beam/sdk/jmh/schemas/RowBundles.java
@@ -15,11 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.beam.sdk.schemas;
+package org.apache.beam.sdk.jmh.schemas;
 
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
+import org.apache.beam.sdk.schemas.JavaFieldSchema;
 import org.apache.beam.sdk.schemas.annotations.DefaultSchema;
 import org.apache.beam.sdk.values.Row;
 import org.joda.time.DateTime;

diff --git a/...apache/beam/sdk/schemas/package-info.java → ...he/beam/sdk/jmh/schemas/package-info.java b/...apache/beam/sdk/schemas/package-info.java → ...he/beam/sdk/jmh/schemas/package-info.java
@@ -17,4 +17,4 @@
  */
 
 /** Benchmarks for schemas. */
-package org.apache.beam.sdk.schemas;
+package org.apache.beam.sdk.jmh.schemas;