Skip to content

Commit 7a11a56

Browse files
committed
revert to codeGen-specific parameters
1 parent da934bf commit 7a11a56

4 files changed

Lines changed: 11 additions & 6 deletions

File tree

code_generator_raw_uproot/servicex/raw_uproot_code_generator/request_translator.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ def generate_code(self, query, cache_path: str):
5353
f"specified for query {subquery}")
5454

5555
generated_code = f'''
56+
import os
57+
os.environ['COMPRESSION_ALGORITHM'] = '{os.environ['COMPRESSION_ALGORITHM']}'
58+
os.environ['COMPRESSION_LEVEL'] = '{os.environ['COMPRESSION_LEVEL']}'
59+
5660
def run_query(file_path):
5761
jquery = {jquery}
5862

helm/servicex/templates/app/configmap.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ data:
118118
TRANSFORMER_PERSISTENCE_PROVIDED_CLAIM = "{{ .Values.transformer.persistence.existingClaim }}"
119119
TRANSFORMER_PERSISTENCE_SUBDIR = "{{ .Values.transformer.persistence.subdir}}"
120120
121-
TRANSFORMER_COMPRESSION_ALGORITHM = "{{ .Values.transformer.compressionAlgorithm }}"
122-
TRANSFORMER_COMPRESSION_LEVEL = "{{ .Values.transformer.compressionLevel }}"
123121
124122
{{ if .Values.objectStore.enabled }}
125123
OBJECT_STORE_ENABLED = True

helm/servicex/templates/codegen/deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ spec:
2424
value: {{ $.Release.Name }}
2525
- name: TRANSFORMER_SCIENCE_IMAGE
2626
value: {{ .defaultScienceContainerImage }}:{{ .defaultScienceContainerTag }}
27+
- name: TRANSFORMER_COMPRESSION_ALGORITHM
28+
value: {{ .compressionAlgorithm }}
29+
- name: TRANSFORMER_COMPRESSION_LEVEL
30+
value: {{ .compressionLevel }}
2731
tty: true
2832
stdin: true
2933
imagePullPolicy: {{ .pullPolicy }}

helm/servicex/values.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ codeGen:
4040
tag: develop
4141
defaultScienceContainerImage: sslhep/servicex_func_adl_uproot_transformer
4242
defaultScienceContainerTag: 5.6.1
43+
compressionAlgorithm: ZSTD
44+
compressionLevel: 5
45+
4346

4447
uproot:
4548
enabled: true
@@ -186,10 +189,6 @@ transformer:
186189
subdir: null
187190
priorityClassName: null
188191

189-
# applied only in uproot-raw code generator
190-
compressionAlgorithm: ZSTD
191-
compressionLevel: 5
192-
193192
x509Secrets:
194193
image: sslhep/x509-secrets
195194
initImage: alpine:3.6

0 commit comments

Comments
 (0)