Skip to content

Commit

Permalink
Merge pull request #8 from apache/master
Browse files Browse the repository at this point in the history
update to new
  • Loading branch information
fengjian428 authored May 21, 2022
2 parents 8a533e8 + 8ec625d commit ee3559c
Show file tree
Hide file tree
Showing 283 changed files with 6,082 additions and 2,122 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,11 @@ jobs:
if: ${{ !endsWith(env.SPARK_PROFILE, '3.2') }} # skip test spark 3.2 before hadoop upgrade to 3.x
run:
mvn test -Punit-tests -D"$SCALA_PROFILE" -D"$SPARK_PROFILE" -D"$FLINK_PROFILE" -DfailIfNoTests=false -pl hudi-examples/hudi-examples-flink,hudi-examples/hudi-examples-java,hudi-examples/hudi-examples-spark
- name: Spark SQL Test
env:
SCALA_PROFILE: ${{ matrix.scalaProfile }}
SPARK_PROFILE: ${{ matrix.sparkProfile }}
FLINK_PROFILE: ${{ matrix.flinkProfile }}
if: ${{ !endsWith(env.SPARK_PROFILE, '2.4') }} # skip test spark 2.4 as it's covered by Azure CI
run:
mvn test -Punit-tests -D"$SCALA_PROFILE" -D"$SPARK_PROFILE" -D"$FLINK_PROFILE" '-Dtest=org.apache.spark.sql.hudi.Test*' -pl hudi-spark-datasource/hudi-spark
53 changes: 53 additions & 0 deletions docker/demo/config/test-suite/deltastreamer-immutable-dataset.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF 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.
dag_name: deltastreamer-immutable-dataset.yaml
dag_rounds: 5
dag_intermittent_delay_mins: 0
dag_content:
first_bulk_insert:
config:
record_size: 200
num_partitions_insert: 10
repeat_count: 3
num_records_insert: 5000
type: BulkInsertNode
deps: none
first_validate:
config:
validate_hive: false
delete_input_data: false
type: ValidateDatasetNode
deps: first_bulk_insert
first_insert:
config:
record_size: 200
num_partitions_insert: 10
repeat_count: 3
num_records_insert: 5000
type: InsertNode
deps: first_validate
second_validate:
config:
validate_hive: false
delete_input_data: false
type: ValidateDatasetNode
deps: first_insert
last_validate:
config:
execute_itr_count: 5
delete_input_data: true
type: ValidateAsyncOperations
deps: second_validate
38 changes: 38 additions & 0 deletions docker/demo/config/test-suite/deltastreamer-pure-bulk-inserts.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF 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.
dag_name: deltastreamer-pure-bulk-inserts.yaml
dag_rounds: 10
dag_intermittent_delay_mins: 0
dag_content:
first_bulk_insert:
config:
record_size: 200
num_partitions_insert: 10
repeat_count: 3
num_records_insert: 5000
type: BulkInsertNode
deps: none
second_validate:
config:
validate_hive: false
delete_input_data: false
type: ValidateDatasetNode
deps: first_bulk_insert
last_validate:
config:
execute_itr_count: 10
type: ValidateAsyncOperations
deps: second_validate
38 changes: 38 additions & 0 deletions docker/demo/config/test-suite/deltastreamer-pure-inserts.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF 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.
dag_name: deltastreamer-pure-inserts.yaml
dag_rounds: 10
dag_intermittent_delay_mins: 0
dag_content:
first_insert:
config:
record_size: 200
num_partitions_insert: 10
repeat_count: 3
num_records_insert: 5000
type: InsertNode
deps: none
second_validate:
config:
validate_hive: false
delete_input_data: false
type: ValidateDatasetNode
deps: first_insert
last_validate:
config:
execute_itr_count: 10
type: ValidateAsyncOperations
deps: second_validate
3 changes: 1 addition & 2 deletions docker/demo/config/test-suite/insert-overwrite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ dag_name: simple-deltastreamer.yaml
dag_rounds: 1
dag_intermittent_delay_mins: 1
dag_content:

