Skip to content

Commit

Permalink
Merge f70f1cf into 3dad488
Browse files Browse the repository at this point in the history
  • Loading branch information
mfelsche committed Jan 27, 2021
2 parents 3dad488 + f70f1cf commit 4269a51
Show file tree
Hide file tree
Showing 30 changed files with 1,311 additions and 142 deletions.
2 changes: 1 addition & 1 deletion .github/checks/safety.sh
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ while getopts hauiprebldxcft opt; do
do
if sed -e '/mod test.*/,$d' -e '/ALLOW: /{N;d;}' "$file" | grep 'expect(' > /dev/null
then
echo "##[error] expect found in $file try hygenic errors, this panics!"
echo "##[error] expect found in $file try hygienic errors, this panics!"
count=$((count + 1))
fi
done
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ jobs:
- ubuntu-latest
#- windows-latest
- macOS-latest
include:
- os: "macOS-latest"
exclude_tests: "--excludes docker"
- os: "ubuntu-latest"
exclude_tests: ""
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v1
Expand All @@ -27,13 +32,13 @@ jobs:
- name: Build test runner
run: cargo build -p tremor-cli
- name: Run Integration Tests
run: TREMOR_PATH="$GITHUB_WORKSPACE/tremor-script/lib" cargo run -p tremor-cli -- test integration tremor-cli/tests
run: TREMOR_PATH="$GITHUB_WORKSPACE/tremor-script/lib" cargo run -p tremor-cli -- test integration tremor-cli/tests ${{ matrix.exclude_tests }}
- name: Run API Tests
run: TREMOR_PATH="$GITHUB_WORKSPACE/tremor-script/lib" cargo run -p tremor-cli -- test api tremor-cli/tests
run: TREMOR_PATH="$GITHUB_WORKSPACE/tremor-script/lib" cargo run -p tremor-cli -- test api tremor-cli/tests ${{ matrix.exclude_tests }}
- name: Run Unit Tests
run: TREMOR_PATH="$GITHUB_WORKSPACE/tremor-script/lib" cargo run -p tremor-cli -- test unit tremor-cli/tests
run: TREMOR_PATH="$GITHUB_WORKSPACE/tremor-script/lib" cargo run -p tremor-cli -- test unit tremor-cli/tests ${{ matrix.exclude_tests }}
- name: Run Command Tests
run: TREMOR_PATH="$GITHUB_WORKSPACE/tremor-script/lib" cargo run -p tremor-cli -- test command tremor-cli/tests
run: TREMOR_PATH="$GITHUB_WORKSPACE/tremor-script/lib" cargo run -p tremor-cli -- test command tremor-cli/tests ${{ matrix.exclude_tests }}
- name: Upload error logs
uses: actions/upload-artifact@v2
if: failure()
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* Default to thin-lto for all builds (prior this was only done in docker)
* Automatically generate rpms and tarballs for releases.
* Update rust to 1.49.0
* elastic sink now supports linked transports [#715](https://github.com/tremor-rs/tremor-runtime/pull/715)

## 0.9.4

Expand Down
10 changes: 7 additions & 3 deletions src/codec/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,13 @@ impl Codec for JSON {
let new_len = max(self.string_buffer.capacity(), data.len()) * 2;
self.string_buffer.reserve(new_len);
}
tremor_value::to_value_with_buffers(data, &mut self.input_buffer, &mut self.string_buffer)
.map(Some)
.map_err(|e| e.into())
tremor_value::parse_to_value_with_buffers(
data,
&mut self.input_buffer,
&mut self.string_buffer,
)
.map(Some)
.map_err(|e| e.into())
}
fn encode(&self, data: &Value) -> Result<Vec<u8>> {
let mut v = Vec::with_capacity(1024);
Expand Down
Loading

0 comments on commit 4269a51

Please sign in to comment.