Skip to content

JiT SQLX support #2087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ikholopov-omni wants to merge 1 commit into
base: main
Choose a base branch
from
Open

JiT SQLX support #2087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 156 additions & 0 deletions core/actions/incremental_table_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,5 +982,161 @@ select \${incremental()} as is_incremental`
expect(result.compile.compiledGraph.graphErrors.compilationErrors.length).greaterThan(0);
expect(result.compile.compiledGraph.graphErrors.compilationErrors.some(e => e.message.includes("Cannot mix AoT and JiT compilation"))).equals(true);
});

test("jit compilation is supported in sqlx", () => {
const projectDir = tmpDirFixture.createNewTmpDir();
fs.writeFileSync(path.join(projectDir, "workflow_settings.yaml"), VALID_WORKFLOW_SETTINGS_YAML);
fs.mkdirSync(path.join(projectDir, "definitions"));
fs.writeFileSync(
path.join(projectDir, "definitions/incremental.sqlx"),
`config { type: "incremental", compilation_mode: "jit" }
js {
const foo = "bar";
}
SELECT 1
\${when(incremental(), "WHERE 1=1")}`
);

const result = runMainInVm(coreExecutionRequestFromPath(projectDir));

expect(result.compile.compiledGraph.graphErrors.compilationErrors).deep.equals([]);
expect(asPlainObject(result.compile.compiledGraph.tables)).deep.equals([
{
target: {
database: "defaultProject",
schema: "defaultDataset",
name: "incremental"
},
canonicalTarget: {
database: "defaultProject",
schema: "defaultDataset",
name: "incremental"
},
type: "incremental",
enumType: "INCREMENTAL",
disabled: false,
protected: false,
hermeticity: "NON_HERMETIC",
onSchemaChange: "IGNORE",
fileName: "definitions/incremental.sqlx",
jitCode: `async (jctx) => {
const self = jctx.self ? jctx.self.bind(jctx) : undefined;
const ref = jctx.ref ? jctx.ref.bind(jctx) : undefined;
const resolve = jctx.resolve ? jctx.resolve.bind(jctx) : undefined;
const name = jctx.name ? jctx.name.bind(jctx) : undefined;
const when = jctx.when ? jctx.when.bind(jctx) : undefined;
const incremental = jctx.incremental ? jctx.incremental.bind(jctx) : undefined;
const schema = jctx.schema ? jctx.schema.bind(jctx) : undefined;
const database = jctx.database ? jctx.database.bind(jctx) : undefined;
const adapter = jctx.adapter ? jctx.adapter : undefined;
const data = jctx.data ? jctx.data : undefined;

const foo = "bar";

return {
query: (
\`

SELECT 1
\${when(incremental(), "WHERE 1=1")}\`
),
postOps: (
undefined
),
preOps: (
undefined
),
};
}`,
actionDescriptor: {
compilationMode: "ACTION_COMPILATION_MODE_JIT"
}
}
]);
});

