Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
Signed-off-by: xxchan <xxchan22f@gmail.com>
  • Loading branch information
xxchan committed Dec 12, 2024
1 parent 0e436c2 commit 78648e3
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 26 deletions.
5 changes: 0 additions & 5 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,6 @@ do
exit 1
fi
done
if (( "$(du -sk ${PREFIX_LOG} | cut -f1)" > 4000 )) ; then
echo "$(tput setaf 1)ERROR: log size is significantly large ($(du -sh ${PREFIX_LOG} | cut -f1)).$(tput sgr0) Please disable unnecessary logs."
exit 1
fi
'''

[tasks.doc]
Expand Down
4 changes: 2 additions & 2 deletions ci/scripts/e2e-source-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ python3 -m pip install --break-system-packages requests protobuf fastavro conflu
apt-get -y install jq

echo "--- e2e, inline test"
RUST_LOG="debug,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info,risingwave_meta=info" \
RUST_LOG="debug,risingwave_stream=debug,risingwave_batch=info,risingwave_storage=info,risingwave_meta=info,events::stream::message::chunk=trace \
risedev ci-start ci-inline-source-test
risedev slt './e2e_test/source_inline/**/*.slt' -j16
risedev slt './e2e_test/source_inline/**/*.slt.serial'
Expand Down Expand Up @@ -172,4 +172,4 @@ sleep 20
risedev slt "e2e_test/webhook/webhook_source_recovery.slt"
risedev ci-kill
echo "--- cluster killed "
echo "--- cluster killed "
14 changes: 0 additions & 14 deletions e2e_test/source_inline/kafka/protobuf/alter_source_shared.slt
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,10 @@ CREATE MATERIALIZED VIEW mv_user AS SELECT * FROM src_user;
statement ok
CREATE MATERIALIZED VIEW mv_user_2 AS SELECT * FROM src_user;

statement ok
CREATE TABLE t_user WITH (
${RISEDEV_KAFKA_WITH_OPTIONS_COMMON},
topic = 'pb_alter_source_shared_test',
scan.startup.mode = 'earliest'
)
FORMAT PLAIN ENCODE PROTOBUF(
schema.registry = '${RISEDEV_SCHEMA_REGISTRY_URL}',
message = 'test.User'
);

# age is new field
statement error
SELECT age FROM mv_user;

statement error
SELECT age FROM t_user;

# Push more events with extended fields
system ok
python3 e2e_test/source_inline/kafka/protobuf/pb.py "${RISEDEV_KAFKA_BOOTSTRAP_SERVERS}" "${RISEDEV_SCHEMA_REGISTRY_URL}" "pb_alter_source_shared_test" 5 user_with_more_fields
Expand Down
10 changes: 5 additions & 5 deletions src/utils/runtime/src/logger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -289,15 +289,15 @@ pub fn init_risingwave_logger(settings: LoggerSettings) {
});

let fmt_layer = match deployment {
Deployment::Ci => fmt_layer
.compact()
.with_filter(FilterFn::new(|metadata| metadata.is_event())) // filter-out all span-related info
.boxed(),
// Deployment::Ci => fmt_layer
// .compact()
// .with_filter(FilterFn::new(|metadata| metadata.is_event())) // filter-out all span-related info
// .boxed(),
Deployment::Cloud => fmt_layer
.json()
.map_event_format(|e| e.with_current_span(false)) // avoid duplication as there's a span list field
.boxed(),
Deployment::Other => {
Deployment::Ci | Deployment::Other => {
if env_var_is_true("ENABLE_PRETTY_LOG") {
fmt_layer.pretty().boxed()
} else {
Expand Down

0 comments on commit 78648e3

Please sign in to comment.