Skip to content
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

Jump to bottom

Fix a NPE when concat filter with multiple devices #900

Merged
merged 4 commits into from Mar 11, 2020
Merged

Fix a NPE when concat filter with multiple devices #900

merged 4 commits into from Mar 11, 2020

Commits on Mar 11, 2020

  1. Use a batched style to get series type in PhysicalGenerator, TSServic… 

    …eImpl and ConcatPathOptimizer
    @jt2594838
    jt2594838 committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    4d62652 View commit details
    Browse the repository at this point in the history

  2. fix ConcatPathOptimizer

    @jt2594838
    jt2594838 committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    8ac2ec7 View commit details
    Browse the repository at this point in the history

  3. add test

    @jt2594838
    jt2594838 committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    92ba969 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into batch_method_calls_0 

    # Conflicts:
#	server/src/main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java
#	server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java
#	server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
#	server/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java
    @jt2594838
    jt2594838 committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    74bfaeb View commit details
    Browse the repository at this point in the history