test("jit compilation with pre/post ops is supported in sqlx", () => {
const projectDir = tmpDirFixture.createNewTmpDir();
fs.writeFileSync(path.join(projectDir, "workflow_settings.yaml"), VALID_WORKFLOW_SETTINGS_YAML);
fs.mkdirSync(path.join(projectDir, "definitions"));
fs.writeFileSync(
path.join(projectDir, "definitions/incremental.sqlx"),
`config { type: "incremental", compilation_mode: "jit" }
js {
const foo = "bar";
}
SELECT 1
\${when(incremental(), "WHERE 1=1")};
pre_operations {
SELECT 10;
}
post_operations {
SELECT 20;
}`
);

const result = runMainInVm(coreExecutionRequestFromPath(projectDir));

expect(result.compile.compiledGraph.graphErrors.compilationErrors).deep.equals([]);
expect(asPlainObject(result.compile.compiledGraph.tables)).deep.equals([
{
target: {
database: "defaultProject",
schema: "defaultDataset",
name: "incremental"
},
canonicalTarget: {
database: "defaultProject",
schema: "defaultDataset",
name: "incremental"
},
type: "incremental",
enumType: "INCREMENTAL",
disabled: false,
protected: false,
hermeticity: "NON_HERMETIC",
onSchemaChange: "IGNORE",
fileName: "definitions/incremental.sqlx",
jitCode: `async (jctx) => {
const self = jctx.self ? jctx.self.bind(jctx) : undefined;
const ref = jctx.ref ? jctx.ref.bind(jctx) : undefined;
const resolve = jctx.resolve ? jctx.resolve.bind(jctx) : undefined;
const name = jctx.name ? jctx.name.bind(jctx) : undefined;
const when = jctx.when ? jctx.when.bind(jctx) : undefined;
const incremental = jctx.incremental ? jctx.incremental.bind(jctx) : undefined;
const schema = jctx.schema ? jctx.schema.bind(jctx) : undefined;
const database = jctx.database ? jctx.database.bind(jctx) : undefined;
const adapter = jctx.adapter ? jctx.adapter : undefined;
const data = jctx.data ? jctx.data : undefined;

const foo = "bar";

return {
query: (
\`

SELECT 1
\${when(incremental(), "WHERE 1=1")};

\`
),
postOps: (
[\`
SELECT 20;
\`]
),
preOps: (
[\`
SELECT 10;
\`]
),
};
}`,
actionDescriptor: {
compilationMode: "ACTION_COMPILATION_MODE_JIT"
}
}
]);
});
});
});
63 changes: 63 additions & 0 deletions core/actions/operation_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,5 +255,68 @@ actions:
expect(result.compile.compiledGraph.graphErrors.compilationErrors.length).greaterThan(0);
expect(result.compile.compiledGraph.graphErrors.compilationErrors.some(e => e.message.includes("Cannot mix AoT and JiT compilation"))).equals(true);
});

test("jit compilation is supported in sqlx", () => {
const projectDir = tmpDirFixture.createNewTmpDir();
fs.writeFileSync(path.join(projectDir, "workflow_settings.yaml"), VALID_WORKFLOW_SETTINGS_YAML);
fs.mkdirSync(path.join(projectDir, "definitions"));
fs.writeFileSync(
path.join(projectDir, "definitions/op.sqlx"),
`config { type: "operations", compilation_mode: "jit" }
js {
const foo = "bar";
}
SELECT 1
---
SELECT 2`
);

const result = runMainInVm(coreExecutionRequestFromPath(projectDir));

expect(result.compile.compiledGraph.graphErrors.compilationErrors).deep.equals([]);
expect(asPlainObject(result.compile.compiledGraph.operations)).deep.equals([
{
target: {
database: "defaultProject",
schema: "defaultDataset",
name: "op"
},
canonicalTarget: {
database: "defaultProject",
schema: "defaultDataset",
name: "op"
},
hermeticity: "NON_HERMETIC",
fileName: "definitions/op.sqlx",
jitCode: `async (jctx) => {
const self = jctx.self ? jctx.self.bind(jctx) : undefined;
const ref = jctx.ref ? jctx.ref.bind(jctx) : undefined;
const resolve = jctx.resolve ? jctx.resolve.bind(jctx) : undefined;
const name = jctx.name ? jctx.name.bind(jctx) : undefined;
const when = jctx.when ? jctx.when.bind(jctx) : undefined;
const incremental = jctx.incremental ? jctx.incremental.bind(jctx) : undefined;
const schema = jctx.schema ? jctx.schema.bind(jctx) : undefined;
const database = jctx.database ? jctx.database.bind(jctx) : undefined;
const adapter = jctx.adapter ? jctx.adapter : undefined;
const data = jctx.data ? jctx.data : undefined;

const foo = "bar";

return {
queries: [
\`

SELECT 1
\`,\`
SELECT 2\`
],
};
}`,
actionDescriptor: {
compilationMode: "ACTION_COMPILATION_MODE_JIT"
}
}
]);
});
});
});
148 changes: 148 additions & 0 deletions core/actions/table_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,5 +839,153 @@ defaultIcebergConfig:
expect(result.compile.compiledGraph.graphErrors.compilationErrors.length).greaterThan(0);
expect(result.compile.compiledGraph.graphErrors.compilationErrors.some(e => e.message.includes("Cannot mix AoT and JiT compilation"))).equals(true);
});

