Skip to content

Commit

Permalink
Merge branch 'refs/heads/master' into pojo-toDataFrame
Browse files Browse the repository at this point in the history
  • Loading branch information
Jolanrensen committed Apr 22, 2024
2 parents a22f863 + 7de6022 commit 30b3f77
Show file tree
Hide file tree
Showing 120 changed files with 5,777 additions and 7,793 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: "Validate Gradle Wrapper"
on: [push, pull_request]

jobs:
validation:
name: "Validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v2
3 changes: 3 additions & 0 deletions RELEASE_CHECK_LIST.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

1. Run code inspections (fix typos, Kotlin issues, fix code formatting, linter). **RC**
2. Write missed KDocs for new APIs. **RC**
3. Update documentation on Kotlin site **RC**
- The overview [page](https://kotlinlang.org/docs/data-analysis-overview.html)
- The Data Analysis subchapter, for example, the [page](https://kotlinlang.org/docs/data-analysis-work-with-data-sources.html)
3. Update tutorials according to the latest code changes.
4. Update README.MD according last code changes:
- update an artifact version.
Expand Down
1 change: 0 additions & 1 deletion core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ val installGitPreCommitHook by tasks.creating(Copy::class) {
} else {
logger.lifecycle("'.git/hooks' directory not found. Skipping installation of pre-commit hook.")
}

}
tasks.named("assemble") {
dependsOn(installGitPreCommitHook)
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

5,061 changes: 1,702 additions & 3,359 deletions core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/all.kt

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import org.jetbrains.kotlinx.dataframe.columns.ColumnReference
import org.jetbrains.kotlinx.dataframe.columns.ColumnSet
import org.jetbrains.kotlinx.dataframe.documentation.AccessApiLink
import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate
import org.jetbrains.kotlinx.dataframe.documentation.ExcludeFromSources
import org.jetbrains.kotlinx.dataframe.impl.columns.addPath
import org.jetbrains.kotlinx.dataframe.impl.columns.createColumnSet
import kotlin.reflect.KProperty
Expand All @@ -30,10 +31,10 @@ public interface ColumnRangeColumnsSelectionDsl {
*     
*
* ### Definitions:
* `column: `[ColumnAccessor][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[String][String]
* `column: `[`ColumnAccessor`][org.jetbrains.kotlinx.dataframe.columns.ColumnAccessor]` | `[`String`][String]
*
*            
* `| `[KProperty][kotlin.reflect.KProperty]`<*> | `[ColumnPath][org.jetbrains.kotlinx.dataframe.columns.ColumnPath]
* `| `[`KProperty`][kotlin.reflect.KProperty]`<*> | `[`ColumnPath`][org.jetbrains.kotlinx.dataframe.columns.ColumnPath]
*
* &nbsp;&nbsp;&nbsp;&nbsp;
*
Expand All @@ -42,7 +43,7 @@ public interface ColumnRangeColumnsSelectionDsl {
*
* &nbsp;&nbsp;&nbsp;&nbsp;
*
* [column][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnDef] [**..**][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.rangeTo] [column][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnDef]
* [`column`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnDef]` `[**`..`**][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.rangeTo]` `[`column`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnDef]
*
*
*
Expand All @@ -61,51 +62,24 @@ public interface ColumnRangeColumnsSelectionDsl {
*/
public interface Grammar {

/** [**..**][ColumnsSelectionDsl.rangeTo] */
/** [**`..`**][ColumnsSelectionDsl.rangeTo] */
public interface PlainDslName
}

/**
* ## Range of Columns
* Creates a [ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
*
* Columns inside of column groups are also supported (as long as they share the same direct parent),
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
*
* ### Check out: [Grammar]
*
* #### For example:
*
* `df.`[select][DataFrame.select]` { `` }`
*
* @param [endInclusive] The last column in the subset.
* @receiver The first column in the subset.
* @return A [ColumnSet] containing all columns from [this] to [endInclusive].
* @throws [IllegalArgumentException] if the columns have different parents or the end column is before the
* start column.
* @see [ColumnsSelectionDsl.allBefore]
* @see [ColumnsSelectionDsl.allAfter]
* @see [ColumnsSelectionDsl.allFrom]
* @see [ColumnsSelectionDsl.allUpTo]
*/
private interface CommonRangeOfColumnsDocs {

/** Examples key */
interface Example
}


/**
* ## Range of Columns
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
*
* Columns inside of column groups are also supported (as long as they share the same direct parent),
* Columns inside column groups are also supported (as long as they share the same direct parent),
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
*
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
*
* #### For example:
*
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `"fromColumn"[`..`][String.rangeTo]"toColumn"` }`
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`"fromColumn"`[`..`][String.rangeTo]`"toColumn"`</code>` }`
*
* @param [endInclusive] The last column in the subset.
* @receiver The first column in the subset.
Expand All @@ -125,14 +99,14 @@ public interface ColumnRangeColumnsSelectionDsl {
* ## Range of Columns
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
*
* Columns inside of column groups are also supported (as long as they share the same direct parent),
* Columns inside column groups are also supported (as long as they share the same direct parent),
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
*
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
*
* #### For example:
*
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `"fromColumn"[`..`][String.rangeTo]Type::toColumn` }`
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`"fromColumn"`[`..`][String.rangeTo]`Type::toColumn`</code>` }`
*
* @param [endInclusive] The last column in the subset.
* @receiver The first column in the subset.
Expand All @@ -152,14 +126,14 @@ public interface ColumnRangeColumnsSelectionDsl {
* ## Range of Columns
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
*
* Columns inside of column groups are also supported (as long as they share the same direct parent),
* Columns inside column groups are also supported (as long as they share the same direct parent),
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
*
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
*
* #### For example:
*
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `"fromColumn"[`..`][String.rangeTo]toColumn` }`
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`"fromColumn"`[`..`][String.rangeTo]`toColumn`</code>` }`
*
* @param [endInclusive] The last column in the subset.
* @receiver The first column in the subset.
Expand All @@ -179,14 +153,14 @@ public interface ColumnRangeColumnsSelectionDsl {
* ## Range of Columns
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
*
* Columns inside of column groups are also supported (as long as they share the same direct parent),
* Columns inside column groups are also supported (as long as they share the same direct parent),
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
*
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
*
* #### For example:
*
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `Type::fromColumn[`..`][KProperty.rangeTo]"toColumn"` }`
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`Type::fromColumn`[`..`][KProperty.rangeTo]`"toColumn"`</code>` }`
*
* @param [endInclusive] The last column in the subset.
* @receiver The first column in the subset.
Expand All @@ -206,14 +180,14 @@ public interface ColumnRangeColumnsSelectionDsl {
* ## Range of Columns
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
*
* Columns inside of column groups are also supported (as long as they share the same direct parent),
* Columns inside column groups are also supported (as long as they share the same direct parent),
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
*
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
*
* #### For example:
*
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `Type::fromColumn[`..`][KProperty.rangeTo]Type::toColumn` }`
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`Type::fromColumn`[`..`][KProperty.rangeTo]`Type::toColumn`</code>` }`
*
* @param [endInclusive] The last column in the subset.
* @receiver The first column in the subset.
Expand All @@ -233,14 +207,14 @@ public interface ColumnRangeColumnsSelectionDsl {
* ## Range of Columns
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
*
* Columns inside of column groups are also supported (as long as they share the same direct parent),
* Columns inside column groups are also supported (as long as they share the same direct parent),
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
*
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
*
* #### For example:
*
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `Type::fromColumn[`..`][KProperty.rangeTo]toColumn` }`
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`Type::fromColumn`[`..`][KProperty.rangeTo]`toColumn`</code>` }`
*
* @param [endInclusive] The last column in the subset.
* @receiver The first column in the subset.
Expand All @@ -260,14 +234,14 @@ public interface ColumnRangeColumnsSelectionDsl {
* ## Range of Columns
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
*
* Columns inside of column groups are also supported (as long as they share the same direct parent),
* Columns inside column groups are also supported (as long as they share the same direct parent),
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
*
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
*
* #### For example:
*
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `fromColumn[`..`][ColumnReference.rangeTo]"toColumn"` }`
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`fromColumn`[`..`][ColumnReference.rangeTo]`"toColumn"`</code>` }`
*
* @param [endInclusive] The last column in the subset.
* @receiver The first column in the subset.
Expand All @@ -287,14 +261,14 @@ public interface ColumnRangeColumnsSelectionDsl {
* ## Range of Columns
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
*
* Columns inside of column groups are also supported (as long as they share the same direct parent),
* Columns inside column groups are also supported (as long as they share the same direct parent),
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
*
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
*
* #### For example:
*
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `fromColumn[`..`][ColumnReference.rangeTo]Type::toColumn` }`
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`fromColumn`[`..`][ColumnReference.rangeTo]`Type::toColumn`</code>` }`
*
* @param [endInclusive] The last column in the subset.
* @receiver The first column in the subset.
Expand All @@ -314,14 +288,14 @@ public interface ColumnRangeColumnsSelectionDsl {
* ## Range of Columns
* Creates a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet] containing all columns from [this] up to (and including) [endInclusive].
*
* Columns inside of column groups are also supported (as long as they share the same direct parent),
* Columns inside column groups are also supported (as long as they share the same direct parent),
* as well as any combination of [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi].
*
* ### Check out: [Grammar][org.jetbrains.kotlinx.dataframe.api.ColumnRangeColumnsSelectionDsl.Grammar]
*
* #### For example:
*
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `fromColumn[`..`][ColumnReference.rangeTo]toColumn` }`
* `df.`[select][org.jetbrains.kotlinx.dataframe.DataFrame.select]` { `<code>`fromColumn`[`..`][ColumnReference.rangeTo]`toColumn`</code>` }`
*
* @param [endInclusive] The last column in the subset.
* @receiver The first column in the subset.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public interface DistinctColumnsSelectionDsl {
* &nbsp;&nbsp;&nbsp;&nbsp;
*
* ### Definitions:
* `columnSet: `[ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet]`<*>`
* `columnSet: `[`ColumnSet`][org.jetbrains.kotlinx.dataframe.columns.ColumnSet]`<*>`
*
*
*
Expand All @@ -77,9 +77,9 @@ public interface DistinctColumnsSelectionDsl {
*
* &nbsp;&nbsp;&nbsp;&nbsp;
*
* [columnSet][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnSetDef]
* [`columnSet`][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnSetDef]
*
* &nbsp;&nbsp;&nbsp;&nbsp;.[**distinct**][org.jetbrains.kotlinx.dataframe.api.DistinctColumnsSelectionDsl.distinct]**`()`**
* &nbsp;&nbsp;&nbsp;&nbsp;__`.`__[**`distinct`**][org.jetbrains.kotlinx.dataframe.api.DistinctColumnsSelectionDsl.distinct]**`()`**
*
*
*
Expand All @@ -97,7 +97,7 @@ public interface DistinctColumnsSelectionDsl {
*/
public interface Grammar {

/** .[**distinct**][ColumnsSelectionDsl.distinct] */
/** __`.`__[**`distinct`**][ColumnsSelectionDsl.distinct] */
public interface ColumnSetName
}

Expand All @@ -114,7 +114,7 @@ public interface DistinctColumnsSelectionDsl {
* #### For Example:
* `df.`[select][DataFrame.select]` { (`[colsOf][SingleColumn.colsOf]`<`[Int][Int]`>() `[and][ColumnsSelectionDsl.and]` age).`[distinct][ColumnSet.distinct]`() }`
*
* `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().`[nameStartsWith][ColumnsSelectionDsl.nameStartsWith]`("order").`[distinct][ColumnSet.distinct]`() }`
* `df.`[select][DataFrame.select]` { `[colsAtAnyDepth][ColumnsSelectionDsl.colsAtAnyDepth]`().`[nameStartsWith][ColumnsSelectionDsl.nameStartsWith]`("order").`[distinct][ColumnSet.distinct]`() }`
*
* @return A new [ColumnSet] containing only distinct columns (by path).
* @see ColumnsSelectionDsl.named
Expand Down
Loading

0 comments on commit 30b3f77

Please sign in to comment.