Merge 94060d1 into fcb71a4

JBZoo · Apr 11, 2024 · 1d7bcce · 1d7bcce
2 parents fcb71a4 + 94060d1
commit 1d7bcce
Show file tree

Hide file tree

Showing 53 changed files with 1,358 additions and 265 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -37,6 +37,9 @@ jobs:
   test-current-versions:
     name: Tests
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ext-parallel: [ '', 'parallel' ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -45,20 +48,20 @@ jobs:
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
+        id: setup-php
         with:
           php-version: 8.3
           coverage: xdebug
-          extensions: ast
+          extensions: ast, ${{ matrix.ext-parallel }}
+        env:
+          phpts: zts
 
       - name: Build project
         run: make build --no-print-directory
 
       - name: 🧪 PHPUnit Tests
         run: make test --no-print-directory
 
-      - name: 👍 Code Quality
-        run: make codestyle --no-print-directory
-
       - name: Uploading coverage to coveralls
         continue-on-error: true
         env:
@@ -67,10 +70,14 @@ jobs:
 
       - name: SonarCloud Scan
         uses: SonarSource/sonarcloud-github-action@master
+        continue-on-error: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
+      - name: 👍 Code Quality
+        run: make codestyle --no-print-directory
+
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         continue-on-error: true
@@ -266,11 +273,25 @@ jobs:
         run: |
           ! $BLUEPRINT_DOCKER $CMD_VALIDATE $INVALID_TEST
 
-      - name: 🔥 Quick Benchmark 🔥
+      - name: 👍 Valid CSV files (Parallel)
+        run: $BLUEPRINT_DOCKER $CMD_VALIDATE $VALID_TEST --parallel
+
+      - name: 👎 Invalid CSV files (Parallel)
+        run: |
+          ! $BLUEPRINT_DOCKER $CMD_VALIDATE $INVALID_TEST --parallel
+
+      - name: Prepare Benchmark
+        run: |
+          make build --no-print-directory
+          make bench-create-csv --no-print-directory
+
+      - name: 🔥 Benchmark (single thread)
+        run: |
+          ! make bench-docker-quick --no-print-directory
+
+      - name: 🔥 Benchmark (multi threads)
         run: |
-          make build > /dev/null 2>&1
-          make bench-create-csv > /dev/null
-          make bench-docker-quick --no-print-directory
+          ! make bench-docker-quick-parallel --no-print-directory
 
       - name: Push Docker Image (master)
         uses: docker/build-push-action@v5

diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,7 @@ vendor
 phpunit.xml
 /docker/preload.php
 /docker/random_data.csv
+/docker/included_files.php
 *.cache
 *.phar
 .version
diff --git a/.phan.php b/.phan.php
@@ -23,15 +23,21 @@
     'directory_list' => [
         'src',
 
-        'vendor/jbzoo/ci-report-converter/src',
-        'vendor/jbzoo/cli/src',
         'vendor/jbzoo/data/src',
+        'vendor/jbzoo/cli/src',
         'vendor/jbzoo/utils/src',
-        'vendor/league/csv/src',
+        'vendor/jbzoo/ci-report-converter/src',
+
         'vendor/symfony/console',
         'vendor/symfony/finder',
         'vendor/symfony/yaml',
+
+        'vendor/league/csv/src',
         'vendor/markrogoyski/math-php/src',
         'vendor/respect/validation',
+        'vendor/fidry/cpu-core-counter',
+    ],
+    'autoload_internal_extension_signatures' => [
+        'parallel' => 'tests/stubs/parallel.stub_php',
     ],
 ]);
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -16,7 +16,20 @@
 
 namespace JBZoo\Codestyle\PhpCsFixer;
 