test("jit compilation is supported in sqlx", () => {
const projectDir = tmpDirFixture.createNewTmpDir();
fs.writeFileSync(path.join(projectDir, "workflow_settings.yaml"), VALID_WORKFLOW_SETTINGS_YAML);
fs.mkdirSync(path.join(projectDir, "definitions"));
fs.writeFileSync(
path.join(projectDir, "definitions/table.sqlx"),
`config { type: "table", compilation_mode: "jit" }
js {
const foo = "bar";
}
SELECT 1`
);

const result = runMainInVm(coreExecutionRequestFromPath(projectDir));

expect(result.compile.compiledGraph.graphErrors.compilationErrors).deep.equals([]);
expect(asPlainObject(result.compile.compiledGraph.tables)).deep.equals([
{
target: {
database: "defaultProject",
schema: "defaultDataset",
name: "table"
},
canonicalTarget: {
database: "defaultProject",
schema: "defaultDataset",
name: "table"
},
type: "table",
enumType: "TABLE",
disabled: false,
hermeticity: "NON_HERMETIC",
fileName: "definitions/table.sqlx",
jitCode: `async (jctx) => {
const self = jctx.self ? jctx.self.bind(jctx) : undefined;
const ref = jctx.ref ? jctx.ref.bind(jctx) : undefined;
const resolve = jctx.resolve ? jctx.resolve.bind(jctx) : undefined;
const name = jctx.name ? jctx.name.bind(jctx) : undefined;
const when = jctx.when ? jctx.when.bind(jctx) : undefined;
const incremental = jctx.incremental ? jctx.incremental.bind(jctx) : undefined;
const schema = jctx.schema ? jctx.schema.bind(jctx) : undefined;
const database = jctx.database ? jctx.database.bind(jctx) : undefined;
const adapter = jctx.adapter ? jctx.adapter : undefined;
const data = jctx.data ? jctx.data : undefined;

const foo = "bar";

return {
query: (
\`

SELECT 1\`
),
postOps: (
undefined
),
preOps: (
undefined
),
};
}`,
actionDescriptor: {
compilationMode: "ACTION_COMPILATION_MODE_JIT"
}
}
]);
});

test("jit compilation with pre/post ops is supported in sqlx", () => {
const projectDir = tmpDirFixture.createNewTmpDir();
fs.writeFileSync(path.join(projectDir, "workflow_settings.yaml"), VALID_WORKFLOW_SETTINGS_YAML);
fs.mkdirSync(path.join(projectDir, "definitions"));
fs.writeFileSync(
path.join(projectDir, "definitions/table.sqlx"),
`config { type: "table", compilation_mode: "jit" }
js {
const foo = "bar";
}
SELECT 1
pre_operations {
SELECT 10;
}
post_operations {
SELECT 20;
}`
);

const result = runMainInVm(coreExecutionRequestFromPath(projectDir));

expect(result.compile.compiledGraph.graphErrors.compilationErrors).deep.equals([]);
expect(asPlainObject(result.compile.compiledGraph.tables)).deep.equals([
{
target: {
database: "defaultProject",
schema: "defaultDataset",
name: "table"
},
canonicalTarget: {
database: "defaultProject",
schema: "defaultDataset",
name: "table"
},
type: "table",
enumType: "TABLE",
disabled: false,
hermeticity: "NON_HERMETIC",
fileName: "definitions/table.sqlx",
jitCode: `async (jctx) => {
const self = jctx.self ? jctx.self.bind(jctx) : undefined;
const ref = jctx.ref ? jctx.ref.bind(jctx) : undefined;
const resolve = jctx.resolve ? jctx.resolve.bind(jctx) : undefined;
const name = jctx.name ? jctx.name.bind(jctx) : undefined;
const when = jctx.when ? jctx.when.bind(jctx) : undefined;
const incremental = jctx.incremental ? jctx.incremental.bind(jctx) : undefined;
const schema = jctx.schema ? jctx.schema.bind(jctx) : undefined;
const database = jctx.database ? jctx.database.bind(jctx) : undefined;
const adapter = jctx.adapter ? jctx.adapter : undefined;
const data = jctx.data ? jctx.data : undefined;

const foo = "bar";

return {
query: (
\`

SELECT 1

\`
),
postOps: (
[\`
SELECT 20;
\`]
),
preOps: (
[\`
SELECT 10;
\`]
),
};
}`,
actionDescriptor: {
compilationMode: "ACTION_COMPILATION_MODE_JIT"
}
}
]);
});
});
});
Loading
Loading