Merge remote-tracking branch 'upstream/master' into vertica_driver

Author: korowa

.github/workflows/examples-publish.yml

@@ -11,6 +11,58 @@ on:
 
 jobs:
 
+  clickhouse-multi-tenancy:
+    runs-on: ubuntu-20.04
+    timeout-minutes: 30
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: pheel/path-watcher-action@v1
+        id: modified
+        with:
+          paths: '.github/workflows/examples-publish.yml,.github/actions/deploy-example.sh,examples/building-an-open-source-data-stack-with-clickhouse-and-cube-workshop/*,examples/building-an-open-source-data-stack-with-clickhouse-and-cube-workshop/**'
+
+      - if: steps.modified.outputs.modified
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+
+      - if: steps.modified.outputs.modified
+        run: .github/actions/deploy-example.sh
+        env:
+          EXAMPLE_SLUG: building-an-open-source-data-stack-with-clickhouse-and-cube-workshop
+          EXAMPLE_FRONTEND_SUBDIRECTORY: dashboard-app-multi-tenancy
+          EXAMPLE_FRONTEND_BUILD_SUBDIRECTORY: dist/
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          EXAMPLE_CUBE_SKIP: 1
+
+  clickhouse-multiple-sources:
+    runs-on: ubuntu-20.04
+    timeout-minutes: 30
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: pheel/path-watcher-action@v1
+        id: modified
+        with:
+          paths: '.github/workflows/examples-publish.yml,.github/actions/deploy-example.sh,examples/building-an-open-source-data-stack-with-clickhouse-and-cube-workshop/*,examples/building-an-open-source-data-stack-with-clickhouse-and-cube-workshop/**'
+
+      - if: steps.modified.outputs.modified
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+
+      - if: steps.modified.outputs.modified
+        run: .github/actions/deploy-example.sh
+        env:
+          EXAMPLE_SLUG: building-an-open-source-data-stack-with-clickhouse-and-cube-workshop
+          EXAMPLE_FRONTEND_SUBDIRECTORY: dashboard-app-multiple-data-sources
+          EXAMPLE_FRONTEND_BUILD_SUBDIRECTORY: dist/
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          EXAMPLE_CUBE_SKIP: 1
+
   apollo-federation:
     runs-on: ubuntu-20.04
     timeout-minutes: 30

CHANGELOG.md

