dbsp: Always include csv support, even without the with-csv feature.

blp · blp · commit 99c35c8d32a9 · 2024-06-25T10:42:36.000-07:00
The feature is left in place just in case someone uses it, but it no
longer does anything.

Signed-off-by: Ben Pfaff &lt;blp@feldera.com&gt;
diff --git a/crates/dbsp/Cargo.toml b/crates/dbsp/Cargo.toml
@@ -20,9 +20,9 @@ rustdoc-args = ["--cfg", "docsrs"]
 [features]
 # Note: If you add a feature, adjust the ALMOST_ALL_FEATURES environment variable in
 # main.yml and coverage.yml:
-default = ["with-serde"]
+default = ["with-serde", "with-csv"]
 with-serde = []
-with-csv = ["csv"]
+with-csv = []
 
 [dependencies]
 num = "0.4.0"
@@ -33,7 +33,7 @@ crossbeam-utils = "0.8.6"
 once_cell = "1.9.0"
 priority-queue = "1.3.2"
 hashbrown = "0.14.2"
-csv = { version = "1.2.2", optional = true }
+csv = { version = "1.2.2" }
 impl-trait-for-tuples = "0.2"
 itertools = "0.10.5"
 textwrap = "0.15.0"
@@ -111,12 +111,10 @@ ijson = { git = "https://github.com/abhizer/ijson.git" }
 [[bench]]
 name = "galen"
 harness = false
-required-features = ["with-csv"]
 
 #[[bench]]
 #name = "fraud"
 #harness = false
-#required-features = ["with-csv", "with-serde"]
 
 [[bench]]
 name = "path"
@@ -128,7 +126,6 @@ harness = false
 
 #[[bench]]
 #name = "ldbc-graphalytics"
-#required-features = ["with-csv"]
 #harness = false
 
 [[bench]]
diff --git a/crates/dbsp/Makefile.toml b/crates/dbsp/Makefile.toml
@@ -1,5 +1,5 @@
 [tasks.build]
-args = ["build", "--features", "with-serde with-csv"]
+args = ["build"]
 
 [tasks.test]
-args = ["test", "--features", "with-serde with-csv"]
+args = ["test"]
diff --git a/crates/dbsp/src/operator/mod.rs b/crates/dbsp/src/operator/mod.rs
@@ -16,7 +16,6 @@ pub(crate) mod inspect;
 
 mod condition;
 mod count;
-#[cfg(feature = "with-csv")]
 mod csv;
 mod delta0;
 mod differentiate;
@@ -46,7 +45,6 @@ mod semijoin;
 pub mod time_series;
 mod trace;
 
-#[cfg(feature = "with-csv")]
 pub use self::csv::CsvSource;
 pub use apply::Apply;
 pub use condition::Condition;
diff --git a/scripts/bench.bash b/scripts/bench.bash
@@ -56,7 +56,7 @@ FELDERA_API=http://localhost:8080
 python3 benchmark/feldera-sql/run.py --storage --api-url $FELDERA_API --kafka-broker $KAFKA_BROKER --csv crates/nexmark/${NEXMARK_SQL_STORAGE_CSV_FILE} --csv-metrics crates/nexmark/${NEXMARK_SQL_STORAGE_METRICS_CSV_FILE} --metrics-interval 1
 
 # Run galen benchmark
-cargo bench --bench galen --features="with-csv" -- --workers 10 --csv ${GALEN_CSV_FILE}
+cargo bench --bench galen -- --workers 10 --csv ${GALEN_CSV_FILE}
 
 # Run ldbc benchmarks
 DATASET_SMALL='graph500-22'
@@ -65,10 +65,10 @@ if [ "$SMOKE" != "" ]; then
     DATASET_SMALL='wiki-Talk'
     DATASET_MEDIUM='kgs'
 fi
-#cargo bench --bench ldbc-graphalytics --features="with-csv" -- bfs ${DATASET_SMALL} --threads 1 --csv ${LDBC_CSV_FILE}
-#cargo bench --bench ldbc-graphalytics --features="with-csv" -- bfs ${DATASET_MEDIUM} --threads 6 --csv ${LDBC_CSV_FILE}
-#cargo bench --bench ldbc-graphalytics --features="with-csv" -- pagerank ${DATASET_SMALL} --threads 1 --csv ${LDBC_CSV_FILE}
-#cargo bench --bench ldbc-graphalytics --features="with-csv" -- pagerank ${DATASET_MEDIUM} --threads 6 --csv ${LDBC_CSV_FILE}
+#cargo bench --bench ldbc-graphalytics -- bfs ${DATASET_SMALL} --threads 1 --csv ${LDBC_CSV_FILE}
+#cargo bench --bench ldbc-graphalytics -- bfs ${DATASET_MEDIUM} --threads 6 --csv ${LDBC_CSV_FILE}
+#cargo bench --bench ldbc-graphalytics -- pagerank ${DATASET_SMALL} --threads 1 --csv ${LDBC_CSV_FILE}
+#cargo bench --bench ldbc-graphalytics -- pagerank ${DATASET_MEDIUM} --threads 6 --csv ${LDBC_CSV_FILE}
 
 # Run nexmark benchmark with persistence
 EVENT_RATE=5000000
