Skip to content

Commit 2dbeda7

Browse files
lmassaoylmassaoy
committed
restoring original state of gradle properties
1 parent e93e585 commit 2dbeda7

File tree

6 files changed

+92
-91
lines changed

6 files changed

+92
-91
lines changed

‎client/java/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎integration/spark-extension-entrypoint/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎integration/spark-extension-interfaces/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,10 @@ publishing {
170170
}
171171

172172
// -------- removing the following section to enable the dependencies within the pom file --------
173-
// // pom.withXml {
174-
// // Node pomNode = asNode()
175-
// // pomNode.remove(pomNode.get("dependencies"))
176-
// // }
173+
// pom.withXml {
174+
// Node pomNode = asNode()
175+
// pomNode.remove(pomNode.get("dependencies"))
176+
// }
177177
}
178178
}
179179

‎integration/spark-extension-interfaces/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎integration/spark-extension-interfaces/src/test/java/io/openlineage/spark/shade/extension/v1/lifecycle/plan/SparkOpenLineageExtensionVisitorTest.java‎

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -31,97 +31,97 @@ class SparkOpenLineageExtensionVisitorTest {
3131
SparkOpenLineageExtensionVisitor visitor = new SparkOpenLineageExtensionVisitor();
3232
Map<String, String> options = Collections.singletonMap("path", "some-path");
3333

34-
// @Test
35-
// void testDatasetIdentifierReturnedByLineageRelationProvider() {
36-
// // given
37-
// LineageRelationProvider provider =
38-
// (sparkListenerEventName, openLineage, sqlContext, parameters) ->
39-
// new DatasetIdentifier("name", "namespace")
40-
// .withSymlink(
41-
// new DatasetIdentifier.Symlink(
42-
// "name1", "namespace1", DatasetIdentifier.SymlinkType.TABLE));
43-
// assertThat(visitor.isDefinedAt(provider)).isTrue();
44-
// Map<String, Object> result =
45-
// visitor.apply(provider, event.getClass().getName(), sqlContext, options);
34+
@Test
35+
void testDatasetIdentifierReturnedByLineageRelationProvider() {
36+
// given
37+
LineageRelationProvider provider =
38+
(sparkListenerEventName, openLineage, sqlContext, parameters) ->
39+
new DatasetIdentifier("name", "namespace")
40+
.withSymlink(
41+
new DatasetIdentifier.Symlink(
42+
"name1", "namespace1", DatasetIdentifier.SymlinkType.TABLE));
43+
assertThat(visitor.isDefinedAt(provider)).isTrue();
44+
Map<String, Object> result =
45+
visitor.apply(provider, event.getClass().getName(), sqlContext, options);
4646

47-
// // then
48-
// assertThat(result).extracting("name").isEqualTo("name");
49-
// assertThat(result).extracting("namespace").isEqualTo("namespace");
50-
// assertThat(result)
51-
// .extracting("symlinks")
52-
// .isEqualTo(
53-
// list(
54-
// ImmutableMap.builder()
55-
// .put("name", "name1")
56-
// .put("namespace", "namespace1")
57-
// .put("type", "TABLE")
58-
// .build()));
59-
// }
47+
// then
48+
assertThat(result).extracting("name").isEqualTo("name");
49+
assertThat(result).extracting("namespace").isEqualTo("namespace");
50+
assertThat(result)
51+
.extracting("symlinks")
52+
.isEqualTo(
53+
list(
54+
ImmutableMap.builder()
55+
.put("name", "name1")
56+
.put("namespace", "namespace1")
57+
.put("type", "TABLE")
58+
.build()));
59+
}
6060

61-
// @Test
62-
// void testDatasetIdentifierReturnedByLineageRelation() {
63-
// // given
64-
// LineageRelation lineageRelation =
65-
// (sparkListenerEventName, openLineage) ->
66-
// new DatasetIdentifier("name", "namespace")
67-
// .withSymlink(
68-
// new DatasetIdentifier.Symlink(
69-
// "name1", "namespace1", DatasetIdentifier.SymlinkType.TABLE));
61+
@Test
62+
void testDatasetIdentifierReturnedByLineageRelation() {
63+
// given
64+
LineageRelation lineageRelation =
65+
(sparkListenerEventName, openLineage) ->
66+
new DatasetIdentifier("name", "namespace")
67+
.withSymlink(
68+
new DatasetIdentifier.Symlink(
69+
"name1", "namespace1", DatasetIdentifier.SymlinkType.TABLE));
7070

71-
// // when
72-
// assertThat(visitor.isDefinedAt(lineageRelation)).isTrue();
73-
// Map<String, Object> result = visitor.apply(lineageRelation, event.getClass().getName());
71+
// when
72+
assertThat(visitor.isDefinedAt(lineageRelation)).isTrue();
73+
Map<String, Object> result = visitor.apply(lineageRelation, event.getClass().getName());
7474

75-
// // then
76-
// assertThat(result).extracting("name").isEqualTo("name");
77-
// assertThat(result).extracting("namespace").isEqualTo("namespace");
78-
// assertThat(result)
79-
// .extracting("symlinks")
80-
// .isEqualTo(
81-
// list(
82-
// ImmutableMap.builder()
83-
// .put("name", "name1")
84-
// .put("namespace", "namespace1")
85-
// .put("type", "TABLE")
86-
// .build()));
87-
// }
75+
// then
76+
assertThat(result).extracting("name").isEqualTo("name");
77+
assertThat(result).extracting("namespace").isEqualTo("namespace");
78+
assertThat(result)
79+
.extracting("symlinks")
80+
.isEqualTo(
81+
list(
82+
ImmutableMap.builder()
83+
.put("name", "name1")
84+
.put("namespace", "namespace1")
85+
.put("type", "TABLE")
86+
.build()));
87+
}
8888

89-
// @Test
90-
// void testFacetsReturnedByInputLineageNodeWithIdentifier() {
91-
// // given
92-
// InputLineageNode inputLineageNode =
93-
// (sparkListenerEventName, openLineage) ->
94-
// Collections.singletonList(
95-
// new InputDatasetWithIdentifier(
96-
// new DatasetIdentifier("a", "b"),
97-
// openLineage.newDatasetFacetsBuilder(),
98-
// openLineage.newInputDatasetInputFacetsBuilder()));
89+
@Test
90+
void testFacetsReturnedByInputLineageNodeWithIdentifier() {
91+
// given
92+
InputLineageNode inputLineageNode =
93+
(sparkListenerEventName, openLineage) ->
94+
Collections.singletonList(
95+
new InputDatasetWithIdentifier(
96+
new DatasetIdentifier("a", "b"),
97+
openLineage.newDatasetFacetsBuilder(),
98+
openLineage.newInputDatasetInputFacetsBuilder()));
9999

100-
// // when
101-
// assertThat(visitor.isDefinedAt(inputLineageNode)).isTrue();
102-
// Map<String, Object> result = visitor.apply(inputLineageNode, event.getClass().getName());
100+
// when
101+
assertThat(visitor.isDefinedAt(inputLineageNode)).isTrue();
102+
Map<String, Object> result = visitor.apply(inputLineageNode, event.getClass().getName());
103103

104-
// // then
105-
// assertThat(result).extracting("delegateNodes").isEqualTo(list());
106-
// }
104+
// then
105+
assertThat(result).extracting("delegateNodes").isEqualTo(list());
106+
}
107107

108-
// @Test
109-
// void testFacetsReturnedByInputLineageNodeWithDelegates() {
110-
// // given
111-
// LogicalPlan delegate = mock(LogicalPlan.class);
112-
// InputLineageNode inputLineageNode =
113-
// (sparkListenerEventName, openLineage) ->
114-
// Collections.singletonList(
115-
// new InputDatasetWithDelegate(
116-
// delegate,
117-
// openLineage.newDatasetFacetsBuilder(),
118-
// openLineage.newInputDatasetInputFacetsBuilder()));
108+
@Test
109+
void testFacetsReturnedByInputLineageNodeWithDelegates() {
110+
// given
111+
LogicalPlan delegate = mock(LogicalPlan.class);
112+
InputLineageNode inputLineageNode =
113+
(sparkListenerEventName, openLineage) ->
114+
Collections.singletonList(
115+
new InputDatasetWithDelegate(
116+
delegate,
117+
openLineage.newDatasetFacetsBuilder(),
118+
openLineage.newInputDatasetInputFacetsBuilder()));
119119

120-
// // when
121-
// assertThat(visitor.isDefinedAt(inputLineageNode)).isTrue();
122-
// Map<String, Object> result = visitor.apply(inputLineageNode, event.getClass().getName());
120+
// when
121+
assertThat(visitor.isDefinedAt(inputLineageNode)).isTrue();
122+
Map<String, Object> result = visitor.apply(inputLineageNode, event.getClass().getName());
123123

124-
// // then
125-
// assertThat(result).extracting("delegateNodes").isEqualTo(list(delegate));
126-
// }
124+
// then
125+
assertThat(result).extracting("delegateNodes").isEqualTo(list(delegate));
126+
}
127127
}

‎integration/spark/app/src/main/java/io/openlineage/spark/agent/NuEventEmitter.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ public class NuEventEmitter {
2828
private static final Set<String> WANTED_EVENT_NAME_SUBSTRINGS = new HashSet<>(
2929
Arrays.asList(
3030
".execute_insert_into_hadoop_fs_relation_command.",
31-
".adaptive_spark_plan."
31+
".adaptive_spark_plan.",
32+
"."
3233
)
3334
);
3435

0 commit comments

Comments
 (0)