-return (new PhpCsFixerCodingStandard(__DIR__))->getFixerConfig(null, [
+use Symfony\Component\Finder\Finder;
+
+$finder = (new Finder())
+    ->files()
+    ->followLinks()
+    ->ignoreVCS(true)
+    ->ignoreDotFiles(false)
+    ->in(__DIR__)
+    ->exclude('vendor')
+    ->exclude('docker') // preload.php!
+    ->exclude('build')
+    ->name('/\.php$/');
+
+return (new PhpCsFixerCodingStandard(__DIR__))->getFixerConfig($finder, [
     'binary_operator_spaces' => [
         'operators' => [
             '='  => 'single_space',

diff --git a/Dockerfile b/Dockerfile
@@ -17,37 +17,42 @@ COPY . /tmp
 RUN make build-version
 
 ########################################################################################
-FROM php:8.3-cli-alpine
+FROM php:8.3-zts-alpine
 
 # Install PHP extensions
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
-RUN install-php-extensions opcache @composer
+RUN install-php-extensions opcache parallel @composer
 
 # Install application
-# run `make build-version` before!
 WORKDIR /app
 ENV COMPOSER_ALLOW_SUPERUSER=1
 COPY . /app
 COPY --from=preparatory /tmp/.version /app/.version
-RUN composer install --no-dev                       \
-                        --classmap-authoritative    \
-                        --no-progress               \
-                        --no-suggest                \
-                        --optimize-autoloader       \
-    && rm -rf ./.git                                \
-    && composer clear-cache                         \
-    && chmod +x ./csv-blueprint
+RUN composer install --no-dev --classmap-authoritative --no-progress \
+    && rm -rf ./.git \
+    && composer clear-cache \
+    && chmod +x ./csv-blueprint \
+    && chmod +x ./docker/entrypoint.sh
 
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 COPY ./docker/php.ini /usr/local/etc/php/conf.d/docker-z99-php.ini
 
-# Quick test
-RUN time ./csv-blueprint --version --ansi \
-    && time ./csv-blueprint validate:csv --help --ansi
-
 # Warmup caches
-#RUN php ./docker/build-preloader.php  \
-#    && php ./docker/preload.php \
+RUN php ./docker/random-csv.php \
+    && JBZOO_BUILD_PRELOADER=1 \
+      ./csv-blueprint validate:csv \
+      --schema=/app/schema-examples/full.yml \
+      --csv=/app/docker/random_data.csv \
+      --apply-all=yes \
+      --report=text --mute-errors | grep issues \
+    && rm ./docker/random_data.csv \
+    && php ./docker/build-preloader.php \
+    && php ./docker/preload.php \
+    && du -sh /app/docker
 #    && echo "opcache.preload=/app/docker/preload.php" >> /usr/local/etc/php/conf.d/docker-z99-php.ini
 
-ENTRYPOINT ["/app/csv-blueprint"]
+# Quick test
+RUN time ./csv-blueprint -V
+
+ENTRYPOINT ["/app/docker/entrypoint.sh"]
+#ENTRYPOINT ["/app/csv-blueprint"]
diff --git a/Makefile b/Makefile
@@ -111,9 +111,15 @@ bench-create-csv: ##@Benchmarks Create CSV file
 	@time bash ./tests/Benchmarks/create-csv.sh
 	@echo "::endgroup::"
 
-bench-docker-quick: ##@Benchmarks Run CSV file with Docker (Quick)
+bench-docker-quick:
+	$(call title,"Single thread mode")
 	@docker run --rm  $(DOCKER_IMAGE) --ansi --version
-	-$(BLUEPRINT_DOCKER) $(BENCH_CSV) $(BENCH_SCHEMAS_0) $(BENCH_FLAGS)
+	$(BLUEPRINT_DOCKER) $(BENCH_CSV) $(BENCH_SCHEMAS_0) $(BENCH_FLAGS)
+
+bench-docker-quick-parallel:
+	$(call title,"Multi-thread mode")
+	@docker run --rm  $(DOCKER_IMAGE) --ansi --version
+	$(BLUEPRINT_DOCKER) $(BENCH_CSV) $(BENCH_SCHEMAS_0) $(BENCH_FLAGS) --parallel
 
 bench-docker: ##@Benchmarks Run CSV file with Docker
 	@docker run --rm  $(DOCKER_IMAGE) --ansi --version

diff --git a/README.md b/README.md
@@ -165,9 +165,9 @@ You can find launch examples in the [workflow demo](https://github.com/JBZoo/Csv
     #   Add flag `--profile` if you want to see profiling info. Add details with `-vvv`.
     #   Add flag `--debug` if you want to see more really deep details.
     #   Add flag `--dump-schema` if you want to see the final schema after all includes and inheritance.
-    # Default value: 'options: --ansi -v'
+    # Default value: 'options: --ansi'
     # You can skip it.
-    extra: 'options: --ansi -v'
+    extra: 'options: --ansi'
 ```
 <!-- auto-update:/github-actions-yml -->
 
@@ -1466,6 +1466,10 @@ Options:
       --debug                      Intended solely for debugging and advanced profiling purposes.
                                    Activating this option provides detailed process insights,
                                    useful for troubleshooting and performance analysis.
+      --parallel[=PARALLEL]        EXPERIMENTAL! Launches the process in parallel mode (if possible). Works only with ext-parallel.
+                                   You can specify the number of threads.
+                                   If you do not specify a value, the number of threads will be equal to the number of CPU cores.
+                                   By default, the process is launched in a single-threaded mode. [default: "1"]
       --no-progress                Disable progress bar animation for logs. It will be used only for text output format.
       --mute-errors                Mute any sort of errors. So exit code will be always "0" (if it's possible).
                                    It has major priority then --non-zero-on-error. It's on your own risk!
@@ -1522,6 +1526,10 @@ Options:
       --debug                    Intended solely for debugging and advanced profiling purposes.
                                  Activating this option provides detailed process insights,
                                  useful for troubleshooting and performance analysis.
+      --parallel[=PARALLEL]      EXPERIMENTAL! Launches the process in parallel mode (if possible). Works only with ext-parallel.
+                                 You can specify the number of threads.
+                                 If you do not specify a value, the number of threads will be equal to the number of CPU cores.
+                                 By default, the process is launched in a single-threaded mode. [default: "1"]
       --no-progress              Disable progress bar animation for logs. It will be used only for text output format.
       --mute-errors              Mute any sort of errors. So exit code will be always "0" (if it's possible).
                                  It has major priority then --non-zero-on-error. It's on your own risk!

diff --git a/action.yml b/action.yml
@@ -63,7 +63,7 @@ inputs:
         Add flag `--profile` if you want to see profiling info. Add details with `-vvv`.
         Add flag `--debug` if you want to see more really deep details.
         Add flag `--dump-schema` if you want to see the final schema after all includes and inheritance.
-    default: 'options: --ansi -v'
+    default: 'options: --ansi'
 
 runs:
   using: 'docker'

diff --git a/composer.json b/composer.json
@@ -43,7 +43,8 @@
         "respect/validation"                  : "^2.3.6",
         "giggsey/libphonenumber-for-php-lite" : "^8.13.34",
         "giggsey/locale"                      : "^2.5",
-        "symfony/polyfill-mbstring"           : "^1.29.0"
+        "symfony/polyfill-mbstring"           : "^1.29.0",
+        "fidry/cpu-core-counter"              : "^1.1.0"
     },
 
     "require-dev"       : {