@@ -3,6 +3,37 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.31.3](https://github.com/cube-js/cube.js/compare/v0.31.2...v0.31.3) (2022-10-08)
+
+
+### Bug Fixes
+
+* drivers imports alignment ([#5448](https://github.com/cube-js/cube.js/issues/5448)) ([ab12426](https://github.com/cube-js/cube.js/commit/ab1242650ba0368b855176b9c6ca2d73073acf0e))
+
+
+
+
+
+## [0.31.2](https://github.com/cube-js/cube.js/compare/v0.31.1...v0.31.2) (2022-10-08)
+
+
+### Bug Fixes
+
+* Added connection test completed successfully log ([#5444](https://github.com/cube-js/cube.js/issues/5444)) ([a8e1180](https://github.com/cube-js/cube.js/commit/a8e1180d4c05e8de94b116f46f40db531d91e0eb))
+* Temp tables dropped for ksql after successfully created ([#5445](https://github.com/cube-js/cube.js/issues/5445)) ([7726c82](https://github.com/cube-js/cube.js/commit/7726c82fc833a6b14eeeb498a31df62ba9818336))
+* **cubesql:** Handle Panic on simple query executiony ([#5394](https://github.com/cube-js/cube.js/issues/5394)) ([84dc442](https://github.com/cube-js/cube.js/commit/84dc442eb1c42bc3c7b7b03fe365c7c0a948e328))
+
+
+### Features
+
+* **mssql-driver:** add column type mapping for a bit type ([#5442](https://github.com/cube-js/cube.js/issues/5442)) ([0ed7ba4](https://github.com/cube-js/cube.js/commit/0ed7ba4b483fff8653602f89f43bd1b03b458859))
+* Includes and Excludes directives for Cube Views ([#5437](https://github.com/cube-js/cube.js/issues/5437)) ([7c35604](https://github.com/cube-js/cube.js/commit/7c356049b56a0ea58a4ad8f2628ffaff2ac307d4))
+* **cubesql:** Support boolean decoding in pg-wire ([#5436](https://github.com/cube-js/cube.js/issues/5436)) ([4fd2ee6](https://github.com/cube-js/cube.js/commit/4fd2ee6cd238161f889896739a00f09e6dc11651))
+
+
+
+
+
 ## [0.31.1](https://github.com/cube-js/cube.js/compare/v0.31.0...v0.31.1) (2022-10-04)
 
 

docs/content/Configuration/Environment-Variables-Reference.md

@@ -20,7 +20,7 @@ options][link-config].
 | `CUBEJS_DEV_MODE`                      | If `true`, enables development mode. Defaults to `false`                                                                                                                         | `true`, `false`                                                                                                                   |
 | `CUBEJS_API_SECRET`                    | The secret key used to sign and verify JWTs. Generated on project scaffold                                                                                                       | A valid string                                                                                                                    |
 | `CUBEJS_APP`                           | An application ID used to uniquely identify the Cube.js deployment. Can be different for multitenant setups. Defaults to `cubejs`                                                | A valid string                                                                                                                    |
-| `CUBEJS_BUILD_PRE_AGGREGATIONS`        | If `true`, this instance of Cube will build pre-aggregations, even if it is an API instance. Defaults to `false`                                                                 | `true`, `false`                                                                                                                   |
+| `CUBEJS_PRE_AGGREGATIONS_BUILDER`        | If `true`, this instance of Cube will build pre-aggregations, even if it is an API instance. Defaults to `true` if it's refresh worker instance or instance which is in development mode. Defaults to `false` otherwise.                                                                 | `true`, `false`                                                                                                                   |
 | `CUBEJS_REFRESH_WORKER`                | If `true`, this instance of Cube.js will **only** refresh pre-aggregations. Defaults to `false`                                                                                  | `true`, `false`                                                                                                                   |
 | `CUBEJS_ROLLUP_ONLY`                   | If `true`, this instance of Cube.js will **only** query rollup pre-aggregations. Defaults to `false`                                                                             | `true`, `false`                                                                                                                   |
 | `CUBEJS_SCHEDULED_REFRESH_TIMEZONES`   | A comma-separated [list of timezones to schedule refreshes for][ref-config-sched-refresh-timer].                                                                                 | [A valid timezone from the tz database][link-tz-database]                                                                         |

docs/src/pages/index.tsx

@@ -32,7 +32,7 @@ class IndexPage extends Component<Props> {
           <meta name="description" content={"Main | Documentation for working with Cube, the open-source analytics framework"}></meta>
         </Helmet>
         <h1>Documentation</h1>
-        
+
         <Row>
           <Col span={24}>
             <p>
@@ -83,7 +83,7 @@ class IndexPage extends Component<Props> {
               title="Deployment"
               img={imgInsights}
               desc="Deploying your application to Cube Cloud, a public cloud, or on-premise"
-              to="/deployment"
+              to="/deployment/overview"
               right
             />
           </Row>

examples/building-an-open-source-data-stack-with-clickhouse-and-cube-workshop/cube.js

@@ -14,11 +14,11 @@
 // const clickhouseDatabase = process.env.CUBEJS_DB_NAME;
 // const clickhouseUser     = process.env.CUBEJS_DB_USER;
 // const clickhousePassword = process.env.CUBEJS_DB_PASS;
-// const mysqlHost      = 'demo-mysql-rhodges.czuu1tdfcpyt.us-east-1.rds.amazonaws.com';
-// const mysqlPort      = '3306';
-// const mysqlDatabase  = 'test';
-// const mysqlUser      = 'admin';
-// const mysqlPassword  = 'YIDrkjMThI9ZHtdOfjj7';
+// const mysqlHost          = '<host>';
+// const mysqlPort          = '3306';
+// const mysqlDatabase      = '<db>';
+// const mysqlUser          = '<user>';
+// const mysqlPassword      = '<pass>';
 
 module.exports = {
   /**
@@ -67,7 +67,7 @@ module.exports = {
 
   //   if (securityContext.dataSource === 'mysql') {
   //     return {
-  //       type: 'postgres', // replace with mysql once we get an endpoint
+  //       type: 'mysql',
   //       database: mysqlDatabase,
   //       host: mysqlHost,
   //       user: mysqlUser,

examples/building-an-open-source-data-stack-with-clickhouse-and-cube-workshop/dashboard-app-multi-tenancy/.netlify/state.json

@@ -0,0 +1,3 @@
+{
+	"siteId": "54de7f02-f32e-427e-a500-9206e10f38aa"
+}

examples/building-an-open-source-data-stack-with-clickhouse-and-cube-workshop/dashboard-app-multi-tenancy/src/components/BarChart.jsx

@@ -22,7 +22,7 @@ const BarChart = ({ data /* see data tab */ }) => {
       }}
       axisBottom={{
         format: value =>
-          ticksFormmater(20, value, data.chartPivot(), dateFormatter)
+          ticksFormmater(15, value, data.chartPivot(), dateFormatter)
       }}
       tooltip={({ id, value, color }) => (
         <strong style={{ color, backgroundColor: 'white', padding: '5px', borderRadius: '5px' }}>

examples/building-an-open-source-data-stack-with-clickhouse-and-cube-workshop/dashboard-app-multi-tenancy/src/index.js

@@ -9,7 +9,12 @@ import {
   defaultDataSourceId,
   dataSources,
   DisplayBarChart,
+  years,
+  months,
+  defaultYearId,
+  defaultMonthId,
   jsonQuery,
+  randomIntFromInterval,
 } from './utils/utils'
 
 ReactDOM
@@ -24,6 +29,17 @@ function App() {
   const [ dataSourceId, setDataSourceId ] = useState(defaultDataSourceId)
   const dataSource = dataSources.find(x => x.id === dataSourceId)
 
+  const [ yearId, setYearId ] = useState(defaultYearId)
+  const year = years.find(x => x.id === yearId)
+
+  const [ monthId, setMonthId ] = useState(defaultMonthId)
+  const month = months.find(x => x.id === monthId)
+
+  const shuffleAndRun = () => {
+    setYearId(randomIntFromInterval(1, 34))
+    setMonthId(randomIntFromInterval(1, 12))
+  }
+
   const cubejsApi = cubejs(
     dataSource.token,
     { apiUrl },
@@ -36,7 +52,7 @@ function App() {
 
     setOntimeBarData({})
     cubejsApi
-      .load(jsonQuery())
+      .load(jsonQuery({ year, month }))
       .then(setOntimeBarData)
       .then(() => {
         const end = Date.now()
@@ -46,12 +62,14 @@ function App() {
   }, [
     dataSource.token,
     apiUrl,
+    year.year,
+    month.id,
   ])
 
   return <>
-    <div style={{ display: 'flex', justifyContent: 'center' }}>
+    <div style={{ display: 'flex', justifyContent: 'center', padding: '0 0 20px 0' }}>
       <div style={{ display: 'flex', justifyContent: 'center' }}>
-        <label style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>Authorization token</label>
+        <label style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>Auth token</label>
         <textarea 
           readOnly
           value={dataSource.token}
@@ -73,13 +91,45 @@ function App() {
       </select>
     </div>
 
+    <div style={{ display: 'flex', justifyContent: 'center' }}>
+      <select
+        className={classes.select}
+        value={yearId}
+        onChange={e => setYearId(parseInt(e.target.value))}
+      >
+        <option value="" disabled>Select year...</option>
+        {years.map(year => (
+          <option key={year.id} value={year.id}>
+            {year.year}
+          </option>
+        ))}
+      </select>
+      <select
+        className={classes.select}
+        value={monthId}
+        onChange={e => setMonthId(parseInt(e.target.value))}
+      >
+        <option value="" disabled>Select month...</option>
+        {months.map(month => (
+          <option key={month.id} value={month.id}>
+            {month.month}
+          </option>
+        ))}
+      </select>
+      <div className={`${classes.buttonwrp}`}>
+        <button className={`Button Button--size-s Button--pink`} onClick={shuffleAndRun}>
+          Shuffle and Run!
+        </button>
+      </div>
+    </div>
+
     <div style={{ display: 'flex', justifyContent: 'center' }}>
       <table style={{ width: '80%' }}>
         <tbody>
           <tr>
             <td style={{ width: '100%' }}>
               <div style={{ height: '375px', margin: '20px 0' }}>
-                <h3 style={{display: 'flex', justifyContent: 'center'}}>{ (timer.responseTime / 1000) || '...' } seconds</h3>
+                <h3 style={{display: 'flex', justifyContent: 'center'}}>{ (timer.responseTime) ? `${timer.responseTime / 1000} seconds` : '' }</h3>
                 <DisplayBarChart
                   chartData={ontimeBarData}
                 />

examples/building-an-open-source-data-stack-with-clickhouse-and-cube-workshop/dashboard-app-multi-tenancy/src/utils/utils.js

@@ -13,13 +13,71 @@ export const ticksFormmater = (ticksCount, value, data, dateFormatter) => {
   return ""
 }
 export const numberFormatter = (item) => numeral(item/100).format("0%")
-export const dateFormatter = (item) => moment(item).format("YYYY")
+export const dateFormatter = (item) => moment(item).format("DD")
 export const colors = ["#7DB3FF", "#49457B", "#FF7C78"]
 
 const isEmpty = (obj) => Object.keys(obj).length === 0
 
+export const randomIntFromInterval = (min, max) => { 
+  return Math.floor(Math.random() * (max - min + 1) + min)
+}
+
+export const years = [
+  { id: 1, year: 1988 },
+  { id: 2, year: 1989 },
+  { id: 3, year: 1990 },
+  { id: 4, year: 1991 },
+  { id: 5, year: 1992 },
+  { id: 6, year: 1993 },
+  { id: 7, year: 1994 },
+  { id: 8, year: 1995 },
+  { id: 9, year: 1996 },
+  { id: 10, year: 1997 },
+  { id: 11, year: 1998 },
+  { id: 12, year: 1999 },
+  { id: 13, year: 2000 },
+  { id: 14, year: 2001 },
+  { id: 15, year: 2002 },
+  { id: 16, year: 2003 },
+  { id: 17, year: 2004 },
+  { id: 18, year: 2005 },
+  { id: 19, year: 2006 },
+  { id: 20, year: 2007 },
+  { id: 21, year: 2008 },
+  { id: 22, year: 2009 },
+  { id: 23, year: 2010 },
+  { id: 24, year: 2011 },
+  { id: 25, year: 2012 },
+  { id: 26, year: 2013 },
+  { id: 27, year: 2014 },
+  { id: 28, year: 2015 },
+  { id: 29, year: 2016 },
+  { id: 30, year: 2017 },
+  { id: 31, year: 2018 },
+  { id: 32, year: 2019 },
+  { id: 33, year: 2020 },
+  { id: 34, year: 2021 },
+];
+
+export const months = [
+  { id: 1, month: 'January', end: 31 },
+  { id: 2, month: 'February', end: 28 },
+  { id: 3, month: 'March', end: 31 },
+  { id: 4, month: 'April', end: 30 },
+  { id: 5, month: 'May', end: 31 },
+  { id: 6, month: 'June', end: 30 },
+  { id: 7, month: 'July', end: 31 },
+  { id: 8, month: 'August', end: 31 },
+  { id: 9, month: 'September', end: 30 },
+  { id: 10, month: 'October', end: 31 },
+  { id: 11, month: 'November', end: 30 },
+  { id: 12, month: 'December', end: 31 },
+];
+
 const defaultJwtSecret = '1c7548fdc11622f711fd0113139feefc4cbd88826d3107b29b4950b0b1df159c'
 export const defaultDataSourceId = 1
+export const defaultYearId = 1
+export const defaultMonthId = 1
 /** OSS Cube */
 // const defaultApiUrl = 'http://localhost:4000/cubejs-api/v1'
 /** Cube Cloud */
@@ -39,12 +97,16 @@ export const dataSources = [
   }, jwtSecret),
 }))
 
-export const jsonQuery = () => ({
+export const jsonQuery = ({ year, month }) => ({
   measures: [ `Ontime.avgDepDelayGreaterThanTenMinutesPercentage` ],
-  timeDimensions: [ {
+  timeDimensions: [{
     dimension: `Ontime.flightdate`,
-    granularity: 'year',
-  } ],
+    granularity: 'day',
+    dateRange: [
+      `${year.year}-${month.id}-01`,
+      `${year.year}-${month.id}-${month.end}`
+    ]  
+  }]
 })
 
 export function DisplayBarChart({ chartData }) {

examples/building-an-open-source-data-stack-with-clickhouse-and-cube-workshop/dashboard-app-multiple-data-sources/.netlify/state.json

@@ -0,0 +1,3 @@
+{
+	"siteId": "7767f9e9-44b7-4a7f-b9d2-4fa1d84e93f8"
+}