first_insert:
config:
record_size: 1000
Expand Down Expand Up @@ -91,4 +90,4 @@ dag_content:
validate_hive: false
delete_input_data: false
type: ValidateDatasetNode
deps: third_upsert
deps: third_upsert
2 changes: 1 addition & 1 deletion docker/demo/config/test-suite/multi-writer-1-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
dag_name: simple-deltastreamer.yaml
dag_rounds: 3
dag_rounds: 6
dag_intermittent_delay_mins: 0
dag_content:
first_insert:
Expand Down
52 changes: 52 additions & 0 deletions docker/demo/config/test-suite/multi-writer-1-sds.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF 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.
dag_name: cow-spark-simple.yaml
dag_rounds: 6
dag_intermittent_delay_mins: 0
dag_content:
first_insert:
config:
record_size: 1000
num_partitions_insert: 1
repeat_count: 1
num_records_insert: 100000
start_partition: 1
type: SparkInsertNode
deps: none
first_upsert:
config:
record_size: 1000
num_partitions_insert: 1
num_records_insert: 50000
repeat_count: 1
num_records_upsert: 50000
num_partitions_upsert: 1
start_partition: 1
type: SparkUpsertNode
deps: first_insert
first_delete:
config:
num_partitions_delete: 0
num_records_delete: 10000
start_partition: 1
type: SparkDeleteNode
deps: first_upsert
second_validate:
config:
validate_hive: false
delete_input_data: true
type: ValidateDatasetNode
deps: first_delete
4 changes: 2 additions & 2 deletions docker/demo/config/test-suite/multi-writer-2-sds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
dag_name: cow-spark-simple.yaml
dag_rounds: 3
dag_intermittent_delay_mins: 0
dag_rounds: 5
dag_intermittent_delay_mins: 1
dag_content:
first_insert:
config:
Expand Down
52 changes: 52 additions & 0 deletions docker/demo/config/test-suite/multi-writer-3-sds.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF 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.
dag_name: cow-spark-simple.yaml
dag_rounds: 4
dag_intermittent_delay_mins: 1
dag_content:
first_insert:
config:
record_size: 1000
num_partitions_insert: 1
repeat_count: 1
num_records_insert: 100000
start_partition: 20
type: SparkInsertNode
deps: none
first_upsert:
config:
record_size: 1000
num_partitions_insert: 1
num_records_insert: 50000
repeat_count: 1
num_records_upsert: 50000
num_partitions_upsert: 1
start_partition: 20
type: SparkUpsertNode
deps: first_insert
first_delete:
config:
num_partitions_delete: 0
num_records_delete: 10000
start_partition: 20
type: SparkDeleteNode
deps: first_upsert
second_validate:
config:
validate_hive: false
delete_input_data: true
type: ValidateDatasetNode
deps: first_delete
52 changes: 52 additions & 0 deletions docker/demo/config/test-suite/multi-writer-4-sds.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF 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.
dag_name: cow-spark-simple.yaml
dag_rounds: 4
dag_intermittent_delay_mins: 1
dag_content:
first_insert:
config:
record_size: 1000
num_partitions_insert: 1
repeat_count: 1
num_records_insert: 100000
start_partition: 30
type: SparkInsertNode
deps: none
first_upsert:
config:
record_size: 1000
num_partitions_insert: 1
num_records_insert: 50000
repeat_count: 1
num_records_upsert: 50000
num_partitions_upsert: 1
start_partition: 30
type: SparkUpsertNode
deps: first_insert
first_delete:
config:
num_partitions_delete: 0
num_records_delete: 10000
start_partition: 30
type: SparkDeleteNode
deps: first_upsert
second_validate:
config:
validate_hive: false
delete_input_data: true
type: ValidateDatasetNode
deps: first_delete
Loading

0 comments on commit ee3559c

Please sign in to comment.