Skip to content

Commit

Permalink
Fix docker image build script
Browse files Browse the repository at this point in the history
  • Loading branch information
iduartgomez committed May 3, 2020
1 parent 4c064ce commit 80bbbbe
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion docker/build_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PACKAGE="vega:${VERSION}"
cd $SCRIPT_PATH && cd ..
echo "work dir: $(pwd)"

RUST_VERSION="$(cat ./rust-toolchain | tr -d '[:space:]')"
RUST_VERSION="nightly"
echo "rust version: $RUST_VERSION"

echo "building $PACKAGE..."
Expand Down
2 changes: 1 addition & 1 deletion docker/id_rsa.pub
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCcjmvyQT2FsdM795b3dGv3GGDGIsz7v6YsogfjQmEbGdpaXNtqyYIpp/VGyc5/ia1e2n85MAUO2mjWxrAHU6+4owl8q6enARG+/xC9a6vuWdsBNhWV6V/pYVJnPAi/v4t8+uPnAY+6KaMuUKSOYNsfu0r88tzIW5nXTS/yG24BryyMzDuLbWzLGpR6PCjxhsMKqn41WoomJ+GEfH2acz/0Le82fGxUSuukkQJoSXGA5aMFaOgTmhXlVKyN2b/+pbxThB9YAB7mTsevQrit+J+Xvz0SOD332CV79DIysWwx19kKjcVYsIt5wNrknCehxV+I4IZ3+1LT4arWe+j0STJ vega_user@a0e0c0941a35
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCcjmvyQT2FsdM795b3dGv3GGDGIsz7v6YsogfjQmEbGdpaXNtqyYIpp/VGyc5/ia1e2n85MAUO2mjWxrAHU6+4owl8q6enARG+/xC9a6vuWdsBNhWV6V/pYVJnPAi/v4t8+uPnAY+6KaMuUKSOYNsfu0r88tzIW5nXTS/yG24BryyMzDuLbWzLGpR6PCjxhsMKqn41WoomJ+GEfH2acz/0Le82fGxUSuukkQJoSXGA5aMFaOgTmhXlVKyN2b/+pbxThB9YAB7mTsevQrit+J+Xvz0SOD332CV79DIysWwx19kKjcVYsIt5wNrknCehxV+I4IZ3+1LT4arWe+j0STJ ns_user@a0e0c0941a35
2 changes: 1 addition & 1 deletion src/io/local_file_reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ impl LocalFsReaderConfig {

/// Number of partitions to use per executor to perform the load tasks.
/// One executor must be used per host with as many partitions as CPUs available (ideally).
pub fn num_partitiovega_per_executor(mut self, num: u64) -> Self {
pub fn num_partitions_per_executor(mut self, num: u64) -> Self {
self.executor_partitions = Some(num);
self
}
Expand Down
15 changes: 5 additions & 10 deletions src/rdd/rdd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1023,16 +1023,11 @@ pub trait Rdd: RddBase + 'static {
Box::new(std::iter::once(queue))
});

let queue = self
.map_partitions(first_k_func)
.reduce(Fn!(
move |queue1: BoundedPriorityQueue<Self::Item>,
queue2: BoundedPriorityQueue<Self::Item>|
-> BoundedPriorityQueue<Self::Item> {
queue1.merge(queue2)
}
))?
.unwrap() as BoundedPriorityQueue<Self::Item>;
let queue = self.map_partitions(first_k_func).reduce(Fn!(
move |queue1: BoundedPriorityQueue<Self::Item>,
queue2: BoundedPriorityQueue<Self::Item>|
-> BoundedPriorityQueue<Self::Item> { queue1.merge(queue2) }
))?.ok_or_else(|| Error::Other)? as BoundedPriorityQueue<Self::Item>;

Ok(queue.into())
}
Expand Down

0 comments on commit 80bbbbe

Please sign in to comment.