diff --git a/Docker/DeployKinesisConsumerDockerfile b/Docker/DeployKinesisConsumerDockerfile index 17860f3..b403e2f 100644 --- a/Docker/DeployKinesisConsumerDockerfile +++ b/Docker/DeployKinesisConsumerDockerfile @@ -1,6 +1,6 @@ # quanta-kinesis-consumer within a Docker Container -FROM alpine:latest +FROM containerregistry.disney.com/digital/quanta-alpine:3.18 ARG arch ARG platform @@ -11,13 +11,6 @@ LABEL version="1.0.0" \ description="Builds Generic Docker image for use in production deployment of Quanta Kinesis Consumer" \ repository="https://github.com/disney/quanta" -# Update -RUN apk update -RUN apk upgrade -RUN apk add --no-cache --update alpine-sdk - -# clean apk cache -RUN rm -rf /var/cache/apk/* COPY ./bin/quanta-kinesis-consumer-"$platform"-"$arch" /usr/bin/quanta-kinesis-consumer COPY ./Docker/kinesis_entrypoint.sh /usr/bin/entrypoint.sh diff --git a/Docker/DeployLoaderDockerfile b/Docker/DeployLoaderDockerfile index c857242..260f50e 100644 --- a/Docker/DeployLoaderDockerfile +++ b/Docker/DeployLoaderDockerfile @@ -1,6 +1,6 @@ # quanta-loader within a Docker Container -FROM alpine:latest +FROM containerregistry.disney.com/digital/quanta-alpine:3.18 ARG arch ARG platform @@ -11,14 +11,6 @@ LABEL version="1.0.0" \ description="Builds Generic Docker image for use in production deployment of Quanta Loader" \ repository="https://github.com/disney/quanta" -# Update -RUN apk update -RUN apk upgrade -RUN apk add --no-cache --update alpine-sdk -# clean apk cache -RUN rm -rf /var/cache/apk/* - - COPY ./bin/quanta-loader-"$platform"-"$arch" /usr/bin/quanta-loader COPY ./Docker/loader_entrypoint.sh /usr/bin/entrypoint.sh diff --git a/core/projector.go b/core/projector.go index 0704ad6..e6b9700 100644 --- a/core/projector.go +++ b/core/projector.go @@ -127,11 +127,14 @@ func NewProjection(s *Session, foundSets map[string]*roaring64.Bitmap, joinNames } u.Debugf("INNER JOIN = %v", innerJoin) - driverSet := p.foundSets[p.driverTable] + + driverSet := p.foundSets[p.driverTable].Clone() // For inner joins filter out any rows in the driver table not in fkBSI link - if innerJoin && !negate { - for _, v := range p.fkBSI { - driverSet.And(v.GetExistenceBitmap()) + if innerJoin { + if !negate { + for _, v := range p.fkBSI { + driverSet.And(v.GetExistenceBitmap()) + } } } // filter out entries from driver found set not contained within FKBSIs @@ -159,6 +162,8 @@ func NewProjection(s *Session, foundSets map[string]*roaring64.Bitmap, joinNames // Anti-join if negate { filterSet.AndNot(newSet) + driverSet = v.Clone() + driverSet.AndNot(newSet) } else { filterSet.And(newSet) } diff --git a/version.txt b/version.txt index ec04685..7ae5b90 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -quanta 0.9.11-rc-3 +quanta 0.9.11-rc-4