Skip to content

Commit 63c63e7

Browse files
Merge branch 'master' into modules_topic
2 parents 678325c + 43553a1 commit 63c63e7

32 files changed

+104
-230
lines changed

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/convert.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ internal fun Instant.toLocalDate(zone: TimeZone = defaultTimeZone) = toLocalDate
725725

726726
internal fun Instant.toLocalTime(zone: TimeZone = defaultTimeZone) = toLocalDateTime(zone).time
727727

728-
internal val defaultTimeZone = TimeZone.currentSystemDefault()
728+
internal val defaultTimeZone get() = TimeZone.currentSystemDefault()
729729

730730
internal fun Number.toBigDecimal(): BigDecimal =
731731
when (this) {

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/convert.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ internal fun Instant.toLocalDate(zone: TimeZone = defaultTimeZone) = toLocalDate
725725

726726
internal fun Instant.toLocalTime(zone: TimeZone = defaultTimeZone) = toLocalDateTime(zone).time
727727

728-
internal val defaultTimeZone = TimeZone.currentSystemDefault()
728+
internal val defaultTimeZone get() = TimeZone.currentSystemDefault()
729729

730730
internal fun Number.toBigDecimal(): BigDecimal =
731731
when (this) {

docs/StardustDocs/c.list

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<!DOCTYPE categories
33
SYSTEM "https://resources.jetbrains.com/writerside/1.0/categories.dtd">
44
<categories>
5-
5+
<category id="related" name="Related topics" order="1"/>
66
</categories>

docs/StardustDocs/d.tree

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,16 @@
2222
<toc-element topic="gettingStartedGradleAdvanced.md"/>
2323
<toc-element topic="Modules.md"/>
2424
</toc-element>
25-
<toc-element topic="overview.md">
26-
<toc-element topic="apiLevels.md">
27-
<toc-element topic="stringApi.md"/>
28-
<toc-element topic="extensionPropertiesApi.md"/>
25+
<toc-element topic="concepts.md" accepts-web-file-names="overview.html">
26+
<toc-element topic="apiLevels.md"/>
27+
<toc-element topic="types.md">
28+
<toc-element topic="DataFrame.md"/>
29+
<toc-element topic="DataColumn.md"/>
30+
<toc-element topic="DataRow.md"/>
2931
</toc-element>
3032
<toc-element topic="hierarchical.md"/>
33+
<toc-element topic="nanAndNa.md"/>
34+
<toc-element topic="numberUnification.md"/>
3135
<toc-element topic="schemas.md">
3236
<toc-element topic="schemasGradle.md"/>
3337
<toc-element topic="schemasJupyter.md"/>
@@ -37,20 +41,16 @@
3741
<toc-element topic="schemasImportSqlGradle.md"/>
3842
<toc-element topic="schemasImportOpenApiGradle.md"/>
3943
<toc-element topic="schemasImportOpenApiJupyter.md"/>
44+
<toc-element topic="DataSchemaGenerationGradle.md"/>
4045
</toc-element>
4146
</toc-element>
42-
<toc-element topic="types.md">
43-
<toc-element topic="DataFrame.md"/>
44-
<toc-element topic="DataColumn.md"/>
45-
<toc-element topic="DataRow.md"/>
46-
</toc-element>
47+
<toc-element topic="extensionPropertiesApi.md"/>
48+
<toc-element topic="DataSchemaGenerationMethods.md"/>
4749
<toc-element topic="Compiler-Plugin.md">
4850
<toc-element topic="staticInterpretation.md"/>
4951
<toc-element topic="dataSchema.md"/>
5052
<toc-element topic="compilerPluginExamples.md"/>
5153
</toc-element>
52-
<toc-element topic="nanAndNa.md"/>
53-
<toc-element topic="numberUnification.md"/>
5454
<toc-element topic="operations.md">
5555
<toc-element topic="create.md">
5656
<toc-element topic="createColumn.md" toc-title="DataColumn"/>
@@ -200,8 +200,6 @@
200200
<toc-element topic="jupyterRendering.md"/>
201201
</toc-element>
202202
</toc-element>
203-
<toc-element topic="DataSchema-Data-Classes-Generation.md">
204-
<toc-element topic="gradleReference.md"/>
205-
</toc-element>
206203
<toc-element topic="_shadow_resources.md" hidden="true"/>
204+
<toc-element topic="Support.md"/>
207205
</instance-profile>
Lines changed: 1 addition & 0 deletions
Loading

docs/StardustDocs/topics/ColumnSelectors.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ For instance, excluding `userData.age`:
260260
`df.select { colsAtAnyDepth { "a" in it.name() } except userData.age }`
261261

262262
Note that the selection of columns to exclude from column sets is always done relative to the outer scope.
263-
Use the [Extension Properties API](extensionPropertiesApi.md) to prevent scoping issues if possible.
263+
Use the [Extension Properties API](concepts/extensionPropertiesApi.md) to prevent scoping issues if possible.
264264

265265
> Special case: If a column that needs to be removed appears multiple times in the [`ColumnSet`](#column-resolvers),
266266
> it is excepted each time it is encountered (including inside [Column Groups](DataColumn.md#columngroup)).
@@ -392,19 +392,19 @@ This function behaves the same as [`cols {}` and `[{}]`](ColumnSelectors.md#cols
392392
Creates a [`ColumnSet`](#column-resolvers) containing the columns from both the left and right side of the function. This allows
393393
you to combine selections or simply select multiple columns at once.
394394

395-
Any combination of [AccessApi](apiLevels.md) can be used on either side of the `and` operator.
395+
Any combination of [AccessApi](concepts/apiLevels.md) can be used on either side of the `and` operator.
396396

397397
Note, while you can write `col1 and col2 and col3...`, it may be more concise to use
398398
[`cols(col1, col2, col3...)`](ColumnSelectors.md#cols) instead. The only downside is that you can't mix
399-
[Access APIs](apiLevels.md) with that notation.
399+
[Access APIs](concepts/apiLevels.md) with that notation.
400400

401401
##### Rename {collapsible="true"}
402402
`colA named "colB"`, `colA into namedColAccessor`
403403

404404
Renaming a column in the Columns Selection DSL is done by calling the infix functions
405405
`named` or `into`.
406406
They behave exactly the same, so it's up to contextual preference which one to use.
407-
Any combination of [Access API](apiLevels.md) can be used to specify the column to rename
407+
Any combination of [Access API](concepts/apiLevels.md) can be used to specify the column to rename
408408
and which name should be used instead.
409409

410410
##### Expr (Column Expression) {collapsible="true"}

docs/StardustDocs/topics/Home.topic

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<primary>
2121
<title>First steps</title>
2222
<a href="gettingStartedKotlinNotebook.md"/>
23-
<a href="overview.md"/>
23+
<a href="concepts.md"/>
2424
<a href="operations.md"/>
2525
<a href="read.md">Reading from files: CSV, JSON, ApacheArrow</a>
2626
</primary>
@@ -32,7 +32,6 @@
3232
<a href="readSqlDatabases.md"/>
3333
</secondary>
3434

35-
3635
</section-starting-page>
3736

3837

docs/StardustDocs/topics/Support.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Support
2+
3+
* <img src="github-mark.svg" alt="GitHub logo" height="24"/>
4+
[**Issue Tracker**](https://github.com/Kotlin/dataframe/issues)
5+
6+
If you find a bug or have an idea for a new feature,
7+
file an issue in our [DataFrame GitHub repository](https://github.com/Kotlin/dataframe).
8+
9+
* <img src="https://kotlinlang.org/docs/images/slack.svg" alt="Slack logo" height="24"/>
10+
[**Community**](https://github.com/Kotlin/dataframe/issues)
11+
12+
Peer-to-peer support is available on the Kotlin Slack
13+
[#datascience](https://kotlinlang.slack.com/archives/C4W52CFEZ) channel
14+
([request an invite](https://surveys.jetbrains.com/s3/kotlin-slack-sign-up?_gl=1*1ssyqy3*_gcl_au*MTk5NzUwODYzOS4xNzQ2NzkxMDMz*FPAU*MTk5NzUwODYzOS4xNzQ2NzkxMDMz*_ga*MTE0ODQ1MzY3OS4xNzM4OTY1NzM3*_ga_9J976DJZ68*czE3NTE1NDUxODUkbzIyNyRnMCR0MTc1MTU0NTE4NSRqNjAkbDAkaDA.)).
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)